From b033f3c9bd6cf41396ec1283876f38724f6e396f Mon Sep 17 00:00:00 2001 From: sibbng Date: Tue, 21 Dec 2021 23:33:27 +0300 Subject: [PATCH 1/2] fix: remove virtual module prefix while generating manifest --- packages/playground/legacy/__tests__/legacy.spec.ts | 11 ++++++++++- packages/playground/legacy/vite.config.js | 1 + packages/vite/src/node/plugins/manifest.ts | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/playground/legacy/__tests__/legacy.spec.ts b/packages/playground/legacy/__tests__/legacy.spec.ts index 7263174e84b074..9a5ab8520ac55e 100644 --- a/packages/playground/legacy/__tests__/legacy.spec.ts +++ b/packages/playground/legacy/__tests__/legacy.spec.ts @@ -1,4 +1,4 @@ -import { isBuild, untilUpdated } from '../../testUtils' +import { isBuild, readManifest, untilUpdated } from '../../testUtils' test('should work', async () => { expect(await page.textContent('#app')).toMatch('Hello') @@ -44,3 +44,12 @@ test('generates assets', async () => { true ) }) + + +if (isBuild) { + test('should generate correct manifest', async () => { + const manifest = readManifest() + expect(manifest['../../../vite/legacy-polyfills']).toBeDefined() + expect(manifest['../../../vite/legacy-polyfills'].src).toBe('../../../vite/legacy-polyfills') + }) +} diff --git a/packages/playground/legacy/vite.config.js b/packages/playground/legacy/vite.config.js index 3d7d6b37d11451..da8addec974673 100644 --- a/packages/playground/legacy/vite.config.js +++ b/packages/playground/legacy/vite.config.js @@ -10,6 +10,7 @@ module.exports = { ], build: { + manifest: true, rollupOptions: { output: { chunkFileNames(chunkInfo) { diff --git a/packages/vite/src/node/plugins/manifest.ts b/packages/vite/src/node/plugins/manifest.ts index 782bc317a2c5af..2ce4869e67d98d 100644 --- a/packages/vite/src/node/plugins/manifest.ts +++ b/packages/vite/src/node/plugins/manifest.ts @@ -41,7 +41,7 @@ export function manifestPlugin(config: ResolvedConfig): Plugin { const ext = path.extname(name) name = name.slice(0, -ext.length) + `-legacy` + ext } - return name + return name.replace(/\0/g, '') } else { return `_` + path.basename(chunk.fileName) } From 47475d1889af2dcc8e49fb1e4df420936880d06b Mon Sep 17 00:00:00 2001 From: sibbng Date: Tue, 21 Dec 2021 23:50:10 +0300 Subject: [PATCH 2/2] chore: format --- packages/playground/legacy/__tests__/legacy.spec.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/playground/legacy/__tests__/legacy.spec.ts b/packages/playground/legacy/__tests__/legacy.spec.ts index 9a5ab8520ac55e..f1e317246ee852 100644 --- a/packages/playground/legacy/__tests__/legacy.spec.ts +++ b/packages/playground/legacy/__tests__/legacy.spec.ts @@ -45,11 +45,12 @@ test('generates assets', async () => { ) }) - if (isBuild) { test('should generate correct manifest', async () => { const manifest = readManifest() expect(manifest['../../../vite/legacy-polyfills']).toBeDefined() - expect(manifest['../../../vite/legacy-polyfills'].src).toBe('../../../vite/legacy-polyfills') + expect(manifest['../../../vite/legacy-polyfills'].src).toBe( + '../../../vite/legacy-polyfills' + ) }) }