diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index a0441acf33d607..ffb3e04221cdf0 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -69,56 +69,40 @@ describe('resolveLibFilename', () => { describe('resolvePaths', () => { test('resolve build.rollupOptions.input', async () => { - const config = await resolveConfig( - { - build: { - rollupOptions: { - input: 'index.html' - } + const config = await resolveConfig({ + build: { + rollupOptions: { + input: 'index.html' } - }, - 'build', - 'production' - ) + } + }, 'build', 'production') expect(config.build.rollupOptions.input).toBe(resolve('index.html')) }) test('resolve build.rollupOptions.input{}', async () => { - const config = await resolveConfig( - { - build: { - rollupOptions: { - input: { - index: 'index.html' - } + const config = await resolveConfig({ + build: { + rollupOptions: { + input: { + index: 'index.html' } } - }, - 'build', - 'production' - ) + } + }, 'build', 'production') - expect(config.build.rollupOptions.input['index']).toBe( - resolve('index.html') - ) + expect(config.build.rollupOptions.input['index']).toBe(resolve('index.html')) }) test('resolve build.rollupOptions.input[]', async () => { - const config = await resolveConfig( - { - build: { - rollupOptions: { - input: ['index.html'] - } + const config = await resolveConfig({ + build: { + rollupOptions: { + input: ['index.html'] } - }, - 'build', - 'production' - ) + } + }, 'build', 'production') - expect(config.build.rollupOptions.input).toStrictEqual([ - resolve('index.html') - ]) + expect(config.build.rollupOptions.input).toStrictEqual([resolve('index.html')]) }) test('resolve index.html', async () => { @@ -128,11 +112,7 @@ describe('resolvePaths', () => { }) test('resolve build.outdir', async () => { - const config = await resolveConfig( - { build: { outDir: 'outDir' } }, - 'build', - 'production' - ) + const config = await resolveConfig({ build: { outDir: 'outDir' } }, 'build', 'production') expect(config.build.outDir).toBe(resolve('outDir')) }) @@ -144,22 +124,14 @@ describe('resolvePaths', () => { }) test('resolve build.lib.entry', async () => { - const config = await resolveConfig( - { build: { lib: { entry: 'index.html' } } }, - 'build', - 'production' - ) + const config = await resolveConfig({ build: { lib: { entry: 'index.html' } } }, 'build', 'production') expect(config.build.rollupOptions.input).toBe(resolve('index.html')) }) test('resolve build.ssr', async () => { - const config = await resolveConfig( - { build: { ssr: 'ssr.ts' } }, - 'build', - 'production' - ) + const config = await resolveConfig({ build: { ssr: 'ssr.ts' } }, 'build', 'production') expect(config.build.rollupOptions.input).toBe(resolve('ssr.ts')) }) -}) +}) \ No newline at end of file diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index a07dff7181753d..3e727d637f9fdf 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -233,10 +233,7 @@ export type ResolvedBuildOptions = Required< > > -export function resolveBuildOptions( - root: string, - raw?: BuildOptions -): ResolvedBuildOptions { +export function resolveBuildOptions(root: string, raw?: BuildOptions): ResolvedBuildOptions { const resolved: ResolvedBuildOptions = { target: 'modules', polyfillModulePreload: true, @@ -272,8 +269,7 @@ export function resolveBuildOptions( } } - const resolve = (p: string) => - p.startsWith('\0') ? p : path.resolve(root, p) + const resolve = (p: string) => p.startsWith('\0') ? p : path.resolve(root, p) resolved.outDir = resolve(resolved.outDir) @@ -281,13 +277,11 @@ export function resolveBuildOptions( if (raw?.rollupOptions?.input) { input = Array.isArray(raw.rollupOptions.input) - ? raw.rollupOptions.input.map((input) => resolve(input)) + ? raw.rollupOptions.input.map(input => resolve(input)) : typeof raw.rollupOptions.input === 'object' ? Object.assign( // @ts-ignore - ...Object.keys(raw.rollupOptions.input).map((key) => ({ - [key]: resolve(raw.rollupOptions.input[key]) - })) + ...Object.keys(raw.rollupOptions.input).map(key => ({ [key]: resolve(raw.rollupOptions.input[key]) })) ) : resolve(raw.rollupOptions.input) } else { @@ -842,4 +836,4 @@ function wrapSsrTransform(fn: Function | undefined) { function injectSsrFlag(options: any = {}) { return { ...options, ssr: true } -} +} \ No newline at end of file diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts index a7cd3fd6cc11fa..6c70292fbac1c3 100644 --- a/packages/vite/src/node/plugins/css.ts +++ b/packages/vite/src/node/plugins/css.ts @@ -218,10 +218,7 @@ export function cssPlugin(config: ResolvedConfig): Plugin { : await moduleGraph.ensureEntryFromUrl( ( await fileToUrl(file, config, this) - ).replace( - (config.server?.origin ?? '') + config.base, - '/' - ) + ).replace((config.server?.origin ?? '') + config.base, '/') ) ) } @@ -1279,4 +1276,4 @@ const preProcessors = Object.freeze({ function isPreProcessor(lang: any): lang is PreprocessLang { return lang && lang in preProcessors -} +} \ No newline at end of file