From 02cdfa9a2c15b448c9748551e48070d2a9409d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=20/=20green?= Date: Fri, 9 Dec 2022 17:06:38 +0900 Subject: [PATCH] chore: add `\0` to virtual files id (#11261) fixes https://github.com/vitejs/vite/issues/10096 --- packages/vite/src/node/plugins/dynamicImportVars.ts | 2 +- packages/vite/src/node/plugins/modulePreloadPolyfill.ts | 5 +++-- packages/vite/src/node/plugins/wasm.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts index 944bd25a8e7907..f730fc9e093bbf 100644 --- a/packages/vite/src/node/plugins/dynamicImportVars.ts +++ b/packages/vite/src/node/plugins/dynamicImportVars.ts @@ -17,7 +17,7 @@ import { } from '../utils' import { toAbsoluteGlob } from './importMetaGlob' -export const dynamicImportHelperId = '/@vite/dynamic-import-helper' +export const dynamicImportHelperId = '\0vite/dynamic-import-helper' interface DynamicImportRequest { as?: keyof KnownAsTypeMap diff --git a/packages/vite/src/node/plugins/modulePreloadPolyfill.ts b/packages/vite/src/node/plugins/modulePreloadPolyfill.ts index ede92839de0538..720566d40ad8e3 100644 --- a/packages/vite/src/node/plugins/modulePreloadPolyfill.ts +++ b/packages/vite/src/node/plugins/modulePreloadPolyfill.ts @@ -3,6 +3,7 @@ import type { Plugin } from '../plugin' import { isModernFlag } from './importAnalysisBuild' export const modulePreloadPolyfillId = 'vite/modulepreload-polyfill' +const resolvedModulePreloadPolyfillId = '\0' + modulePreloadPolyfillId export function modulePreloadPolyfillPlugin(config: ResolvedConfig): Plugin { // `isModernFlag` is only available during build since it is resolved by `vite:build-import-analysis` @@ -13,11 +14,11 @@ export function modulePreloadPolyfillPlugin(config: ResolvedConfig): Plugin { name: 'vite:modulepreload-polyfill', resolveId(id) { if (id === modulePreloadPolyfillId) { - return id + return resolvedModulePreloadPolyfillId } }, load(id) { - if (id === modulePreloadPolyfillId) { + if (id === resolvedModulePreloadPolyfillId) { if (skip) { return '' } diff --git a/packages/vite/src/node/plugins/wasm.ts b/packages/vite/src/node/plugins/wasm.ts index e2a037cd8bbe40..866c1b6ae7565d 100644 --- a/packages/vite/src/node/plugins/wasm.ts +++ b/packages/vite/src/node/plugins/wasm.ts @@ -2,7 +2,7 @@ import type { ResolvedConfig } from '../config' import type { Plugin } from '../plugin' import { fileToUrl } from './asset' -const wasmHelperId = '/__vite-wasm-helper' +const wasmHelperId = '\0vite/wasm-helper' const wasmHelper = async (opts = {}, url: string) => { let result