Skip to content
Merged
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
3 changes: 2 additions & 1 deletion crates/mako/src/generate/chunk_pot/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ pub(crate) fn runtime_code(context: &Arc<Context>) -> Result<String> {
umd,
is_browser: matches!(context.config.platform, crate::config::Platform::Browser),
cjs: context.config.cjs,
chunk_loading_global: context.config.output.chunk_loading_global.clone(),
chunk_loading_global: serde_json::to_string(&context.config.output.chunk_loading_global)
.unwrap(),
cross_origin_loading: context
.config
.output
Expand Down
2 changes: 1 addition & 1 deletion crates/mako/templates/app_runtime.stpl
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ function createRuntime(makoModules, entryModuleId, global) {
installedChunks[id] = 0;
}
};
var chunkLoadingGlobal = global['<%= chunk_loading_global.clone() %>'] = global['<%= chunk_loading_global.clone() %>'] || [];
var chunkLoadingGlobal = global[<%- chunk_loading_global.clone() %>] = global[<%- chunk_loading_global.clone() %>] || [];
chunkLoadingGlobal.forEach(jsonpCallback.bind(null));
chunkLoadingGlobal.push = (function(push, data) {
push(data);
Expand Down
16 changes: 16 additions & 0 deletions e2e/fixtures/config.output.chunk_loading_global/expect.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
const assert = require("assert");
const { parseBuildResult, string2RegExp } = require("../../../scripts/test-utils");
const { files } = parseBuildResult(__dirname);

assert(
files['index.js'].includes(`global["foo' oo"]`),
"chunk loading should work in entry"
);

assert(
files['src_a_ts-async.js'].includes(
`(typeof globalThis !== "undefined" ? globalThis : self)["foo' oo"]`
),
"chunk loading should work in async chunk"
);

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"output": {
"chunkLoadingGlobal": "foo' oo"
}
}
1 change: 1 addition & 0 deletions e2e/fixtures/config.output.chunk_loading_global/src/a.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default 'a';
2 changes: 2 additions & 0 deletions e2e/fixtures/config.output.chunk_loading_global/src/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import('./a');
console.log(1);