Skip to content

Commit 64e0a21

Browse files
fix(build): preload CSS correctly when renderBuiltUrl returns URLs with queries (#23611)
Co-authored-by: sapphi-red <[email protected]>
1 parent 53f1ce7 commit 64e0a21

3 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎packages/vite/src/node/__tests__/plugins/importAnalysisBuild.spec.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { init, parse as parseImports } from 'es-module-lexer'
22
import { beforeAll, describe, expect, test } from 'vitest'
33
import {
4+
isCssPreloadUrl,
45
matchImportsToPreloadMarkers,
56
preloadMarker,
67
} from '../../plugins/importAnalysisBuild'
@@ -65,3 +66,18 @@ describe('matchImportsToPreloadMarkers', () => {
6566
expect(match(code)).toStrictEqual([marker])
6667
})
6768
})
69+
70+
describe('isCssPreloadUrl', () => {
71+
test('detects css assets with query strings or hashes', () => {
72+
const cases: ReadonlyArray<[string, boolean]> = [
73+
['https://example.com/assets/lazy.css', true],
74+
['https://example.com/assets/lazy.css?dpl=123', true],
75+
['https://example.com/assets/lazy.css#hash', true],
76+
['https://example.com/assets/lazy.js?file=.css', false],
77+
]
78+
for (const [input, expected] of cases) {
79+
const inputUrl = new URL(input)
80+
expect(isCssPreloadUrl(inputUrl)).toBe(expected)
81+
}
82+
})
83+
})

‎packages/vite/src/node/plugins/importAnalysisBuild.ts‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ export const preloadMarker = `__VITE_PRELOAD__`
3939
export const preloadHelperId = '\0vite/preload-helper.js'
4040
const preloadMarkerRE = new RegExp(preloadMarker, 'g')
4141

42+
export function isCssPreloadUrl(url: URL): boolean {
43+
return url.pathname.endsWith('.css')
44+
}
45+
4246
function toRelativePath(filename: string, importer: string) {
4347
const relPath = path.posix.relative(path.posix.dirname(importer), filename)
4448
return relPath[0] === '.' ? relPath : `./${relPath}`
@@ -146,33 +150,36 @@ function preload(
146150
)
147151
}
148152

149-
function importMetaResolve(specifier: string): string {
153+
function importMetaResolve(specifier: string): URL {
150154
// @ts-expect-error import.meta.resolve is not supported by all browsers we support
151155
// But `import.meta.resolve` is only needed when build.chunkImportMap is enabled,
152156
// and that option requires `import.meta.resolve` support.
153157
if (import.meta.resolve) {
154-
return import.meta.resolve(specifier)
158+
return new URL(import.meta.resolve(specifier))
155159
}
156-
return new URL(specifier, /** #__KEEP__ */ import.meta.url).href
160+
return new URL(specifier, /** #__KEEP__ */ import.meta.url)
157161
}
158162

159163
promise = allSettled(
160164
deps
161-
.map((dep) => {
165+
.map((depString) => {
162166
// @ts-expect-error assetsURL is declared before preload.toString()
163-
dep = assetsURL(dep, importerUrl)
164-
dep = importMetaResolve(dep)
165-
if (dep in seen) return
166-
seen[dep] = true
167-
const isCss = dep.endsWith('.css')
167+
depString = assetsURL(depString, importerUrl)
168+
const dep = importMetaResolve(depString)
169+
if (dep.href in seen) return
170+
seen[dep.href] = true
171+
const isCss = isCssPreloadUrl(dep)
168172

169173
// check if the file is already preloaded by SSR markup
170174
// `dep` is already converted to an absolute URL by the `assetsURL` function
171175
for (let i = links.length - 1; i >= 0; i--) {
172176
const link = links[i]
173177
// The `links[i].href` is an absolute URL thanks to browser doing the work
174178
// for us. See https://html.spec.whatwg.org/multipage/common-dom-interfaces.html#reflecting-content-attributes-in-idl-attributes:idl-domstring-5
175-
if (link.href === dep && (!isCss || link.rel === 'stylesheet')) {
179+
if (
180+
link.href === dep.href &&
181+
(!isCss || link.rel === 'stylesheet')
182+
) {
176183
return
177184
}
178185
}
@@ -183,7 +190,7 @@ function preload(
183190
link.as = 'script'
184191
}
185192
link.crossOrigin = ''
186-
link.href = dep
193+
link.href = dep.href
187194
if (cspNonce) {
188195
link.setAttribute('nonce', cspNonce)
189196
}
@@ -252,7 +259,7 @@ function getPreloadCode(
252259
`function(dep) { return ${JSON.stringify(environment.config.base)}+dep }`
253260
// replace `import` as a workaround for stackblitz: https://stackblitz.com/edit/node-vqfvv8dy?file=index.js
254261
const preloadMethodCode = preload.toString().replaceAll('𝐢𝐦𝐩𝐨𝐫𝐭', 'import')
255-
const preloadCode = `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};export const ${preloadMethod} = ${preloadMethodCode}`
262+
const preloadCode = `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};const isCssPreloadUrl = ${isCssPreloadUrl.toString()};export const ${preloadMethod} = ${preloadMethodCode}`
256263
return preloadCode
257264
}
258265

‎playground/js-sourcemap/__tests__/js-sourcemap.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ describe.runIf(isBuild)('build tests', () => {
361361
SourceMap {
362362
content: {
363363
"debugId": "00000000-0000-0000-0000-000000000000",
364-
"mappings": ";mrCAAAA,MAAA,OAAO,qDAEP,QAAQ,IAAI,uBAAuB",
364+
"mappings": ";mvCAAAA,MAAA,OAAO,qDAEP,QAAQ,IAAI,uBAAuB",
365365
"names": [
366366
"__vitePreload",
367367
],
@@ -376,7 +376,7 @@ describe.runIf(isBuild)('build tests', () => {
376376
],
377377
"version": 3,
378378
},
379-
visualization: "https://evanw.github.io/source-map-visualization/#MTU3NABjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihuLHIsaSl7bGV0IGE9UHJvbWlzZS5yZXNvbHZlKCk7aWYociYmci5sZW5ndGg+MCl7bGV0IG49ZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoYGxpbmtgKSxvPWRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoYG1ldGFbcHJvcGVydHk9Y3NwLW5vbmNlXWApLHM9bz8ubm9uY2V8fG8/LmdldEF0dHJpYnV0ZShgbm9uY2VgKTtmdW5jdGlvbiBjKGUpe3JldHVybiBQcm9taXNlLmFsbChlLm1hcChlPT5Qcm9taXNlLnJlc29sdmUoZSkudGhlbihlPT4oe3N0YXR1czpgZnVsZmlsbGVkYCx2YWx1ZTplfSksZT0+KHtzdGF0dXM6YHJlamVjdGVkYCxyZWFzb246ZX0pKSkpfWZ1bmN0aW9uIGwoZSl7cmV0dXJuIGltcG9ydC5tZXRhLnJlc29sdmU/aW1wb3J0Lm1ldGEucmVzb2x2ZShlKTpuZXcgVVJMKGUsaW1wb3J0Lm1ldGEudXJsKS5ocmVmfWE9YyhyLm1hcChyPT57aWYocj1lKHIsaSkscj1sKHIpLHIgaW4gdClyZXR1cm47dFtyXT0hMDtsZXQgYT1yLmVuZHNXaXRoKGAuY3NzYCk7Zm9yKGxldCBlPW4ubGVuZ3RoLTE7ZT49MDtlLS0pe2xldCB0PW5bZV07aWYodC5ocmVmPT09ciYmKCFhfHx0LnJlbD09PWBzdHlsZXNoZWV0YCkpcmV0dXJufWxldCBvPWRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoYGxpbmtgKTtpZihvLnJlbD1hP2BzdHlsZXNoZWV0YDpgbW9kdWxlcHJlbG9hZGAsYXx8KG8uYXM9YHNjcmlwdGApLG8uY3Jvc3NPcmlnaW49YGAsby5ocmVmPXIscyYmby5zZXRBdHRyaWJ1dGUoYG5vbmNlYCxzKSxkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKG8pLGEpcmV0dXJuIG5ldyBQcm9taXNlKChlLHQpPT57by5hZGRFdmVudExpc3RlbmVyKGBsb2FkYCxlKSxvLmFkZEV2ZW50TGlzdGVuZXIoYGVycm9yYCwoKT0+dChFcnJvcihgVW5hYmxlIHRvIHByZWxvYWQgQ1NTIGZvciAke3J9YCkpKX0pfSkuZmlsdGVyKGU9PmUhPT12b2lkIDApKX1mdW5jdGlvbiBvKGUpe2xldCB0PW5ldyBFdmVudChgdml0ZTpwcmVsb2FkRXJyb3JgLHtjYW5jZWxhYmxlOiEwfSk7aWYodC5wYXlsb2FkPWUsd2luZG93LmRpc3BhdGNoRXZlbnQodCksIXQuZGVmYXVsdFByZXZlbnRlZCl0aHJvdyBlfXJldHVybiBhLnRoZW4oZT0+e2ZvcihsZXQgdCBvZiBlfHxbXSl0LnN0YXR1cz09PWByZWplY3RlZGAmJm8odC5yZWFzb24pO3JldHVybiBuKCkuY2F0Y2gobyl9KX07bigoKT0+aW1wb3J0KGAuL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzYCksX192aXRlX19tYXBEZXBzKFswLDFdKSksY29uc29sZS5sb2coYGFmdGVyIHByZWxvYWQgZHluYW1pY2ApO2V4cG9ydHtuIGFzIHR9OwovLyMgZGVidWdJZD04OGVlZDVlNC01MDM5LTQzYTYtYjA3NC1iMTRhZGFlYTM0ZWQKLy8jIHNvdXJjZU1hcHBpbmdVUkw9YWZ0ZXItcHJlbG9hZC1keW5hbWljLUNJN3RYa1VELmpzLm1hcDI4MwB7ImRlYnVnSWQiOiIwMDAwMDAwMC0wMDAwLTAwMDAtMDAwMC0wMDAwMDAwMDAwMDAiLCJtYXBwaW5ncyI6IjttckNBQUFBLE1BQUEsT0FBTyxxREFFUCxRQUFRLElBQUksdUJBQXVCIiwibmFtZXMiOlsiX192aXRlUHJlbG9hZCJdLCJzb3VyY2VzIjpbIi4uLy4uL2FmdGVyLXByZWxvYWQtZHluYW1pYy5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQoJy4vZHluYW1pYy9keW5hbWljLWZvbycpXG5cbmNvbnNvbGUubG9nKCdhZnRlciBwcmVsb2FkIGR5bmFtaWMnKVxuIl0sInZlcnNpb24iOjN9"
379+
visualization: "https://evanw.github.io/source-map-visualization/#MTYzOABjb25zdCBfX3ZpdGVfX21hcERlcHM9KGksbT1fX3ZpdGVfX21hcERlcHMsZD0obS5mfHwobS5mPVsiYXNzZXRzL2R5bmFtaWMtZm9vLUJ3aFpUa3RCLmpzIiwiYXNzZXRzL2R5bmFtaWMtZm9vLURzcUtSckV5LmNzcyJdKSkpPT5pLm1hcChpPT5kW2ldKTsKdmFyIGU9ZnVuY3Rpb24oZSl7cmV0dXJuYC9gK2V9LHQ9e30sbj1mdW5jdGlvbihlKXtyZXR1cm4gZS5wYXRobmFtZS5lbmRzV2l0aChgLmNzc2ApfSxyPWZ1bmN0aW9uKHIsaSxhKXtsZXQgbz1Qcm9taXNlLnJlc29sdmUoKTtpZihpJiZpLmxlbmd0aD4wKXtsZXQgcj1kb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZShgbGlua2ApLHM9ZG9jdW1lbnQucXVlcnlTZWxlY3RvcihgbWV0YVtwcm9wZXJ0eT1jc3Atbm9uY2VdYCksYz1zPy5ub25jZXx8cz8uZ2V0QXR0cmlidXRlKGBub25jZWApO2Z1bmN0aW9uIGwoZSl7cmV0dXJuIFByb21pc2UuYWxsKGUubWFwKGU9PlByb21pc2UucmVzb2x2ZShlKS50aGVuKGU9Pih7c3RhdHVzOmBmdWxmaWxsZWRgLHZhbHVlOmV9KSxlPT4oe3N0YXR1czpgcmVqZWN0ZWRgLHJlYXNvbjplfSkpKSl9ZnVuY3Rpb24gdShlKXtyZXR1cm4gaW1wb3J0Lm1ldGEucmVzb2x2ZT9uZXcgVVJMKGltcG9ydC5tZXRhLnJlc29sdmUoZSkpOm5ldyBVUkwoZSxpbXBvcnQubWV0YS51cmwpfW89bChpLm1hcChpPT57aT1lKGksYSk7bGV0IG89dShpKTtpZihvLmhyZWYgaW4gdClyZXR1cm47dFtvLmhyZWZdPSEwO2xldCBzPW4obyk7Zm9yKGxldCBlPXIubGVuZ3RoLTE7ZT49MDtlLS0pe2xldCB0PXJbZV07aWYodC5ocmVmPT09by5ocmVmJiYoIXN8fHQucmVsPT09YHN0eWxlc2hlZXRgKSlyZXR1cm59bGV0IGw9ZG9jdW1lbnQuY3JlYXRlRWxlbWVudChgbGlua2ApO2lmKGwucmVsPXM/YHN0eWxlc2hlZXRgOmBtb2R1bGVwcmVsb2FkYCxzfHwobC5hcz1gc2NyaXB0YCksbC5jcm9zc09yaWdpbj1gYCxsLmhyZWY9by5ocmVmLGMmJmwuc2V0QXR0cmlidXRlKGBub25jZWAsYyksZG9jdW1lbnQuaGVhZC5hcHBlbmRDaGlsZChsKSxzKXJldHVybiBuZXcgUHJvbWlzZSgoZSx0KT0+e2wuYWRkRXZlbnRMaXN0ZW5lcihgbG9hZGAsZSksbC5hZGRFdmVudExpc3RlbmVyKGBlcnJvcmAsKCk9PnQoRXJyb3IoYFVuYWJsZSB0byBwcmVsb2FkIENTUyBmb3IgJHtvfWApKSl9KX0pLmZpbHRlcihlPT5lIT09dm9pZCAwKSl9ZnVuY3Rpb24gcyhlKXtsZXQgdD1uZXcgRXZlbnQoYHZpdGU6cHJlbG9hZEVycm9yYCx7Y2FuY2VsYWJsZTohMH0pO2lmKHQucGF5bG9hZD1lLHdpbmRvdy5kaXNwYXRjaEV2ZW50KHQpLCF0LmRlZmF1bHRQcmV2ZW50ZWQpdGhyb3cgZX1yZXR1cm4gby50aGVuKGU9Pntmb3IobGV0IHQgb2YgZXx8W10pdC5zdGF0dXM9PT1gcmVqZWN0ZWRgJiZzKHQucmVhc29uKTtyZXR1cm4gcigpLmNhdGNoKHMpfSl9O3IoKCk9PmltcG9ydChgLi9keW5hbWljLWZvby1Cd2haVGt0Qi5qc2ApLF9fdml0ZV9fbWFwRGVwcyhbMCwxXSkpLGNvbnNvbGUubG9nKGBhZnRlciBwcmVsb2FkIGR5bmFtaWNgKTtleHBvcnR7ciBhcyB0fTsKLy8jIGRlYnVnSWQ9ZWE1MTE0YWYtN2JmMi00NmExLTk3YzQtOTVlNzJlYmIyZTNkCi8vIyBzb3VyY2VNYXBwaW5nVVJMPWFmdGVyLXByZWxvYWQtZHluYW1pYy1EcVVSU3ZlXy5qcy5tYXAyODMAeyJkZWJ1Z0lkIjoiMDAwMDAwMDAtMDAwMC0wMDAwLTAwMDAtMDAwMDAwMDAwMDAwIiwibWFwcGluZ3MiOiI7bXZDQUFBQSxNQUFBLE9BQU8scURBRVAsUUFBUSxJQUFJLHVCQUF1QiIsIm5hbWVzIjpbIl9fdml0ZVByZWxvYWQiXSwic291cmNlcyI6WyIuLi8uLi9hZnRlci1wcmVsb2FkLWR5bmFtaWMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0KCcuL2R5bmFtaWMvZHluYW1pYy1mb28nKVxuXG5jb25zb2xlLmxvZygnYWZ0ZXIgcHJlbG9hZCBkeW5hbWljJylcbiJdLCJ2ZXJzaW9uIjozfQ=="
380380
}
381381
`)
382382
// verify sourcemap comment is preserved at the last line

0 commit comments

Comments
 (0)