From eb98d492e129916b3285dd7b10d87423620564af Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Mon, 14 Jun 2021 12:16:24 +0200 Subject: [PATCH 1/5] Add experimental transformer setting for disabling require() renaming --- packages/metro-config/src/configTypes.flow.js | 1 + packages/metro-config/src/defaults/index.js | 1 + .../src/__tests__/index-test.js | 19 ++++++++++ packages/metro-transform-worker/src/index.js | 36 ++++++++++++++----- .../metro/src/DeltaBundler/Transformer.js | 2 ++ packages/metro/src/lib/getGraphId.js | 1 + packages/metro/src/lib/transformHelpers.js | 2 ++ 7 files changed, 54 insertions(+), 8 deletions(-) diff --git a/packages/metro-config/src/configTypes.flow.js b/packages/metro-config/src/configTypes.flow.js index 4e73d36c70..08dc012683 100644 --- a/packages/metro-config/src/configTypes.flow.js +++ b/packages/metro-config/src/configTypes.flow.js @@ -46,6 +46,7 @@ type ExtraTransformOptions = { +inlineRequires: {+blockList: {[string]: true, ...}, ...} | boolean, +nonInlinedRequires?: $ReadOnlyArray, +unstable_disableES6Transforms?: boolean, + +unstable_disableModuleWrapping?: boolean, |}, ... }; diff --git a/packages/metro-config/src/defaults/index.js b/packages/metro-config/src/defaults/index.js index f742193058..a0f0e8c7e4 100644 --- a/packages/metro-config/src/defaults/index.js +++ b/packages/metro-config/src/defaults/index.js @@ -86,6 +86,7 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({ experimentalImportSupport: false, inlineRequires: false, unstable_disableES6Transforms: false, + unstable_disableModuleWrapping: false, }, preloadedModules: false, ramGroups: [], diff --git a/packages/metro-transform-worker/src/__tests__/index-test.js b/packages/metro-transform-worker/src/__tests__/index-test.js index 4c757ce514..2b4856c232 100644 --- a/packages/metro-transform-worker/src/__tests__/index-test.js +++ b/packages/metro-transform-worker/src/__tests__/index-test.js @@ -266,6 +266,25 @@ it('does not add "use strict" on non-modules', async () => { ); }); +it('preserves require() calls when module wrapping is disabled', async () => { + const contents = ['require("./c");'].join('\n'); + + const result = await Transformer.transform( + baseConfig, + '/root', + 'local/file.js', + contents, + { + dev: true, + unstable_disableModuleWrapping: true, + type: 'module', + }, + ); + + expect(result.output[0].type).toBe('js/module'); + expect(result.output[0].data.code).toBe('require("./c");'); +}); + it('reports filename when encountering unsupported dynamic dependency', async () => { const contents = [ 'require("./a");', diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js index a14f3706bc..613e1a59c5 100644 --- a/packages/metro-transform-worker/src/index.js +++ b/packages/metro-transform-worker/src/index.js @@ -36,7 +36,10 @@ const { } = require('metro-source-map'); import type {TransformResultDependency} from 'metro/src/DeltaBundler'; import type {AllowOptionalDependencies} from 'metro/src/DeltaBundler/types.flow.js'; -import type {DynamicRequiresBehavior} from 'metro/src/ModuleGraph/worker/collectDependencies'; +import type { + DependencyTransformer, + DynamicRequiresBehavior, +} from 'metro/src/ModuleGraph/worker/collectDependencies'; import type { BasicSourceMap, FBSourceFunctionMap, @@ -112,6 +115,7 @@ export type JsTransformOptions = $ReadOnly<{| runtimeBytecodeVersion: ?number, type: Type, unstable_disableES6Transforms?: boolean, + unstable_disableModuleWrapping?: boolean, unstable_transformProfile: TransformProfile, |}>; @@ -257,6 +261,14 @@ const compileToBytecode = ( return HermesCompiler.compile(code, options); }; +const disabledDependencyTransformer: DependencyTransformer = { + transformSyncRequire: () => void 0, + transformImportCall: () => void 0, + transformJSResource: () => void 0, + transformPrefetch: () => void 0, + transformIllegalDynamicRequire: () => void 0, +}; + class InvalidRequireCallError extends Error { innerError: InternalInvalidRequireCallError; filename: string; @@ -372,6 +384,10 @@ async function transformJS( try { const opts = { asyncRequireModulePath: config.asyncRequireModulePath, + dependencyTransformer: + options.unstable_disableModuleWrapping === true + ? disabledDependencyTransformer + : undefined, dynamicRequires: getDynamicDepsBehavior( config.dynamicDepsInPackages, file.filename, @@ -391,13 +407,17 @@ async function transformJS( throw error; } - ({ast: wrappedAst} = JsFileWrapping.wrapModule( - ast, - importDefault, - importAll, - dependencyMapName, - config.globalPrefix, - )); + if (options.unstable_disableModuleWrapping === true) { + wrappedAst = ast; + } else { + ({ast: wrappedAst} = JsFileWrapping.wrapModule( + ast, + importDefault, + importAll, + dependencyMapName, + config.globalPrefix, + )); + } } const minify = diff --git a/packages/metro/src/DeltaBundler/Transformer.js b/packages/metro/src/DeltaBundler/Transformer.js index 03c2f7318d..afe98cd103 100644 --- a/packages/metro/src/DeltaBundler/Transformer.js +++ b/packages/metro/src/DeltaBundler/Transformer.js @@ -84,6 +84,7 @@ class Transformer { runtimeBytecodeVersion, type, unstable_disableES6Transforms, + unstable_disableModuleWrapping, unstable_transformProfile, ...extra } = transformerOptions; @@ -118,6 +119,7 @@ class Transformer { runtimeBytecodeVersion, type, unstable_disableES6Transforms, + unstable_disableModuleWrapping, unstable_transformProfile, ]); diff --git a/packages/metro/src/lib/getGraphId.js b/packages/metro/src/lib/getGraphId.js index a178e38649..96d6f49026 100644 --- a/packages/metro/src/lib/getGraphId.js +++ b/packages/metro/src/lib/getGraphId.js @@ -41,6 +41,7 @@ function getGraphId( hot: options.hot, minify: options.minify, unstable_disableES6Transforms: options.unstable_disableES6Transforms, + unstable_disableModuleWrapping: options.unstable_disableModuleWrapping, platform: options.platform != null ? options.platform : null, runtimeBytecodeVersion: options.runtimeBytecodeVersion, type: options.type, diff --git a/packages/metro/src/lib/transformHelpers.js b/packages/metro/src/lib/transformHelpers.js index e44e3e2d5b..7175fa7764 100644 --- a/packages/metro/src/lib/transformHelpers.js +++ b/packages/metro/src/lib/transformHelpers.js @@ -93,6 +93,8 @@ async function calcTransformerOptions( experimentalImportSupport: transform.experimentalImportSupport || false, unstable_disableES6Transforms: transform.unstable_disableES6Transforms || false, + unstable_disableModuleWrapping: + transform.unstable_disableModuleWrapping || false, nonInlinedRequires: transform.nonInlinedRequires || baseIgnoredInlineRequires, type: 'module', From d69895baebff415d1a8a1de3ee921d7678f1a84f Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Fri, 18 Jun 2021 14:15:09 +0200 Subject: [PATCH 2/5] tests for getGraphId + calcTransformerOptions --- .../src/lib/__tests__/getGraphId-test.js | 31 ++++++++++ .../lib/__tests__/transformHelpers-test.js | 56 +++++++++++++++++++ packages/metro/src/lib/transformHelpers.js | 1 + 3 files changed, 88 insertions(+) create mode 100644 packages/metro/src/lib/__tests__/transformHelpers-test.js diff --git a/packages/metro/src/lib/__tests__/getGraphId-test.js b/packages/metro/src/lib/__tests__/getGraphId-test.js index 5e024610ba..4b00f4809b 100644 --- a/packages/metro/src/lib/__tests__/getGraphId-test.js +++ b/packages/metro/src/lib/__tests__/getGraphId-test.js @@ -215,4 +215,35 @@ describe('getGraphId', () => { ), ); }); + + it('generates a unique id with unstable_disableModuleWrapping', () => { + const transformOptions = { + dev: true, + hot: true, + minify: true, + type: 'module', + platform: 'web', + runtimeBytecodeVersion: null, + unstable_transformProfile: 'default', + }; + expect( + getGraphId( + '/root/waddup', + { + ...transformOptions, + unstable_disableModuleWrapping: false, + }, + {shallow: false, experimentalImportBundleSupport: false}, + ), + ).not.toBe( + getGraphId( + '/root/waddup', + { + ...transformOptions, + unstable_disableModuleWrapping: true, + }, + {shallow: false, experimentalImportBundleSupport: false}, + ), + ); + }); }); diff --git a/packages/metro/src/lib/__tests__/transformHelpers-test.js b/packages/metro/src/lib/__tests__/transformHelpers-test.js new file mode 100644 index 0000000000..2ed702fa9d --- /dev/null +++ b/packages/metro/src/lib/__tests__/transformHelpers-test.js @@ -0,0 +1,56 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + * + * @emails oncall+metro_bundler + * @format + */ + +'use strict'; + +const {calcTransformerOptions} = require('../transformHelpers'); + +describe('calcTransformerOptions', () => { + const entryFiles = []; + const bundler = {}; + const deltaBundler = {}; + const options = {}; + + it('returns `unstable_disableModuleWrapping: false` by default', async () => { + const transformOptions = await calcTransformerOptions( + entryFiles, + bundler, + deltaBundler, + { + transformer: { + getTransformOptions: async () => ({ + transform: {}, + }), + }, + }, + options, + ); + expect(transformOptions.unstable_disableModuleWrapping).toBe(false); + }); + + it('returns `unstable_disableModuleWrapping`', async () => { + const transformOptions = await calcTransformerOptions( + entryFiles, + bundler, + deltaBundler, + { + transformer: { + getTransformOptions: async () => ({ + transform: { + unstable_disableModuleWrapping: true, + }, + }), + }, + }, + options, + ); + expect(transformOptions.unstable_disableModuleWrapping).toBe(true); + }); +}); diff --git a/packages/metro/src/lib/transformHelpers.js b/packages/metro/src/lib/transformHelpers.js index 7175fa7764..a7eaf4bb09 100644 --- a/packages/metro/src/lib/transformHelpers.js +++ b/packages/metro/src/lib/transformHelpers.js @@ -167,6 +167,7 @@ async function getResolveDependencyFn( } module.exports = { + calcTransformerOptions, getTransformFn, getResolveDependencyFn, }; From a42d64a62c40ac5226e64ed608bdb44db6d4d830 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Tue, 22 Jun 2021 17:31:19 +0200 Subject: [PATCH 3/5] disable JSON wrapping --- packages/metro-transform-worker/src/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js index 613e1a59c5..8912782e03 100644 --- a/packages/metro-transform-worker/src/index.js +++ b/packages/metro-transform-worker/src/index.js @@ -560,7 +560,10 @@ async function transformJSON( file: JSONFile, {options, config, projectRoot}: TransformationContext, ): Promise { - let code = JsFileWrapping.wrapJson(file.code, config.globalPrefix); + let code = + options.unstable_disableModuleWrapping === true + ? JsFileWrapping.jsonToCommonJS(file.code) + : JsFileWrapping.wrapJson(file.code, config.globalPrefix); let map = []; // TODO: When we can reuse transformJS for JSON, we should not derive `minify` separately. From 57230a9809f4db2a613e9b3be1ee364c87340006 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Tue, 22 Jun 2021 18:18:36 +0200 Subject: [PATCH 4/5] add test for disabline JSON wrapping --- .../src/__tests__/index-test.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/metro-transform-worker/src/__tests__/index-test.js b/packages/metro-transform-worker/src/__tests__/index-test.js index 2b4856c232..0c877ca1ce 100644 --- a/packages/metro-transform-worker/src/__tests__/index-test.js +++ b/packages/metro-transform-worker/src/__tests__/index-test.js @@ -379,6 +379,24 @@ it('minifies a JSON file', async () => { ); }); +it('does not wrap a JSON file when disableModuleWrapping is enabled', async () => { + expect( + ( + await Transformer.transform( + baseConfig, + '/root', + 'local/file.json', + 'arbitrary(code);', + { + dev: true, + unstable_disableModuleWrapping: true, + type: 'module', + }, + ) + ).output[0].data.code, + ).toBe('module.exports = arbitrary(code);;'); +}); + it('transforms a script to JS source and bytecode', async () => { const result = await Transformer.transform( baseConfig, From c994fb0cb3e4df3fe6e2b6cb2b42912aea8d3a4d Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Wed, 23 Jun 2021 20:27:48 +0200 Subject: [PATCH 5/5] moved to JsTransformerConfig --- .../__snapshots__/loadConfig-test.js.snap | 4 ++ packages/metro-config/src/configTypes.flow.js | 1 - packages/metro-config/src/defaults/index.js | 2 +- .../src/__tests__/index-test.js | 13 +++-- packages/metro-transform-worker/src/index.js | 8 +-- .../metro/src/DeltaBundler/Transformer.js | 2 - .../src/lib/__tests__/getGraphId-test.js | 31 ---------- .../lib/__tests__/transformHelpers-test.js | 56 ------------------- packages/metro/src/lib/getGraphId.js | 1 - packages/metro/src/lib/transformHelpers.js | 3 - 10 files changed, 18 insertions(+), 103 deletions(-) delete mode 100644 packages/metro/src/lib/__tests__/transformHelpers-test.js 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 0c6521c431..4900298379 100644 --- a/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap +++ b/packages/metro-config/src/__tests__/__snapshots__/loadConfig-test.js.snap @@ -131,6 +131,7 @@ Object { "unstable_collectDependenciesPath": "metro/src/ModuleGraph/worker/collectDependencies.js", "unstable_compactOutput": false, "unstable_dependencyMapReservedName": null, + "unstable_disableModuleWrapping": false, "unstable_disableNormalizePseudoGlobals": false, "workerPath": "metro/src/DeltaBundler/Worker", }, @@ -272,6 +273,7 @@ Object { "unstable_collectDependenciesPath": "metro/src/ModuleGraph/worker/collectDependencies.js", "unstable_compactOutput": false, "unstable_dependencyMapReservedName": null, + "unstable_disableModuleWrapping": false, "unstable_disableNormalizePseudoGlobals": false, "workerPath": "metro/src/DeltaBundler/Worker", }, @@ -413,6 +415,7 @@ Object { "unstable_collectDependenciesPath": "metro/src/ModuleGraph/worker/collectDependencies.js", "unstable_compactOutput": false, "unstable_dependencyMapReservedName": null, + "unstable_disableModuleWrapping": false, "unstable_disableNormalizePseudoGlobals": false, "workerPath": "metro/src/DeltaBundler/Worker", }, @@ -554,6 +557,7 @@ Object { "unstable_collectDependenciesPath": "metro/src/ModuleGraph/worker/collectDependencies.js", "unstable_compactOutput": false, "unstable_dependencyMapReservedName": null, + "unstable_disableModuleWrapping": false, "unstable_disableNormalizePseudoGlobals": false, "workerPath": "metro/src/DeltaBundler/Worker", }, diff --git a/packages/metro-config/src/configTypes.flow.js b/packages/metro-config/src/configTypes.flow.js index 08dc012683..4e73d36c70 100644 --- a/packages/metro-config/src/configTypes.flow.js +++ b/packages/metro-config/src/configTypes.flow.js @@ -46,7 +46,6 @@ type ExtraTransformOptions = { +inlineRequires: {+blockList: {[string]: true, ...}, ...} | boolean, +nonInlinedRequires?: $ReadOnlyArray, +unstable_disableES6Transforms?: boolean, - +unstable_disableModuleWrapping?: boolean, |}, ... }; diff --git a/packages/metro-config/src/defaults/index.js b/packages/metro-config/src/defaults/index.js index a0f0e8c7e4..564f16ea61 100644 --- a/packages/metro-config/src/defaults/index.js +++ b/packages/metro-config/src/defaults/index.js @@ -86,7 +86,6 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({ experimentalImportSupport: false, inlineRequires: false, unstable_disableES6Transforms: false, - unstable_disableModuleWrapping: false, }, preloadedModules: false, ramGroups: [], @@ -120,6 +119,7 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({ unstable_collectDependenciesPath: 'metro/src/ModuleGraph/worker/collectDependencies.js', unstable_dependencyMapReservedName: null, + unstable_disableModuleWrapping: false, unstable_disableNormalizePseudoGlobals: false, unstable_compactOutput: false, }, diff --git a/packages/metro-transform-worker/src/__tests__/index-test.js b/packages/metro-transform-worker/src/__tests__/index-test.js index 0c877ca1ce..0f88ee7aba 100644 --- a/packages/metro-transform-worker/src/__tests__/index-test.js +++ b/packages/metro-transform-worker/src/__tests__/index-test.js @@ -62,6 +62,7 @@ const baseConfig: JsTransformerConfig = { 'metro/src/ModuleGraph/worker/collectDependencies', unstable_dependencyMapReservedName: null, unstable_compactOutput: false, + unstable_disableModuleWrapping: false, unstable_disableNormalizePseudoGlobals: false, }; @@ -270,13 +271,15 @@ it('preserves require() calls when module wrapping is disabled', async () => { const contents = ['require("./c");'].join('\n'); const result = await Transformer.transform( - baseConfig, + { + ...baseConfig, + unstable_disableModuleWrapping: true, + }, '/root', 'local/file.js', contents, { dev: true, - unstable_disableModuleWrapping: true, type: 'module', }, ); @@ -383,13 +386,15 @@ it('does not wrap a JSON file when disableModuleWrapping is enabled', async () = expect( ( await Transformer.transform( - baseConfig, + { + ...baseConfig, + unstable_disableModuleWrapping: true, + }, '/root', 'local/file.json', 'arbitrary(code);', { dev: true, - unstable_disableModuleWrapping: true, type: 'module', }, ) diff --git a/packages/metro-transform-worker/src/index.js b/packages/metro-transform-worker/src/index.js index 8912782e03..68707b9633 100644 --- a/packages/metro-transform-worker/src/index.js +++ b/packages/metro-transform-worker/src/index.js @@ -96,6 +96,7 @@ export type JsTransformerConfig = $ReadOnly<{| allowOptionalDependencies: AllowOptionalDependencies, unstable_collectDependenciesPath: string, unstable_dependencyMapReservedName: ?string, + unstable_disableModuleWrapping: boolean, unstable_disableNormalizePseudoGlobals: boolean, unstable_compactOutput: boolean, |}>; @@ -115,7 +116,6 @@ export type JsTransformOptions = $ReadOnly<{| runtimeBytecodeVersion: ?number, type: Type, unstable_disableES6Transforms?: boolean, - unstable_disableModuleWrapping?: boolean, unstable_transformProfile: TransformProfile, |}>; @@ -385,7 +385,7 @@ async function transformJS( const opts = { asyncRequireModulePath: config.asyncRequireModulePath, dependencyTransformer: - options.unstable_disableModuleWrapping === true + config.unstable_disableModuleWrapping === true ? disabledDependencyTransformer : undefined, dynamicRequires: getDynamicDepsBehavior( @@ -407,7 +407,7 @@ async function transformJS( throw error; } - if (options.unstable_disableModuleWrapping === true) { + if (config.unstable_disableModuleWrapping === true) { wrappedAst = ast; } else { ({ast: wrappedAst} = JsFileWrapping.wrapModule( @@ -561,7 +561,7 @@ async function transformJSON( {options, config, projectRoot}: TransformationContext, ): Promise { let code = - options.unstable_disableModuleWrapping === true + config.unstable_disableModuleWrapping === true ? JsFileWrapping.jsonToCommonJS(file.code) : JsFileWrapping.wrapJson(file.code, config.globalPrefix); let map = []; diff --git a/packages/metro/src/DeltaBundler/Transformer.js b/packages/metro/src/DeltaBundler/Transformer.js index afe98cd103..03c2f7318d 100644 --- a/packages/metro/src/DeltaBundler/Transformer.js +++ b/packages/metro/src/DeltaBundler/Transformer.js @@ -84,7 +84,6 @@ class Transformer { runtimeBytecodeVersion, type, unstable_disableES6Transforms, - unstable_disableModuleWrapping, unstable_transformProfile, ...extra } = transformerOptions; @@ -119,7 +118,6 @@ class Transformer { runtimeBytecodeVersion, type, unstable_disableES6Transforms, - unstable_disableModuleWrapping, unstable_transformProfile, ]); diff --git a/packages/metro/src/lib/__tests__/getGraphId-test.js b/packages/metro/src/lib/__tests__/getGraphId-test.js index 4b00f4809b..5e024610ba 100644 --- a/packages/metro/src/lib/__tests__/getGraphId-test.js +++ b/packages/metro/src/lib/__tests__/getGraphId-test.js @@ -215,35 +215,4 @@ describe('getGraphId', () => { ), ); }); - - it('generates a unique id with unstable_disableModuleWrapping', () => { - const transformOptions = { - dev: true, - hot: true, - minify: true, - type: 'module', - platform: 'web', - runtimeBytecodeVersion: null, - unstable_transformProfile: 'default', - }; - expect( - getGraphId( - '/root/waddup', - { - ...transformOptions, - unstable_disableModuleWrapping: false, - }, - {shallow: false, experimentalImportBundleSupport: false}, - ), - ).not.toBe( - getGraphId( - '/root/waddup', - { - ...transformOptions, - unstable_disableModuleWrapping: true, - }, - {shallow: false, experimentalImportBundleSupport: false}, - ), - ); - }); }); diff --git a/packages/metro/src/lib/__tests__/transformHelpers-test.js b/packages/metro/src/lib/__tests__/transformHelpers-test.js deleted file mode 100644 index 2ed702fa9d..0000000000 --- a/packages/metro/src/lib/__tests__/transformHelpers-test.js +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * - * @emails oncall+metro_bundler - * @format - */ - -'use strict'; - -const {calcTransformerOptions} = require('../transformHelpers'); - -describe('calcTransformerOptions', () => { - const entryFiles = []; - const bundler = {}; - const deltaBundler = {}; - const options = {}; - - it('returns `unstable_disableModuleWrapping: false` by default', async () => { - const transformOptions = await calcTransformerOptions( - entryFiles, - bundler, - deltaBundler, - { - transformer: { - getTransformOptions: async () => ({ - transform: {}, - }), - }, - }, - options, - ); - expect(transformOptions.unstable_disableModuleWrapping).toBe(false); - }); - - it('returns `unstable_disableModuleWrapping`', async () => { - const transformOptions = await calcTransformerOptions( - entryFiles, - bundler, - deltaBundler, - { - transformer: { - getTransformOptions: async () => ({ - transform: { - unstable_disableModuleWrapping: true, - }, - }), - }, - }, - options, - ); - expect(transformOptions.unstable_disableModuleWrapping).toBe(true); - }); -}); diff --git a/packages/metro/src/lib/getGraphId.js b/packages/metro/src/lib/getGraphId.js index 96d6f49026..a178e38649 100644 --- a/packages/metro/src/lib/getGraphId.js +++ b/packages/metro/src/lib/getGraphId.js @@ -41,7 +41,6 @@ function getGraphId( hot: options.hot, minify: options.minify, unstable_disableES6Transforms: options.unstable_disableES6Transforms, - unstable_disableModuleWrapping: options.unstable_disableModuleWrapping, platform: options.platform != null ? options.platform : null, runtimeBytecodeVersion: options.runtimeBytecodeVersion, type: options.type, diff --git a/packages/metro/src/lib/transformHelpers.js b/packages/metro/src/lib/transformHelpers.js index a7eaf4bb09..e44e3e2d5b 100644 --- a/packages/metro/src/lib/transformHelpers.js +++ b/packages/metro/src/lib/transformHelpers.js @@ -93,8 +93,6 @@ async function calcTransformerOptions( experimentalImportSupport: transform.experimentalImportSupport || false, unstable_disableES6Transforms: transform.unstable_disableES6Transforms || false, - unstable_disableModuleWrapping: - transform.unstable_disableModuleWrapping || false, nonInlinedRequires: transform.nonInlinedRequires || baseIgnoredInlineRequires, type: 'module', @@ -167,7 +165,6 @@ async function getResolveDependencyFn( } module.exports = { - calcTransformerOptions, getTransformFn, getResolveDependencyFn, };