From 420817e46f0f8cf5daa28a8b5566328f1bcc30c4 Mon Sep 17 00:00:00 2001 From: poyoho <907415276@qq.com> Date: Sun, 20 Feb 2022 20:21:50 +0800 Subject: [PATCH] chore: extract reused code --- packages/vite/src/node/importGlob.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/vite/src/node/importGlob.ts b/packages/vite/src/node/importGlob.ts index 30b166c37c0744..bf20ff0a8c511c 100644 --- a/packages/vite/src/node/importGlob.ts +++ b/packages/vite/src/node/importGlob.ts @@ -89,6 +89,7 @@ export async function transformImportGlob( ;[importee] = await normalizeUrl(file, pos) } imports.push(importee) + const importeeUrl = isCSSRequest(importee) ? `${importee}?used` : importee if (assertion?.assert?.type === 'raw') { entries += ` ${JSON.stringify(file)}: ${JSON.stringify( await fsp.readFile(path.join(base, file), 'utf-8') @@ -98,14 +99,10 @@ export async function transformImportGlob( // css imports injecting a ?used query to export the css string importsString += `import ${ isEagerDefault ? `` : `* as ` - }${identifier} from ${JSON.stringify( - isCSSRequest(importee) ? `${importee}?used` : importee - )};` + }${identifier} from ${JSON.stringify(importeeUrl)};` entries += ` ${JSON.stringify(file)}: ${identifier},` } else { - let imp = `import(${JSON.stringify( - isCSSRequest(importee) ? `${importee}?used` : importee - )})` + let imp = `import(${JSON.stringify(importeeUrl)})` if (!normalizeUrl && preload) { imp = `(${isModernFlag}` +