Skip to content

Commit aa1357d

Browse files
committed
fix: html files resolver
1 parent e6ad145 commit aa1357d

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

+14-8
Original file line numberDiff line numberDiff line change
@@ -812,9 +812,14 @@ function rolldownScanPlugin(
812812
contents = (await transform(contents, { loader })).code
813813
}
814814
if (contents.includes('import.meta.glob')) {
815-
scripts[key] = await doTransformGlobImport(contents, p)
815+
scripts[key] = {
816+
contents: await doTransformGlobImport(contents, p),
817+
loader
818+
}
816819
} else {
817-
scripts[key] = contents
820+
scripts[key] = {
821+
contents, loader
822+
}
818823
}
819824

820825
const virtualModulePath = JSON.stringify(virtualModulePrefix + key)
@@ -846,7 +851,10 @@ function rolldownScanPlugin(
846851
return js
847852
}
848853

849-
const scripts: Record<string, string> = {}
854+
const scripts: Record<string, {
855+
contents: string,
856+
loader: Loader,
857+
}> = {}
850858

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

@@ -908,10 +916,9 @@ function rolldownScanPlugin(
908916
if (depImports[id]) {
909917
return externalUnlessEntry({ path: id })
910918
}
911-
const loader = parseRequest(id)?.loader
912919
const resolved = await resolve(id, importer, {
913920
custom: {
914-
depScan: { loader },
921+
depScan: importer ? { loader: scripts[importer]?.loader } : {},
915922
},
916923
})
917924
if (resolved) {
@@ -971,10 +978,9 @@ function rolldownScanPlugin(
971978
// catch all -------------------------------------------------------------
972979

973980
// use vite resolver to support urls and omitted extensions
974-
const loader = parseRequest(id)?.loader
975981
const resolved = await resolve(id, importer, {
976982
custom: {
977-
depScan: { loader },
983+
depScan: importer ? { loader: scripts[importer]?.loader } : {},
978984
},
979985
})
980986
if (resolved) {
@@ -996,7 +1002,7 @@ function rolldownScanPlugin(
9961002
load: async function (id) {
9971003
if (virtualModuleRE.test(id)) {
9981004
return {
999-
code: scripts[id.replace(virtualModulePrefix, '')],
1005+
code: scripts[id.replace(virtualModulePrefix, '')].contents,
10001006
}
10011007
}
10021008

0 commit comments

Comments
 (0)