Skip to content

fix(core): fix append of assetQueryParams to inter-chunk JS *dynamic* imports (#16258) #16282

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.

Sign up for GitHub

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

Merged
ematipico merged 5 commits into from
Apr 16, 2026
Merged

fix(core): fix append of assetQueryParams to inter-chunk JS *dynamic* imports (#16258) #16282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f772eb
test assetQueryParams to inter-chunk JS dynamic imports (#16258)
jmurty Apr 10, 2026
9857f31
fix assetQueryParams to inter-chunk JS dynamic imports (#16258)
jmurty Apr 10, 2026
8fd415a
add changeset for assetQueryParams to inter-chunk JS dynamic imports …
jmurty Apr 10, 2026
f4ee53b
Add new test cases instead of changing existing ones
jmurty Apr 16, 2026
678d09a
Reword changeset per contribution guidelines
jmurty Apr 16, 2026
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
5 changes: 5 additions & 0 deletions .changeset/twelve-sloths-kiss.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes build errors on platforms with skew protection enabled (e.g. Vercel, Netlify) for inter-chunk Javascript using dynamic imports
7 changes: 5 additions & 2 deletions packages/astro/src/core/build/plugins/plugin-chunk-imports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ export function pluginChunkImports(options: StaticBuildOptions): VitePlugin | un
let rewritten = code;
for (let i = relativeImports.length - 1; i >= 0; i--) {
const imp = relativeImports[i];
// imp.s and imp.e are the start/end offsets of the module specifier (without quotes)
rewritten = rewritten.slice(0, imp.e) + '?' + queryString + rewritten.slice(imp.e);
// imp.s and imp.e are the start/end offsets of the module specifier.
// Static imports: e points after the specifier text, before the quote.
// Dynamic string imports: e points after the closing quote.
const insertAt = imp.d > -1 ? imp.e - 1 : imp.e;
rewritten = rewritten.slice(0, insertAt) + '?' + queryString + rewritten.slice(insertAt);
}

return { code: rewritten, map: null };
Expand Down
33 changes: 25 additions & 8 deletions packages/astro/test/asset-query-params.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,29 +173,46 @@ describe('Asset Query Parameters in Inter-Chunk JS Imports', () => {
const scripts = $('script[src]');
assert.ok(scripts.length > 0, 'Should have at least one external script');

let foundRelativeImport = false;
let foundStaticImport = false;
let foundDynamicImport = false;
// Read all client JS files and check inter-chunk imports have query params
const jsFiles = await fixture.glob('client/**/*.js');
for (const file of jsFiles) {
const code = await fixture.readFile(`/${file}`);
// Match relative imports: from"./chunk.js", from "./chunk.js", import("./chunk.js")
const allImports = [
// Match static imports: from "./chunk.js", from "./chunk.js"
const staticImports = [
...code.matchAll(/(from\s*["'])(\.\.?\/[^"']+\.(?:js|mjs)(?:\?[^"']*)?)(["'])/g),
];
// Match dynamic imports: import("./chunk.js")
const dynamicImports = [
...code.matchAll(/(import\s*\(\s*["'])(\.\.?\/[^"']+\.(?:js|mjs)(?:\?[^"']*)?)(["'])/g),
];
for (const match of allImports) {
foundRelativeImport = true;
for (const match of staticImports) {
foundStaticImport = true;
const importPath = match[2];
assert.match(
importPath,
/\?dpl=test-deploy-id/,
`Inter-chunk import should include assetQueryParams: ${match[0]}`,
`Static inter-chunk import should include assetQueryParams: ${match[0]}`,
);
}
for (const match of dynamicImports) {
foundDynamicImport = true;
const importPath = match[2];
assert.match(
importPath,
/\?dpl=test-deploy-id/,
`Dynamic inter-chunk import should include assetQueryParams: ${match[0]}`,
);
}
}
assert.ok(
foundRelativeImport,
'Expected at least one relative inter-chunk import in client JS files',
foundStaticImport,
'Expected at least one static relative inter-chunk import in client JS files',
);
assert.ok(
foundDynamicImport,
'Expected at least one dynamic relative inter-chunk import in client JS files',
);
});
});
Expand Down
6 changes: 6 additions & 0 deletions packages/astro/test/fixtures/asset-query-params-chunks/src/components/DynamicLoader.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div id="dynamic-loader">Dynamic Loader</div>
<script>
const { greet, MESSAGES } = await import('./shared.js');
const el = document.getElementById('dynamic-loader');
if (el) el.textContent = greet('Dynamic') + ' ' + MESSAGES.loading;
</script>
2 changes: 2 additions & 0 deletions packages/astro/test/fixtures/asset-query-params-chunks/src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
import CounterA from '../components/CounterA.astro';
import CounterB from '../components/CounterB.astro';
import DynamicLoader from '../components/DynamicLoader.astro';
---
<html>
<head><title>Chunk Imports Test</title></head>
<body>
<CounterA />
<CounterB />
<DynamicLoader />
</body>
</html>
Loading