Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add unstable_renameRequire to allow disabling the require rename transform #1230

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ Object {
"unstable_dependencyMapReservedName": null,
"unstable_disableModuleWrapping": false,
"unstable_disableNormalizePseudoGlobals": false,
"unstable_renameRequire": true,
"unstable_workerThreads": false,
"workerPath": "metro/src/DeltaBundler/Worker",
},
Expand Down Expand Up @@ -333,6 +334,7 @@ Object {
"unstable_dependencyMapReservedName": null,
"unstable_disableModuleWrapping": false,
"unstable_disableNormalizePseudoGlobals": false,
"unstable_renameRequire": true,
"unstable_workerThreads": false,
"workerPath": "metro/src/DeltaBundler/Worker",
},
Expand Down Expand Up @@ -514,6 +516,7 @@ Object {
"unstable_dependencyMapReservedName": null,
"unstable_disableModuleWrapping": false,
"unstable_disableNormalizePseudoGlobals": false,
"unstable_renameRequire": true,
"unstable_workerThreads": false,
"workerPath": "metro/src/DeltaBundler/Worker",
},
Expand Down Expand Up @@ -695,6 +698,7 @@ Object {
"unstable_dependencyMapReservedName": null,
"unstable_disableModuleWrapping": false,
"unstable_disableNormalizePseudoGlobals": false,
"unstable_renameRequire": true,
"unstable_workerThreads": false,
"workerPath": "metro/src/DeltaBundler/Worker",
},
Expand Down
1 change: 1 addition & 0 deletions packages/metro-config/src/defaults/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ const getDefaultValues = (projectRoot: ?string): ConfigT => ({
unstable_dependencyMapReservedName: null,
unstable_disableModuleWrapping: false,
unstable_disableNormalizePseudoGlobals: false,
unstable_renameRequire: true,
unstable_compactOutput: false,
unstable_workerThreads: false,
},
Expand Down
6 changes: 6 additions & 0 deletions packages/metro-transform-worker/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ export type JsTransformerConfig = $ReadOnly<{
unstable_compactOutput: boolean,
/** Enable `require.context` statements which can be used to import multiple files in a directory. */
unstable_allowRequireContext: boolean,
/** Whether to rename scoped `require` functions to `_$$_REQUIRE`, usually an extraneous operation when serializing to iife (default). */
unstable_renameRequire?: boolean,
}>;

export type {CustomTransformOptions} from 'metro-babel-transformer';
Expand Down Expand Up @@ -387,6 +389,10 @@ async function transformJS(
importAll,
dependencyMapName,
config.globalPrefix,
// TODO: This config is optional to allow its introduction in a minor
// release. It should be made non-optional in ConfigT or removed in
// future.
config.unstable_renameRequire === false,
));
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/metro-transform-worker/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ export type JsTransformerConfig = Readonly<{
unstable_compactOutput: boolean;
/** Enable `require.context` statements which can be used to import multiple files in a directory. */
unstable_allowRequireContext: boolean;
/** Whether to rename scoped `require` functions to `_$$_REQUIRE`, usually an extraneous operation when serializing to iife (default). */
unstable_renameRequire?: boolean;
}>;

export {CustomTransformOptions} from 'metro-babel-transformer';
Expand Down
5 changes: 4 additions & 1 deletion packages/metro/src/ModuleGraph/worker/JsFileWrapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ function wrapModule(
importAllName: string,
dependencyMapName: string,
globalPrefix: string,
skipRequireRename: boolean,
): {
ast: BabelNodeFile,
requireName: string,
Expand All @@ -45,7 +46,9 @@ function wrapModule(
const def = t.callExpression(t.identifier(`${globalPrefix}__d`), [factory]);
const ast = t.file(t.program([t.expressionStatement(def)]));

const requireName = renameRequires(ast);
// `require` doesn't need to be scoped when Metro serializes to iife because the local function
// `require` will be used instead of the global one.
const requireName = skipRequireRename ? 'require' : renameRequires(ast);

return {ast, requireName};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ it('wraps a module correctly', () => {
'_$$_IMPORT_ALL',
dependencyMapName,
defaultGlobalPrefix,
false,
);

expect(requireName).toBe(BABEL_RENAMED);
Expand All @@ -58,6 +59,42 @@ it('wraps a module correctly', () => {
);
});

it('wraps a module without renaming require statements', () => {
const dependencyMapName = '_dependencyMapName';
const skipRequireRename = true;
const originalAst = astFromCode(`
const dynamicRequire = require;
const a = require('b/lib/a');
exports.do = () => require("do");
if (!something) {
require("setup/something");
}
require.blah('do');
`);
const {ast, requireName} = JsFileWrapping.wrapModule(
originalAst,
'_$$_IMPORT_DEFAULT',
'_$$_IMPORT_ALL',
dependencyMapName,
defaultGlobalPrefix,
skipRequireRename,
);

expect(requireName).toBe('require');
expect(codeFromAst(ast)).toEqual(
comparableCode(`
__d(function (global, require, _$$_IMPORT_DEFAULT, _$$_IMPORT_ALL, module, exports, _dependencyMapName) {
const dynamicRequire = require;
const a = require('b/lib/a');
exports.do = () => require("do");
if (!something) {
require("setup/something");
}
require.blah('do');
});`),
);
});

it('wraps a module correctly with global prefix', () => {
const dependencyMapName = '_dependencyMapName';

Expand All @@ -71,6 +108,7 @@ it('wraps a module correctly with global prefix', () => {
'_$$_IMPORT_ALL',
dependencyMapName,
globalPrefix,
false,
);

expect(requireName).toBe(BABEL_RENAMED);
Expand Down Expand Up @@ -104,6 +142,7 @@ describe('safe renaming of require', () => {
'_$$_IMPORT_ALL',
dependencyMapName,
defaultGlobalPrefix,
false,
);

expect(requireName).toBe(BABEL_RENAMED);
Expand Down Expand Up @@ -141,6 +180,7 @@ describe('safe renaming of require', () => {
'_$$_IMPORT_ALL',
dependencyMapName,
defaultGlobalPrefix,
false,
);

expect(requireName).toBe(BABEL_RENAMED2);
Expand Down Expand Up @@ -181,6 +221,7 @@ describe('safe renaming of require', () => {
'_$$_IMPORT_ALL',
dependencyMapName,
defaultGlobalPrefix,
false,
);

expect(requireName).toBe(BABEL_RENAMED2);
Expand Down