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

Vite: Fix config loading - project directory #22240

Merged
merged 4 commits into from
Jul 31, 2023
Merged

Vite: Fix config loading - project directory #22240

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ccd904
fix(builder-vite): Load vite config with correct root
nVitius Apr 25, 2023
588f19f
Merge branch 'next' into fix/vite-package-root
nVitius Jul 19, 2023
d2dc245
use `projectRoot` from `core-common`
ndelangen Jul 25, 2023
7c19a49
Revert "use `projectRoot` from `core-common`"
IanVS Jul 26, 2023
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
6 changes: 4 additions & 2 deletions code/builders/builder-vite/src/vite-config.ts
View file
Open in desktop
Expand Up @@ -43,16 +43,18 @@ export async function commonConfig(
const configEnv = _type === 'development' ? configEnvServe : configEnvBuild;
const { viteConfigPath } = await getBuilderOptions<BuilderOptions>(options);

const projectRoot = path.resolve(options.configDir, '..');
ndelangen marked this conversation as resolved.
Show resolved Hide resolved

// I destructure away the `build` property from the user's config object
// I do this because I can contain config that breaks storybook, such as we had in a lit project.
// If the user needs to configure the `build` they need to do so in the viteFinal function in main.js.
const { config: { build: buildProperty = undefined, ...userConfig } = {} } =
(await loadConfigFromFile(configEnv, viteConfigPath)) ?? {};
(await loadConfigFromFile(configEnv, viteConfigPath, projectRoot)) ?? {};

const sbConfig: InlineConfig = {
configFile: false,
cacheDir: 'node_modules/.cache/.vite-storybook',
root: path.resolve(options.configDir, '..'),
root: projectRoot,
// Allow storybook deployed as subfolder. See https://github.com/storybookjs/builder-vite/issues/238
base: './',
plugins: await pluginConfig(options),
Expand Down