fix: Fix merge of CLI-applied Metro config, add soft fallback to RN d…

…efaults

packages/cli-plugin-metro/package.json

@@ -9,6 +9,7 @@
   "dependencies": {
     "@react-native-community/cli-server-api": "^11.0.1",
     "@react-native-community/cli-tools": "^11.0.1",
+    "@react-native/metro-config": "^0.72.1",
     "chalk": "^4.1.2",
     "execa": "^5.0.0",
     "metro": "0.76.0",

packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

@@ -1,5 +1,13 @@
+import fs from 'fs';
 import path from 'path';
-import {ConfigT, InputConfigT, loadConfig, resolveConfig} from 'metro-config';
+import {
+  ConfigT,
+  InputConfigT,
+  loadConfig,
+  mergeConfig,
+  resolveConfig,
+} from 'metro-config';
+import {getDefaultConfig} from '@react-native/metro-config';
 import {CLIError, logger} from '@react-native-community/cli-tools';
 import type {Config} from '@react-native-community/cli-types';
 import {reactNativePlatformResolver} from './metroPlatformResolver';
@@ -89,17 +97,29 @@ export default async function loadMetroConfig(
   // @ts-ignore resolveConfig return value is mistyped
   logger.debug(`Reading Metro config from ${projectConfig.filepath}`);
 
-  try {
-    require.resolve('@react-native/metro-config', {
-      paths: [ctx.root],
-    });
-  } catch (e) {
+  const loadedProjectConfig = await loadConfig({cwd: ctx.root, ...options});
+
+  if (
+    !/['"']@react-native\/metro-config['"']/.test(
+      fs
+        // @ts-ignore resolveConfig return value is mistyped
+        .readFileSync(projectConfig.filepath, 'utf8'),
+    )
+  ) {
     logger.warn(
-      "From React Native 0.72, your 'metro.config.js' file should " +
-        "extend '@react-native/metro-config', however it's not present in your " +
-        "project's devDependencies. Please install '@react-native/metro-config'.",
+      'From React Native 0.72, your metro.config.js file should extend' +
+        "'@react-native/metro-config'. Please see the React Native 0.72 " +
+        'changelog, or copy the template at:\n' +
+        'https://github.com/facebook/react-native/blob/main/packages/react-native/template/metro.config.js',
+    );
+    logger.warn('Falling back to internal defaults.');
+
+    return mergeConfig(
+      loadedProjectConfig,
+      getDefaultConfig(ctx.root),
+      overrideConfig,
     );
   }
 
-  return loadConfig({cwd: ctx.root, ...options}, overrideConfig);
+  return mergeConfig(loadedProjectConfig, overrideConfig);
 }

packages/cli-plugin-metro/types/@react-native/metro-config/index.d.ts

@@ -0,0 +1,5 @@
+declare module '@react-native/metro-config' {
+  import type {ConfigT} from 'metro-config';
+
+  export function getDefaultConfig(projectRoot: string): ConfigT;
+}

yarn.lock

@@ -2673,6 +2673,21 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc"
   integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==
 
+"@react-native/js-polyfills@^0.72.1":
+  version "0.72.1"
+  resolved "https://registry.yarnpkg.com/@react-native/js-polyfills/-/js-polyfills-0.72.1.tgz#905343ef0c51256f128256330fccbdb35b922291"
+  integrity sha512-cRPZh2rBswFnGt5X5EUEPs0r+pAsXxYsifv/fgy9ZLQokuT52bPH+9xjDR+7TafRua5CttGW83wP4TntRcWNDA==
+
+"@react-native/metro-config@^0.72.1":
+  version "0.72.1"
+  resolved "https://registry.yarnpkg.com/@react-native/metro-config/-/metro-config-0.72.1.tgz#57f212700db2d160e8beff6163558310c2c82220"
+  integrity sha512-BxGfuMK/cXwJxChE4/T6nE4qOdwGLM9iUFFKpcyh9Nks0702qTTvwpjkFbJvlkpe4yulAZh8CKLJrRDVzGGbfQ==
+  dependencies:
+    "@react-native/js-polyfills" "^0.72.1"
+    metro-config "0.76.0"
+    metro-react-native-babel-transformer "0.76.0"
+    metro-runtime "0.76.0"
+
 "@sinonjs/commons@^1.7.0":
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz#da5fd19a5f71177a53778073978873964f49acf1"
@@ -8916,6 +8931,19 @@ [email protected]:
     babel-plugin-transform-flow-enums "^0.0.2"
     react-refresh "^0.4.0"
 
+[email protected]:
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.76.0.tgz#8c8872f0d3a0ec9dad2480df53c92c10eac92c79"
+  integrity sha512-mLyUiGq2qPoEwV3oncD82HOtM4wAl8YmXtGY17D4iqH6/5pE32lRnDDYt0WnJYACZDs3RB3MhTjGCM7rJNwn/A==
+  dependencies:
+    "@babel/core" "^7.20.0"
+    babel-preset-fbjs "^3.4.0"
+    hermes-parser "0.8.0"
+    metro-babel-transformer "0.76.0"
+    metro-react-native-babel-preset "0.76.0"
+    metro-source-map "0.76.0"
+    nullthrows "^1.1.1"
+
 [email protected]:
   version "0.76.0"
   resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.76.0.tgz#3fa778adbab30859023a89e7a1241f4eb68171f2"