diff --git a/packages/metro-config/package.json b/packages/metro-config/package.json index 1f6d4d5e72..28f393180f 100644 --- a/packages/metro-config/package.json +++ b/packages/metro-config/package.json @@ -19,6 +19,7 @@ "metro": "0.80.4", "metro-cache": "0.80.4", "metro-core": "0.80.4", + "metro-minify-terser": "0.80.4", "metro-runtime": "0.80.4" }, "devDependencies": { diff --git a/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap b/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap index ae77cc5806..0471222afc 100644 --- a/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap +++ b/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap @@ -140,7 +140,7 @@ Object { }, "toplevel": false, }, - "minifierPath": "metro-minify-terser", + "minifierPath": "/~/packages/metro-minify-terser/src/index.js", "optimizationSizeLimit": 153600, "publicPath": "/assets", "transformVariants": Object { @@ -320,7 +320,7 @@ Object { }, "toplevel": false, }, - "minifierPath": "metro-minify-terser", + "minifierPath": "/~/packages/metro-minify-terser/src/index.js", "optimizationSizeLimit": 153600, "publicPath": "/assets", "transformVariants": Object { @@ -500,7 +500,7 @@ Object { }, "toplevel": false, }, - "minifierPath": "metro-minify-terser", + "minifierPath": "/~/packages/metro-minify-terser/src/index.js", "optimizationSizeLimit": 153600, "publicPath": "/assets", "transformVariants": Object { @@ -680,7 +680,7 @@ Object { }, "toplevel": false, }, - "minifierPath": "metro-minify-terser", + "minifierPath": "/~/packages/metro-minify-terser/src/index.js", "optimizationSizeLimit": 153600, "publicPath": "/assets", "transformVariants": Object { diff --git a/packages/metro-config/src/__tests__/loadConfig-test.js b/packages/metro-config/src/__tests__/loadConfig-test.js index 247913f8a7..a5551cff21 100644 --- a/packages/metro-config/src/__tests__/loadConfig-test.js +++ b/packages/metro-config/src/__tests__/loadConfig-test.js @@ -20,6 +20,13 @@ const path = require('path'); const prettyFormat = require('pretty-format'); const stripAnsi = require('strip-ansi'); +function fixupAbsolutePaths(result: any) { + result.transformer.minifierPath = result.transformer.minifierPath.replace( + process.cwd(), + '/~', + ); +} + describe('loadConfig', () => { beforeEach(() => { cosmiconfig.reset(); @@ -39,6 +46,7 @@ describe('loadConfig', () => { cosmiconfig.setResolvedConfig(config); const result = await loadConfig({}); + fixupAbsolutePaths(result); expect(result).toMatchSnapshot(); expect(result.cacheStores).toEqual([]); @@ -92,6 +100,7 @@ describe('loadConfig', () => { // We don't actually use the specified file in this test but it needs to // resolve to a real file on the file system. const result = await loadConfig({config: './__tests__/loadConfig-test.js'}); + fixupAbsolutePaths(result); const relativizedResult = { ...result, @@ -131,6 +140,7 @@ describe('loadConfig', () => { // We don't actually use the specified file in this test but it needs to // resolve to a real file on the file system. const result = await loadConfig({config: path.resolve(__dirname, '../')}); + fixupAbsolutePaths(result); const relativizedResult = { ...result, @@ -214,6 +224,7 @@ describe('loadConfig', () => { cosmiconfig.setResolvedConfig(config); const result = await loadConfig({}); + fixupAbsolutePaths(result); expect(result).toMatchSnapshot(); expect(result.cacheStores).toEqual([]); diff --git a/packages/metro-config/src/defaults/defaults.js b/packages/metro-config/src/defaults/defaults.js index 2eb200d71c..d532ae9fea 100644 --- a/packages/metro-config/src/defaults/defaults.js +++ b/packages/metro-config/src/defaults/defaults.js @@ -63,7 +63,9 @@ exports.moduleSystem = (require.resolve( exports.platforms = ['ios', 'android', 'windows', 'web']; -exports.DEFAULT_METRO_MINIFIER_PATH = 'metro-minify-terser'; +exports.DEFAULT_METRO_MINIFIER_PATH = (require.resolve( + 'metro-minify-terser', +): string); exports.defaultCreateModuleIdFactory = defaultCreateModuleIdFactory; diff --git a/packages/metro-transform-worker/package.json b/packages/metro-transform-worker/package.json index edaeeed25d..ab53cecec3 100644 --- a/packages/metro-transform-worker/package.json +++ b/packages/metro-transform-worker/package.json @@ -26,9 +26,8 @@ "nullthrows": "^1.1.1" }, "devDependencies": { - "metro-memory-fs": "0.80.4", - "metro-minify-terser": "0.80.4", - "@react-native/metro-babel-transformer": "0.73.11" + "@react-native/metro-babel-transformer": "0.73.11", + "metro-memory-fs": "0.80.4" }, "engines": { "node": ">=18" diff --git a/packages/metro/package.json b/packages/metro/package.json index 3611f6d07f..4d6ab2ce80 100644 --- a/packages/metro/package.json +++ b/packages/metro/package.json @@ -40,7 +40,6 @@ "metro-config": "0.80.4", "metro-core": "0.80.4", "metro-file-map": "0.80.4", - "metro-minify-terser": "0.80.4", "metro-resolver": "0.80.4", "metro-runtime": "0.80.4", "metro-source-map": "0.80.4",