diff --git a/lib/CompatibilityPlugin.js b/lib/CompatibilityPlugin.js index 4d36df6b85a..3b8d796ceef 100644 --- a/lib/CompatibilityPlugin.js +++ b/lib/CompatibilityPlugin.js @@ -10,6 +10,7 @@ const { JAVASCRIPT_MODULE_TYPE_DYNAMIC, JAVASCRIPT_MODULE_TYPE_ESM } = require("./ModuleTypeConstants"); +const RuntimeGlobals = require("./RuntimeGlobals"); const ConstDependency = require("./dependencies/ConstDependency"); /** @typedef {import("./Compiler")} Compiler */ @@ -79,7 +80,7 @@ class CompatibilityPlugin { if ( statement.type === "FunctionDeclaration" && statement.id && - statement.id.name === "__webpack_require__" + statement.id.name === RuntimeGlobals.require ) { const newName = `__nested_webpack_require_${statement.range[0]}__`; parser.tagVariable( @@ -98,7 +99,7 @@ class CompatibilityPlugin { } }); parser.hooks.pattern - .for("__webpack_require__") + .for(RuntimeGlobals.require) .tap(PLUGIN_NAME, pattern => { const newName = `__nested_webpack_require_${pattern.range[0]}__`; parser.tagVariable(pattern.name, nestedWebpackIdentifierTag, { diff --git a/lib/Compilation.js b/lib/Compilation.js index 5c6a363ec75..705b185b34d 100644 --- a/lib/Compilation.js +++ b/lib/Compilation.js @@ -5024,13 +5024,13 @@ This prevents using hashes of each other and should be avoided.`); }; const interceptModuleExecution = (__webpack_require__[ RuntimeGlobals.interceptModuleExecution.replace( - "__webpack_require__.", + `${RuntimeGlobals.require}.`, "" ) ] = []); const moduleCache = (__webpack_require__[ RuntimeGlobals.moduleCache.replace( - "__webpack_require__.", + `${RuntimeGlobals.require}.`, "" ) ] = {}); diff --git a/lib/ContextModule.js b/lib/ContextModule.js index cfbe31e2b2c..9ded86611f3 100644 --- a/lib/ContextModule.js +++ b/lib/ContextModule.js @@ -640,7 +640,7 @@ class ContextModule extends Module { getReturn(type, asyncModule) { if (type === 9) { - return "__webpack_require__(id)"; + return `${RuntimeGlobals.require}(id)`; } return `${RuntimeGlobals.createFakeNamespaceObject}(id, ${type}${ asyncModule ? " | 16" : "" @@ -799,7 +799,7 @@ module.exports = webpackAsyncContext;`; ? `${arrow ? "id =>" : "function(id)"} { ${this.getReturnModuleObjectSource(fakeMap)} }` - : "__webpack_require__"; + : RuntimeGlobals.require; return `var map = ${JSON.stringify(map, null, "\t")}; ${this.getFakeMapInitStatement(fakeMap)} @@ -850,7 +850,7 @@ module.exports = webpackAsyncContext;`; ? `${arrow ? "id =>" : "function(id)"} { ${this.getReturnModuleObjectSource(fakeMap, true)}; }` - : "__webpack_require__"; + : RuntimeGlobals.require; return `var map = ${JSON.stringify(map, null, "\t")}; ${this.getFakeMapInitStatement(fakeMap)} diff --git a/lib/DllModule.js b/lib/DllModule.js index 5a8de32bebb..da12978f297 100644 --- a/lib/DllModule.js +++ b/lib/DllModule.js @@ -89,7 +89,7 @@ class DllModule extends Module { const sources = new Map(); sources.set( "javascript", - new RawSource("module.exports = __webpack_require__;") + new RawSource(`module.exports = ${RuntimeGlobals.require};`) ); return { sources, diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js index ee07a0b700e..68578476ee7 100644 --- a/lib/MainTemplate.js +++ b/lib/MainTemplate.js @@ -306,8 +306,8 @@ class MainTemplate { Object.defineProperty(MainTemplate.prototype, "requireFn", { get: util.deprecate( - () => "__webpack_require__", - 'MainTemplate.requireFn is deprecated (use "__webpack_require__")', + () => RuntimeGlobals.require, + `MainTemplate.requireFn is deprecated (use "${RuntimeGlobals.require}")`, "DEP_WEBPACK_MAIN_TEMPLATE_REQUIRE_FN" ) }); diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js index b5a3e31793f..90e4e7ec0e1 100644 --- a/lib/RuntimeTemplate.js +++ b/lib/RuntimeTemplate.js @@ -429,7 +429,7 @@ class RuntimeTemplate { ); } runtimeRequirements.add(RuntimeGlobals.require); - return `__webpack_require__(${this.moduleId({ + return `${RuntimeGlobals.require}(${this.moduleId({ module, chunkGraph, request, @@ -625,7 +625,7 @@ class RuntimeTemplate { )})`; } else { runtimeRequirements.add(RuntimeGlobals.require); - appending = `.then(__webpack_require__.bind(__webpack_require__, ${comment}${idExpr}))`; + appending = `.then(${RuntimeGlobals.require}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}))`; } break; case "dynamic": @@ -651,7 +651,7 @@ class RuntimeTemplate { )})`; } else { runtimeRequirements.add(RuntimeGlobals.require); - appending = `.then(__webpack_require__.bind(__webpack_require__, ${comment}${idExpr}))`; + appending = `.then(${RuntimeGlobals.require}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}))`; } appending += `.then(${this.returningFunction( `${RuntimeGlobals.createFakeNamespaceObject}(m, ${fakeType})`, @@ -666,7 +666,7 @@ class RuntimeTemplate { `${header}return ${returnExpression};` )})`; } else { - appending = `.then(${RuntimeGlobals.createFakeNamespaceObject}.bind(__webpack_require__, ${comment}${idExpr}, ${fakeType}))`; + appending = `.then(${RuntimeGlobals.createFakeNamespaceObject}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}, ${fakeType}))`; } } break; @@ -773,7 +773,7 @@ class RuntimeTemplate { originModule.buildMeta.strictHarmonyModule ); runtimeRequirements.add(RuntimeGlobals.require); - const importContent = `/* harmony import */ ${optDeclaration}${importVar} = __webpack_require__(${moduleId});\n`; + const importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`; if (exportsType === "dynamic") { runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport); diff --git a/lib/Template.js b/lib/Template.js index 59cb2c157cd..47073954a04 100644 --- a/lib/Template.js +++ b/lib/Template.js @@ -7,6 +7,7 @@ const { ConcatSource, PrefixSource } = require("webpack-sources"); const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants"); +const RuntimeGlobals = require("./RuntimeGlobals"); /** @typedef {import("webpack-sources").Source} Source */ /** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */ @@ -405,7 +406,7 @@ class Template { return new PrefixSource( "/******/ ", new ConcatSource( - "function(__webpack_require__) { // webpackRuntimeModules\n", + `function(${RuntimeGlobals.require}) { // webpackRuntimeModules\n`, this.renderRuntimeModules(runtimeModules, renderContext), "}\n" ) diff --git a/lib/container/FallbackModule.js b/lib/container/FallbackModule.js index c7123af468d..3c8b692fe96 100644 --- a/lib/container/FallbackModule.js +++ b/lib/container/FallbackModule.js @@ -136,7 +136,7 @@ class FallbackModule extends Module { `var loop = ${runtimeTemplate.basicFunction("next", [ "while(i < ids.length) {", Template.indent([ - "try { next = __webpack_require__(ids[i++]); } catch(e) { return handleError(e); }", + `try { next = ${RuntimeGlobals.require}(ids[i++]); } catch(e) { return handleError(e); }`, "if(next) return next.then ? next.then(handleResult, handleError) : handleResult(next);" ]), "}", diff --git a/lib/container/RemoteRuntimeModule.js b/lib/container/RemoteRuntimeModule.js index 7f4d15b2909..48d9d9d9635 100644 --- a/lib/container/RemoteRuntimeModule.js +++ b/lib/container/RemoteRuntimeModule.js @@ -117,7 +117,7 @@ class RemoteRuntimeModule extends RuntimeModule { "module.exports = factory();" ])}` ])};`, - "handleFunction(__webpack_require__, data[2], 0, 0, onExternal, 1);" + `handleFunction(${RuntimeGlobals.require}, data[2], 0, 0, onExternal, 1);` ])});` ]), "}" diff --git a/lib/dependencies/AMDDefineDependency.js b/lib/dependencies/AMDDefineDependency.js index 019f3908c46..bf2959c5a72 100644 --- a/lib/dependencies/AMDDefineDependency.js +++ b/lib/dependencies/AMDDefineDependency.js @@ -19,7 +19,7 @@ const NullDependency = require("./NullDependency"); const DEFINITIONS = { f: { definition: "var __WEBPACK_AMD_DEFINE_RESULT__;", - content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, __webpack_require__, exports, module), + content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, ${RuntimeGlobals.require}, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`, requests: [ RuntimeGlobals.require, @@ -37,7 +37,7 @@ const DEFINITIONS = { "var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;", content: `!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#), __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? - (__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, __webpack_require__, exports, module)) : + (__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, ${RuntimeGlobals.require}, exports, module)) : __WEBPACK_AMD_DEFINE_FACTORY__), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`, requests: [ @@ -69,8 +69,7 @@ const DEFINITIONS = { }, lf: { definition: "var XXX, XXXmodule;", - content: - "!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))", + content: `!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))`, requests: [RuntimeGlobals.require, RuntimeGlobals.module] }, lo: { @@ -80,8 +79,7 @@ const DEFINITIONS = { }, lof: { definition: "var XXX, XXXfactory, XXXmodule;", - content: - "!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, __webpack_require__, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))", + content: `!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))`, requests: [RuntimeGlobals.require, RuntimeGlobals.module] }, laf: { diff --git a/lib/dependencies/AMDDefineDependencyParserPlugin.js b/lib/dependencies/AMDDefineDependencyParserPlugin.js index 7d1c7e9e041..e77520135d3 100644 --- a/lib/dependencies/AMDDefineDependencyParserPlugin.js +++ b/lib/dependencies/AMDDefineDependencyParserPlugin.js @@ -73,7 +73,7 @@ class AMDDefineDependencyParserPlugin { let localModule; if (request === "require") { identifiers[idx] = request; - dep = "__webpack_require__"; + dep = RuntimeGlobals.require; } else if (["exports", "module"].includes(request)) { identifiers[idx] = request; dep = request; @@ -109,7 +109,7 @@ class AMDDefineDependencyParserPlugin { } else if (param.isString()) { let dep, localModule; if (param.string === "require") { - dep = new ConstDependency("__webpack_require__", param.range, [ + dep = new ConstDependency(RuntimeGlobals.require, param.range, [ RuntimeGlobals.require ]); } else if (param.string === "exports") { diff --git a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js index f49f55b4ff1..0a0aaba9bb0 100644 --- a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js +++ b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js @@ -73,7 +73,7 @@ class AMDRequireDependenciesBlockParserPlugin { for (const request of param.array) { let dep, localModule; if (request === "require") { - dep = "__webpack_require__"; + dep = RuntimeGlobals.require; } else if (["exports", "module"].includes(request)) { dep = request; } else if ((localModule = getLocalModule(parser.state, request))) { @@ -108,7 +108,7 @@ class AMDRequireDependenciesBlockParserPlugin { } else if (param.isString()) { let dep, localModule; if (param.string === "require") { - dep = new ConstDependency("__webpack_require__", param.string, [ + dep = new ConstDependency(RuntimeGlobals.require, param.string, [ RuntimeGlobals.require ]); } else if (param.string === "module") { diff --git a/lib/dependencies/AMDRequireDependency.js b/lib/dependencies/AMDRequireDependency.js index 3710bee239a..ffc6c8c54db 100644 --- a/lib/dependencies/AMDRequireDependency.js +++ b/lib/dependencies/AMDRequireDependency.js @@ -111,7 +111,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends ( // has function range but no array range if (dep.functionRange && !dep.arrayRange) { const startBlock = `${promise}.then((`; - const endBlock = `).bind(exports, __webpack_require__, exports, module))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`; + const endBlock = `).bind(exports, ${RuntimeGlobals.require}, exports, module))['catch'](${RuntimeGlobals.uncaughtErrorHandler})`; runtimeRequirements.add(RuntimeGlobals.uncaughtErrorHandler); source.replace(dep.outerRange[0], dep.functionRange[0] - 1, startBlock); diff --git a/lib/dependencies/RequireEnsureDependency.js b/lib/dependencies/RequireEnsureDependency.js index c552faab993..b41b2944fc4 100644 --- a/lib/dependencies/RequireEnsureDependency.js +++ b/lib/dependencies/RequireEnsureDependency.js @@ -93,14 +93,14 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends source.replace( contentRange[1], errorHandlerRange[0] - 1, - ").bind(null, __webpack_require__))['catch'](" + `).bind(null, ${RuntimeGlobals.require}))['catch'](` ); source.replace(errorHandlerRange[1], range[1] - 1, ")"); } else { source.replace( contentRange[1], range[1] - 1, - `).bind(null, __webpack_require__))['catch'](${RuntimeGlobals.uncaughtErrorHandler})` + `).bind(null, ${RuntimeGlobals.require}))['catch'](${RuntimeGlobals.uncaughtErrorHandler})` ); } } diff --git a/lib/dependencies/RequireHeaderDependency.js b/lib/dependencies/RequireHeaderDependency.js index 79022636825..a94fc540991 100644 --- a/lib/dependencies/RequireHeaderDependency.js +++ b/lib/dependencies/RequireHeaderDependency.js @@ -55,7 +55,7 @@ RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends apply(dependency, source, { runtimeRequirements }) { const dep = /** @type {RequireHeaderDependency} */ (dependency); runtimeRequirements.add(RuntimeGlobals.require); - source.replace(dep.range[0], dep.range[1] - 1, "__webpack_require__"); + source.replace(dep.range[0], dep.range[1] - 1, RuntimeGlobals.require); } }; diff --git a/lib/esm/ExportWebpackRequireRuntimeModule.js b/lib/esm/ExportWebpackRequireRuntimeModule.js index 42d97cbd46c..dba8d9d9b68 100644 --- a/lib/esm/ExportWebpackRequireRuntimeModule.js +++ b/lib/esm/ExportWebpackRequireRuntimeModule.js @@ -4,6 +4,7 @@ "use strict"; +const RuntimeGlobals = require("../RuntimeGlobals"); const RuntimeModule = require("../RuntimeModule"); class ExportWebpackRequireRuntimeModule extends RuntimeModule { @@ -22,7 +23,7 @@ class ExportWebpackRequireRuntimeModule extends RuntimeModule { * @returns {string} runtime code */ generate() { - return "export default __webpack_require__;"; + return `export default ${RuntimeGlobals.require};`; } } diff --git a/lib/esm/ModuleChunkFormatPlugin.js b/lib/esm/ModuleChunkFormatPlugin.js index f0266bc0f61..e577d7deb36 100644 --- a/lib/esm/ModuleChunkFormatPlugin.js +++ b/lib/esm/ModuleChunkFormatPlugin.js @@ -123,7 +123,7 @@ class ModuleChunkFormatPlugin { entrySource.add(source); entrySource.add(";\n\n// load runtime\n"); entrySource.add( - `import __webpack_require__ from ${JSON.stringify( + `import ${RuntimeGlobals.require} from ${JSON.stringify( getRelativePath(runtimeChunk) )};\n` ); @@ -131,7 +131,7 @@ class ModuleChunkFormatPlugin { const startupSource = new ConcatSource(); startupSource.add( `var __webpack_exec__ = ${runtimeTemplate.returningFunction( - `__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)`, + `${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`, "moduleId" )}\n` ); diff --git a/lib/esm/ModuleChunkLoadingRuntimeModule.js b/lib/esm/ModuleChunkLoadingRuntimeModule.js index 091bb86db96..3755fcba95f 100644 --- a/lib/esm/ModuleChunkLoadingRuntimeModule.js +++ b/lib/esm/ModuleChunkLoadingRuntimeModule.js @@ -156,7 +156,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule { "}" ]), "}", - "if(runtime) runtime(__webpack_require__);", + `if(runtime) runtime(${RuntimeGlobals.require});`, "for(;i < ids.length; i++) {", Template.indent([ "chunkId = ids[i];", diff --git a/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js b/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js index e4315377d8a..6a23c5f7abd 100644 --- a/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js +++ b/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js @@ -84,8 +84,8 @@ class ArrayPushCallbackChunkFormatPlugin { if (runtimeModules.length > 0 || entries.length > 0) { const runtime = new ConcatSource( (runtimeTemplate.supportsArrowFunction() - ? "__webpack_require__ =>" - : "function(__webpack_require__)") + + ? `${RuntimeGlobals.require} =>` + : `function(${RuntimeGlobals.require})`) + " { // webpackRuntimeModules\n" ); if (runtimeModules.length > 0) { diff --git a/lib/javascript/CommonJsChunkFormatPlugin.js b/lib/javascript/CommonJsChunkFormatPlugin.js index a1d57bcc999..291589ddba6 100644 --- a/lib/javascript/CommonJsChunkFormatPlugin.js +++ b/lib/javascript/CommonJsChunkFormatPlugin.js @@ -120,7 +120,7 @@ class CommonJsChunkFormatPlugin { entrySource.add(source); entrySource.add(";\n\n// load runtime\n"); entrySource.add( - `var __webpack_require__ = require(${JSON.stringify( + `var ${RuntimeGlobals.require} = require(${JSON.stringify( runtimePath )});\n` ); diff --git a/lib/javascript/JavascriptModulesPlugin.js b/lib/javascript/JavascriptModulesPlugin.js index 4ed0f1373b5..27a8cb5b5c5 100644 --- a/lib/javascript/JavascriptModulesPlugin.js +++ b/lib/javascript/JavascriptModulesPlugin.js @@ -429,7 +429,7 @@ class JavascriptModulesPlugin { const code = source.source(); const fn = vm.runInThisContext( - `(function(${module.moduleArgument}, ${module.exportsArgument}, __webpack_require__) {\n${code}\n/**/})`, + `(function(${module.moduleArgument}, ${module.exportsArgument}, ${RuntimeGlobals.require}) {\n${code}\n/**/})`, { filename: module.identifier(), lineOffset: -1 @@ -454,7 +454,7 @@ class JavascriptModulesPlugin { if (typeof code !== "string") code = code.toString(); const fn = vm.runInThisContext( - `(function(__webpack_require__) {\n${code}\n/**/})`, + `(function(${RuntimeGlobals.require}) {\n${code}\n/**/})`, { filename: options.module.identifier(), lineOffset: -1 @@ -557,7 +557,7 @@ class JavascriptModulesPlugin { ? module.exportsArgument : "__unused_webpack_" + module.exportsArgument ); - if (needRequire) args.push("__webpack_require__"); + if (needRequire) args.push(RuntimeGlobals.require); if (!needThisAsExports && runtimeTemplate.supportsArrowFunction()) { factorySource.add("/***/ ((" + args.join(", ") + ") => {\n\n"); } else { @@ -1038,13 +1038,13 @@ class JavascriptModulesPlugin { if (useRequire) { buf.push("// The require function"); - buf.push(`function __webpack_require__(moduleId) {`); + buf.push(`function ${RuntimeGlobals.require}(moduleId) {`); buf.push(Template.indent(this.renderRequire(renderContext, hooks))); buf.push("}"); buf.push(""); } else if (runtimeRequirements.has(RuntimeGlobals.requireScope)) { buf.push("// The require scope"); - buf.push("var __webpack_require__ = {};"); + buf.push(`var ${RuntimeGlobals.require} = {};`); buf.push(""); } @@ -1163,14 +1163,14 @@ class JavascriptModulesPlugin { }(undefined, ${JSON.stringify( chunks.map(c => c.id) )}, ${runtimeTemplate.returningFunction( - `__webpack_require__(${moduleIdExpr})` + `${RuntimeGlobals.require}(${moduleIdExpr})` )})` ); } else if (useRequire) { buf2.push( - `${ - i === 0 ? "var __webpack_exports__ = " : "" - }__webpack_require__(${moduleIdExpr});` + `${i === 0 ? "var __webpack_exports__ = " : ""}${ + RuntimeGlobals.require + }(${moduleIdExpr});` ); } else { if (i === 0) buf2.push("var __webpack_exports__ = {};"); @@ -1178,7 +1178,7 @@ class JavascriptModulesPlugin { buf2.push( `__webpack_modules__[${moduleIdExpr}](0, ${ i === 0 ? "__webpack_exports__" : "{}" - }, __webpack_require__);` + }, ${RuntimeGlobals.require});` ); } else if (entryRuntimeRequirements.has(RuntimeGlobals.exports)) { buf2.push( @@ -1281,17 +1281,17 @@ class JavascriptModulesPlugin { RuntimeGlobals.interceptModuleExecution ) ? Template.asString([ - "var execOptions = { id: moduleId, module: module, factory: __webpack_modules__[moduleId], require: __webpack_require__ };", + `var execOptions = { id: moduleId, module: module, factory: __webpack_modules__[moduleId], require: ${RuntimeGlobals.require} };`, `${RuntimeGlobals.interceptModuleExecution}.forEach(function(handler) { handler(execOptions); });`, "module = execOptions.module;", "execOptions.factory.call(module.exports, module, module.exports, execOptions.require);" ]) : runtimeRequirements.has(RuntimeGlobals.thisAsExports) ? Template.asString([ - "__webpack_modules__[moduleId].call(module.exports, module, module.exports, __webpack_require__);" + `__webpack_modules__[moduleId].call(module.exports, module, module.exports, ${RuntimeGlobals.require});` ]) : Template.asString([ - "__webpack_modules__[moduleId](module, module.exports, __webpack_require__);" + `__webpack_modules__[moduleId](module, module.exports, ${RuntimeGlobals.require});` ]); const needModuleId = runtimeRequirements.has(RuntimeGlobals.moduleId); const needModuleLoaded = runtimeRequirements.has( diff --git a/lib/javascript/StartupHelpers.js b/lib/javascript/StartupHelpers.js index ac4ec2e69e3..c113e88e14a 100644 --- a/lib/javascript/StartupHelpers.js +++ b/lib/javascript/StartupHelpers.js @@ -39,7 +39,7 @@ exports.generateEntryStartup = ( /** @type {string[]} */ const runtime = [ `var __webpack_exec__ = ${runtimeTemplate.returningFunction( - `__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)`, + `${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`, "moduleId" )}` ]; diff --git a/lib/node/ReadFileChunkLoadingRuntimeModule.js b/lib/node/ReadFileChunkLoadingRuntimeModule.js index 9bc763672c7..7b01a03d74a 100644 --- a/lib/node/ReadFileChunkLoadingRuntimeModule.js +++ b/lib/node/ReadFileChunkLoadingRuntimeModule.js @@ -124,7 +124,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule { "}" ]), "}", - `if(runtime) runtime(__webpack_require__);`, + `if(runtime) runtime(${RuntimeGlobals.require});`, "for(var i = 0; i < chunkIds.length; i++) {", Template.indent([ "if(installedChunks[chunkIds[i]]) {", @@ -193,7 +193,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule { "", withExternalInstallChunk ? Template.asString([ - "module.exports = __webpack_require__;", + `module.exports = ${RuntimeGlobals.require};`, `${RuntimeGlobals.externalInstallChunk} = installChunk;` ]) : "// no external install chunk", diff --git a/lib/node/RequireChunkLoadingRuntimeModule.js b/lib/node/RequireChunkLoadingRuntimeModule.js index 8b46fbca97d..c4deea95f53 100644 --- a/lib/node/RequireChunkLoadingRuntimeModule.js +++ b/lib/node/RequireChunkLoadingRuntimeModule.js @@ -124,7 +124,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule { "}" ]), "}", - `if(runtime) runtime(__webpack_require__);`, + `if(runtime) runtime(${RuntimeGlobals.require});`, "for(var i = 0; i < chunkIds.length; i++)", Template.indent("installedChunks[chunkIds[i]] = 1;"), withOnChunkLoad ? `${RuntimeGlobals.onChunksLoaded}();` : "" @@ -163,7 +163,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule { "", withExternalInstallChunk ? Template.asString([ - "module.exports = __webpack_require__;", + `module.exports = ${RuntimeGlobals.require};`, `${RuntimeGlobals.externalInstallChunk} = installChunk;` ]) : "// no external install chunk", diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js index 1cd7526f231..f889b5e2042 100644 --- a/lib/optimize/ConcatenatedModule.js +++ b/lib/optimize/ConcatenatedModule.js @@ -1611,7 +1611,7 @@ ${defineGetters}` result.add(`if (${condition}) {\n`); } result.add( - `var ${info.name} = __webpack_require__(${JSON.stringify( + `var ${info.name} = ${RuntimeGlobals.require}(${JSON.stringify( chunkGraph.getModuleId(info.module) )});` ); diff --git a/lib/runtime/StartupChunkDependenciesRuntimeModule.js b/lib/runtime/StartupChunkDependenciesRuntimeModule.js index 5097b4d681f..8e6537c54b9 100644 --- a/lib/runtime/StartupChunkDependenciesRuntimeModule.js +++ b/lib/runtime/StartupChunkDependenciesRuntimeModule.js @@ -45,7 +45,7 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule { // using map is shorter for 3 or more chunks `return Promise.all(${JSON.stringify(chunkIds)}.map(${ RuntimeGlobals.ensureChunk - }, __webpack_require__)).then(next);` + }, ${RuntimeGlobals.require})).then(next);` ] : [ // calling ensureChunk directly is shorter for 0 - 2 chunks diff --git a/lib/runtime/StartupEntrypointRuntimeModule.js b/lib/runtime/StartupEntrypointRuntimeModule.js index b5413bea160..64bd1b77a7c 100644 --- a/lib/runtime/StartupEntrypointRuntimeModule.js +++ b/lib/runtime/StartupEntrypointRuntimeModule.js @@ -27,19 +27,19 @@ class StartupEntrypointRuntimeModule extends RuntimeModule { "// arguments: chunkIds, moduleId are deprecated", "var moduleId = chunkIds;", `if(!fn) chunkIds = result, fn = ${runtimeTemplate.returningFunction( - `__webpack_require__(${RuntimeGlobals.entryModuleId} = moduleId)` + `${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)` )};`, ...(this.asyncChunkLoading ? [ - `return Promise.all(chunkIds.map(${ - RuntimeGlobals.ensureChunk - }, __webpack_require__)).then(${runtimeTemplate.basicFunction("", [ + `return Promise.all(chunkIds.map(${RuntimeGlobals.ensureChunk}, ${ + RuntimeGlobals.require + })).then(${runtimeTemplate.basicFunction("", [ "var r = fn();", "return r === undefined ? result : r;" ])})` ] : [ - `chunkIds.map(${RuntimeGlobals.ensureChunk}, __webpack_require__)`, + `chunkIds.map(${RuntimeGlobals.ensureChunk}, ${RuntimeGlobals.require})`, "var r = fn();", "return r === undefined ? result : r;" ]) diff --git a/lib/sharing/ShareRuntimeModule.js b/lib/sharing/ShareRuntimeModule.js index 762c7b7e4af..73ab44e6150 100644 --- a/lib/sharing/ShareRuntimeModule.js +++ b/lib/sharing/ShareRuntimeModule.js @@ -100,7 +100,7 @@ class ShareRuntimeModule extends RuntimeModule { )};`, "try {", Template.indent([ - "var module = __webpack_require__(id);", + `var module = ${RuntimeGlobals.require}(id);`, "if(!module) return;", `var initFn = ${runtimeTemplate.returningFunction( `module && module.init && module.init(${RuntimeGlobals.shareScopeMap}[name], initScope)`, diff --git a/lib/web/JsonpChunkLoadingRuntimeModule.js b/lib/web/JsonpChunkLoadingRuntimeModule.js index 9eaf9b35da2..7ba56c25132 100644 --- a/lib/web/JsonpChunkLoadingRuntimeModule.js +++ b/lib/web/JsonpChunkLoadingRuntimeModule.js @@ -426,7 +426,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule { "}" ]), "}", - "if(runtime) var result = runtime(__webpack_require__);" + `if(runtime) var result = runtime(${RuntimeGlobals.require});` ]), "}", "if(parentChunkLoadingFunction) parentChunkLoadingFunction(data);", diff --git a/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js b/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js index b9947d6325f..d6bd0323143 100644 --- a/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js +++ b/lib/webworker/ImportScriptsChunkLoadingRuntimeModule.js @@ -120,7 +120,7 @@ class ImportScriptsChunkLoadingRuntimeModule extends RuntimeModule { "}" ]), "}", - "if(runtime) runtime(__webpack_require__);", + `if(runtime) runtime(${RuntimeGlobals.require});`, "while(chunkIds.length)", Template.indent("installedChunks[chunkIds.pop()] = 1;"), "parentChunkLoadingFunction(data);"