Skip to content

Commit 69b15fa

Browse files
committed
fix: html files resolver
1 parent 8028aa3 commit 69b15fa

File tree

1 file changed

+14
-8
lines changed
  • packages/vite/src/node/optimizer

1 file changed

+14
-8
lines changed

packages/vite/src/node/optimizer/scan.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -860,9 +860,14 @@ function rolldownScanPlugin(
860860
contents = (await transform(contents, { loader })).code
861861
}
862862
if (contents.includes('import.meta.glob')) {
863-
scripts[key] = await doTransformGlobImport(contents, p)
863+
scripts[key] = {
864+
contents: await doTransformGlobImport(contents, p),
865+
loader
866+
}
864867
} else {
865-
scripts[key] = contents
868+
scripts[key] = {
869+
contents, loader
870+
}
866871
}
867872

868873
const virtualModulePath = JSON.stringify(virtualModulePrefix + key)
@@ -894,7 +899,10 @@ function rolldownScanPlugin(
894899
return js
895900
}
896901

897-
const scripts: Record<string, string> = {}
902+
const scripts: Record<string, {
903+
contents: string,
904+
loader: Loader,
905+
}> = {}
898906

899907
const ASSET_TYPE_RE = new RegExp(`\\.(${KNOWN_ASSET_TYPES.join('|')})$`)
900908

@@ -956,10 +964,9 @@ function rolldownScanPlugin(
956964
if (depImports[id]) {
957965
return externalUnlessEntry({ path: id })
958966
}
959-
const loader = parseRequest(id)?.loader
960967
const resolved = await resolve(id, importer, {
961968
custom: {
962-
depScan: { loader },
969+
depScan: importer ? { loader: scripts[importer]?.loader } : {},
963970
},
964971
})
965972
if (resolved) {
@@ -1019,10 +1026,9 @@ function rolldownScanPlugin(
10191026
// catch all -------------------------------------------------------------
10201027

10211028
// use vite resolver to support urls and omitted extensions
1022-
const loader = parseRequest(id)?.loader
10231029
const resolved = await resolve(id, importer, {
10241030
custom: {
1025-
depScan: { loader },
1031+
depScan: importer ? { loader: scripts[importer]?.loader } : {},
10261032
},
10271033
})
10281034
if (resolved) {
@@ -1044,7 +1050,7 @@ function rolldownScanPlugin(
10441050
load: async function (id) {
10451051
if (virtualModuleRE.test(id)) {
10461052
return {
1047-
code: scripts[id.replace(virtualModulePrefix, '')],
1053+
code: scripts[id.replace(virtualModulePrefix, '')].contents,
10481054
}
10491055
}
10501056

0 commit comments

Comments
 (0)