Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb8c489f

Browse files
committed
fix(esm): generate static new URL() imports for ESM library chunks
1 parent90d15f9 commitb8c489f

File tree

3 files changed

+78
-20
lines changed

3 files changed

+78
-20
lines changed

‎lib/esm/ModuleChunkLoadingPlugin.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"use strict";
77

88
constRuntimeGlobals=require("../RuntimeGlobals");
9+
const{ getLibraryType}=require("../util/LibraryHelpers");
910
constExportWebpackRequireRuntimeModule=require("./ExportWebpackRequireRuntimeModule");
1011
constModuleChunkLoadingRuntimeModule=require("./ModuleChunkLoadingRuntimeModule");
1112

@@ -103,7 +104,15 @@ class ModuleChunkLoadingPlugin {
103104
set.add(RuntimeGlobals.publicPath);
104105
}
105106

106-
set.add(RuntimeGlobals.getChunkScriptFilename);
107+
// Avoid generating dynamic filename helper for ESM libraries with outputModule
108+
constoutputModule=
109+
compilation.options&&
110+
compilation.options.experiments&&
111+
compilation.options.experiments.outputModule;
112+
constisESMLibrary=getLibraryType(chunk,compilation)==="module";
113+
if(!(outputModule&&isESMLibrary)){
114+
set.add(RuntimeGlobals.getChunkScriptFilename);
115+
}
107116
});
108117

109118
compilation.hooks.runtimeRequirementInTree

‎lib/esm/ModuleChunkLoadingRuntimeModule.js‎

Lines changed: 62 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -233,21 +233,68 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
233233
Template.indent([
234234
"// setup Promise in chunk cache",
235235
outputModule&&isESMLibrary
236-
?// Use new URL() for ESM library output
237-
`var promise =${importFunctionName}(new URL(${JSON.stringify(
238-
rootOutputDir
239-
)} +${
240-
RuntimeGlobals.getChunkScriptFilename
241-
}(chunkId),${
242-
compilation.outputOptions.importMetaName||
243-
"import.meta"
244-
}.url)).then(installChunk,${runtimeTemplate.basicFunction(
245-
"e",
246-
[
247-
"if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;",
248-
"throw e;"
249-
]
250-
)});`
236+
?// For ESM library output generate statically analyzable imports per chunk
237+
(()=>{
238+
// Build a switch over known async JS chunks with literal URLs
239+
constmeta=
240+
compilation.outputOptions.importMetaName||
241+
"import.meta";
242+
constrelevantChunks=newSet();
243+
for(constcofchunk.getAllAsyncChunks()){
244+
relevantChunks.add(c);
245+
}
246+
constincludeEntries=chunkGraph
247+
.getTreeRuntimeRequirements(chunk)
248+
.has(
249+
RuntimeGlobals.ensureChunkIncludeEntries
250+
);
251+
if(includeEntries){
252+
for(constcofchunkGraph.getRuntimeChunkDependentChunksIterable(
253+
chunk
254+
)){
255+
relevantChunks.add(c);
256+
}
257+
}
258+
for(constepofchunk.getAllReferencedAsyncEntrypoints()){
259+
relevantChunks.add(
260+
ep.chunks[ep.chunks.length-1]
261+
);
262+
}
263+
constcases=[];
264+
for(constcofrelevantChunks){
265+
if(!chunkHasJs(c,chunkGraph))continue;
266+
constfilename=compilation.getPath(
267+
getChunkFilenameTemplate(
268+
c,
269+
compilation.outputOptions
270+
),
271+
{chunk:c,contentHashType:"javascript"}
272+
);
273+
constspec=JSON.stringify(
274+
rootOutputDir+filename
275+
);
276+
constcid=JSON.stringify(
277+
/**@type {string|number} */(c.id)
278+
);
279+
cases.push(
280+
`case${cid}: promise =${importFunctionName}(new URL(${spec},${meta}.url).href); break;`
281+
);
282+
}
283+
returnTemplate.asString([
284+
"var promise;",
285+
"switch(chunkId) {",
286+
Template.indent(cases),
287+
"default: promise = Promise.reject(new Error('Missing chunk mapping for ' + chunkId));",
288+
"}",
289+
`promise = promise.then(installChunk,${runtimeTemplate.basicFunction(
290+
"e",
291+
[
292+
"if(installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;",
293+
"throw e;"
294+
]
295+
)});`
296+
]);
297+
})()
251298
:// Traditional string concatenation for non-ESM output
252299
`var promise =${importFunctionName}(${
253300
compilation.outputOptions.publicPath==="auto"

‎test/configCases/library/module-dynamic-import-url/index.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
// Test for issue #15947 - ESM library with dynamic imports
2-
it("shoulduse new URL() fordynamic importsin ESM library output",()=>{
2+
it("shouldgenerate statically analyzabledynamic importsfor ESM library output",()=>{
33
constfs=require("fs");
44
constpath=require("path");
55

66
constoutputPath=path.join(__dirname,"lib.js");
77
constcontent=fs.readFileSync(outputPath,"utf-8");
88

9-
expect(content).toMatch(/new\s+URL/);
10-
expect(content).toMatch(/import\.meta\.url/);
11-
expect(content).not.toMatch(/import\s*\(\s*["']\.\/["']\s*\+/);
9+
// Should use new URL with import.meta.url and literal path
10+
expect(content).toMatch(/import\(\s*new\s+URL\(\s*"[^"]+"\s*,\s*import\.meta\.url\s*\)\.href\s*\)/);
11+
// Should not use dynamic __webpack_require__.u() or publicPath string concatenation
12+
expect(content).not.toMatch(/__webpack_require__\.u\(/);
13+
expect(content).not.toMatch(/\+\s*__webpack_require__\.p\s*\+/);
1214

1315
// Verify that the chunk file was created
1416
constchunkFiles=fs

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp