diff --git a/packages/nitro/package.json b/packages/nitro/package.json index fbf3358bce6..ed572aecd9e 100644 --- a/packages/nitro/package.json +++ b/packages/nitro/package.json @@ -50,7 +50,7 @@ "jiti": "^1.12.9", "listhen": "^0.2.5", "mime": "^2.5.2", - "mlly": "^0.3.11", + "mlly": "^0.3.12", "node-fetch": "^3.0.0", "ohmyfetch": "^0.4.2", "ora": "^6.0.1", diff --git a/packages/nitro/src/rollup/config.ts b/packages/nitro/src/rollup/config.ts index d01b83a5d82..3482bdf28c5 100644 --- a/packages/nitro/src/rollup/config.ts +++ b/packages/nitro/src/rollup/config.ts @@ -16,6 +16,7 @@ import { visualizer } from 'rollup-plugin-visualizer' import * as unenv from 'unenv' import type { Preset } from 'unenv' +import { sanitizeFilePath } from 'mlly' import { NitroContext } from '../context' import { resolvePath } from '../utils' import { pkgDir } from '../dirs' @@ -99,9 +100,6 @@ export const getRollupConfig = (nitroContext: NitroContext) => { } else if (lastModule.includes('assets')) { prefix = 'assets' } - if (chunkInfo.name.includes('#')) { - return join('chunks', prefix, chunkInfo.name.replace(/#/g, '-') + '.mjs') - } return join('chunks', prefix, '[name].mjs') }, inlineDynamicImports: nitroContext.inlineDynamicImports, @@ -110,6 +108,7 @@ export const getRollupConfig = (nitroContext: NitroContext) => { intro: '', outro: '', preferConst: true, + sanitizeFileName: sanitizeFilePath, sourcemap: nitroContext.sourceMap, sourcemapExcludeSources: true, sourcemapPathTransform (relativePath, sourcemapPath) { diff --git a/packages/vite/package.json b/packages/vite/package.json index dcee82fb54e..f7fb521b923 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -28,6 +28,7 @@ "externality": "^0.1.4", "fs-extra": "^10.0.0", "magic-string": "^0.25.7", + "mlly": "^0.3.12", "p-debounce": "^4.0.0", "pathe": "^0.2.0", "postcss-import": "^14.0.2", diff --git a/packages/vite/src/vite.ts b/packages/vite/src/vite.ts index cf7538c5ef7..c7f9b230218 100644 --- a/packages/vite/src/vite.ts +++ b/packages/vite/src/vite.ts @@ -4,6 +4,7 @@ import consola from 'consola' import type { Nuxt } from '@nuxt/kit' import type { InlineConfig, SSROptions } from 'vite' import type { Options } from '@vitejs/plugin-vue' +import { sanitizeFilePath } from 'mlly' import { buildClient } from './client' import { buildServer } from './server' import virtual from './plugins/virtual' @@ -68,7 +69,8 @@ export async function bundle (nuxt: Nuxt) { build: { emptyOutDir: false, rollupOptions: { - input: resolve(nuxt.options.appDir, 'entry') + input: resolve(nuxt.options.appDir, 'entry'), + output: { sanitizeFileName: sanitizeFilePath } } }, plugins: [ diff --git a/yarn.lock b/yarn.lock index 8b3fa2ea739..433544d2db2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2959,7 +2959,7 @@ __metadata: jiti: ^1.12.9 listhen: ^0.2.5 mime: ^2.5.2 - mlly: ^0.3.11 + mlly: ^0.3.12 node-fetch: ^3.0.0 ohmyfetch: ^0.4.2 ora: ^6.0.1 @@ -3128,6 +3128,7 @@ __metadata: externality: ^0.1.4 fs-extra: ^10.0.0 magic-string: ^0.25.7 + mlly: ^0.3.12 p-debounce: ^4.0.0 pathe: ^0.2.0 postcss-import: ^14.0.2 @@ -13996,6 +13997,13 @@ __metadata: languageName: node linkType: hard +"mlly@npm:^0.3.12": + version: 0.3.12 + resolution: "mlly@npm:0.3.12" + checksum: f9f93622023f4a9adfd27c465ff40146725cbb17176eb3610f4cec73f31edca41dc571030d185406d30044aaa0565a75782ac74a69be3cc58c10fc50505bb74d + languageName: node + linkType: hard + "mocha@npm:^9.1.3": version: 9.1.3 resolution: "mocha@npm:9.1.3"