Skip to content
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

Jump to bottom

fix: resolve relative URL generated by renderBuiltUrl passed to module preload #16084

Merged
merged 3 commits into from
Aug 15, 2024
+18 −23
Merged

fix: resolve relative URL generated by renderBuiltUrl passed to module preload #16084

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94b3713
fix: resolve relative URL generated by `renderBuiltUrl` passed to mod…
sapphi-red Mar 3, 2024
ec82e19
test: update
sapphi-red Mar 3, 2024
3b29bd8
refactor: replace `optimizeModulePreloadRelativePaths` with `isRelati…
sapphi-red Aug 15, 2024
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
14 changes: 5 additions & 9 deletions packages/vite/src/node/plugins/importAnalysisBuild.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,21 +176,17 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
? `'modulepreload'`
: `(${detectScriptRel.toString()})()`

// There are three different cases for the preload list format in __vitePreload
// There are two different cases for the preload list format in __vitePreload
//
// __vitePreload(() => import(asyncChunk), [ ...deps... ])
//
// This is maintained to keep backwards compatibility as some users developed plugins
// using regex over this list to workaround the fact that module preload wasn't
// configurable.
const assetsURL = renderBuiltUrl
? // If `experimental.renderBuiltUrl` is used, the dependencies are already resolved.
// To avoid the need for `new URL(dep, import.meta.url)`, a helper `__vitePreloadRelativeDep` is
// used to resolve from relative paths which can be minimized.
`function(dep, importerUrl) { return dep[0] === '.' ? new URL(dep, importerUrl).href : dep }`
: optimizeModulePreloadRelativePaths
? // If there isn't custom resolvers affecting the deps list, deps in the list are relative
// to the current chunk and are resolved to absolute URL by the __vitePreload helper itself.
const assetsURL =
renderBuiltUrl || optimizeModulePreloadRelativePaths
sapphi-red marked this conversation as resolved.
Show resolved Hide resolved
? // If `experimental.renderBuiltUrl` is used, the dependencies might be relative to the current chunk.
// If relative base is used, the dependencies are relative to the current chunk.
// The importerUrl is passed as third parameter to __vitePreload in this case
`function(dep, importerUrl) { return new URL(dep, importerUrl).href }`
: // If the base isn't relative, then the deps are relative to the projects `outDir` and the base
Expand Down
4 changes: 3 additions & 1 deletion playground/preload/__tests__/resolve-deps/preload-resolve-deps.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ describe.runIf(isBuild)('build', () => {
expect(html).toMatch(
/link rel="modulepreload".*?href="http.*?\/hello-[-\w]{8}\.js"/,
)
expect(html).toMatch(/link rel="modulepreload".*?href="\/preloaded.js"/)
expect(html).toMatch(
/link rel="modulepreload".*?href="http.*?\/preloaded.js"/,
)
expect(html).toMatch(
/link rel="stylesheet".*?href="http.*?\/hello-[-\w]{8}\.css"/,
)
Expand Down
16 changes: 8 additions & 8 deletions playground/preload/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"build": "vite build",
"debug": "node --inspect-brk ../../packages/vite/bin/vite",
"preview": "vite preview",
"dev:resolve-deps": "vite --config vite.config-resolve-deps.ts",
"build:resolve-deps": "vite build --config vite.config-resolve-deps.ts",
"debug:resolve-deps": "node --inspect-brk ../../packages/vite/bin/vite --config vite.config-resolve-deps.ts",
"preview:resolve-deps": "vite preview --config vite.config-resolve-deps.ts",
"dev:preload-disabled": "vite --config vite.config-preload-disabled.ts",
"build:preload-disabled": "vite build --config vite.config-preload-disabled.ts",
"debug:preload-disabled": "node --inspect-brk ../../packages/vite/bin/vite --config vite.config-preload-disabled.ts",
"preview:preload-disabled": "vite preview --config vite.config-preload-disabled.ts"
"dev:resolve-deps": "vite --config vite.config-resolve-deps.js",
"build:resolve-deps": "vite build --config vite.config-resolve-deps.js",
"debug:resolve-deps": "node --inspect-brk ../../packages/vite/bin/vite --config vite.config-resolve-deps.js",
"preview:resolve-deps": "vite preview --config vite.config-resolve-deps.js",
"dev:preload-disabled": "vite --config vite.config-preload-disabled.js",
"build:preload-disabled": "vite build --config vite.config-preload-disabled.js",
"debug:preload-disabled": "node --inspect-brk ../../packages/vite/bin/vite --config vite.config-preload-disabled.js",
"preview:preload-disabled": "vite preview --config vite.config-preload-disabled.js"
},
"devDependencies": {
"terser": "^5.31.3",
Expand Down