Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] correct Vite config merging with force option #7911

Merged
merged 1 commit into from Dec 2, 2022
Merged

[fix] correct Vite config merging with force option #7911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/thin-pillows-work.md
View file
Open in desktop
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] correct Vite config merging with force option
5 changes: 3 additions & 2 deletions packages/kit/src/exports/vite/build/build_server.js
View file
Open in desktop
@@ -1,7 +1,8 @@
import fs from 'fs';
import path from 'path';
import { mergeConfig } from 'vite';
import { mkdirp, posixify, resolve_entry } from '../../../utils/filesystem.js';
import { get_vite_config, merge_vite_configs } from '../utils.js';
import { get_vite_config } from '../utils.js';
import { load_error_page, load_template } from '../../../core/config/index.js';
import { runtime_directory } from '../../../core/utils.js';
import {
Expand Down Expand Up @@ -240,7 +241,7 @@ export async function build_server(options, client) {
})
);

const merged_config = merge_vite_configs(
const merged_config = mergeConfig(
get_default_build_config({ config, input, ssr: true, outDir: `${output_dir}/server` }),
await get_vite_config(vite_config, vite_config_env)
);
Expand Down
33 changes: 3 additions & 30 deletions packages/kit/src/exports/vite/utils.js
View file
Open in desktop
@@ -1,5 +1,5 @@
import path from 'path';
import { loadConfigFromFile, loadEnv } from 'vite';
import { loadConfigFromFile, loadEnv, mergeConfig } from 'vite';
import { runtime_directory } from '../../core/utils.js';
import { posixify } from '../../utils/filesystem.js';

Expand All @@ -19,30 +19,13 @@ export async function get_vite_config(config, config_env) {
if (!loaded) {
throw new Error('Could not load Vite config');
}
return {
...loaded.config,
return mergeConfig(loaded.config, {
// CLI opts
mode: config_env.mode,
logLevel: config.logLevel,
clearScreen: config.clearScreen,
optimizeDeps: { force: config.optimizeDeps.force }
};
}

/**
* @param {...import('vite').UserConfig} configs
* @returns {import('vite').UserConfig}
*/
export function merge_vite_configs(...configs) {
return deep_merge(
...configs.map((config) => ({
...config,
resolve: {
...config.resolve,
alias: normalize_alias(config.resolve?.alias || {})
}
}))
);
});
}

/**
Expand All @@ -61,16 +44,6 @@ export function deep_merge(...objects) {
return result;
}

/**
* normalize kit.vite.resolve.alias as an array
* @param {import('vite').AliasOptions} o
* @returns {import('vite').Alias[]}
*/
function normalize_alias(o) {
if (Array.isArray(o)) return o;
return Object.entries(o).map(([find, replacement]) => ({ find, replacement }));
dummdidumm marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* Merges b into a, recursively, mutating a.
* @param {Record<string, any>} a
Expand Down
27 changes: 1 addition & 26 deletions packages/kit/src/exports/vite/utils.spec.js
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ import { test } from 'uvu';
import * as assert from 'uvu/assert';
import { validate_config } from '../../core/config/index.js';
import { posixify } from '../../utils/filesystem.js';
import { deep_merge, get_app_aliases, get_config_aliases, merge_vite_configs } from './utils.js';
import { deep_merge, get_app_aliases, get_config_aliases } from './utils.js';

test('basic test no conflicts', async () => {
const merged = deep_merge(
Expand Down Expand Up @@ -173,31 +173,6 @@ test('merge including toString', () => {
assert.equal(Object.keys(merged), ['toString', 'constructor', 'y']);
});

test('merge resolve.alias', () => {
const merged = merge_vite_configs(
{
resolve: {
alias: [{ find: /foo/, replacement: 'bar' }]
}
},
{
resolve: {
alias: {
alpha: 'beta'
}
}
}
);
assert.equal(merged, {
resolve: {
alias: [
{ find: /foo/, replacement: 'bar' },
{ find: 'alpha', replacement: 'beta' }
]
}
});
});

test('transform kit.alias to resolve.alias', () => {
const config = validate_config({
kit: {
Expand Down