Skip to content

Fix: The problem getViteConfig() duplicates some config #12312

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

Merged
merged 4 commits into from
Oct 29, 2024
Merged

Fix: The problem getViteConfig() duplicates some config #12312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0b5899
Fix: getViteConfig() duplicates some config
koyopro Oct 26, 2024
98b2e90
Update .changeset/slimy-sloths-fry.md
koyopro Oct 27, 2024
8e847b8
tweak
bluwy Oct 28, 2024
13c0fc7
fix
bluwy Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/slimy-sloths-fry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'astro': patch
---

Fixes an issue where using `getViteConfig()` returns incorrect and duplicate configuration
3 changes: 1 addition & 2 deletions packages/astro/src/core/middleware/vite-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ export function vitePluginMiddleware({ settings }: { settings: AstroSettings }):

return {
name: '@astro/plugin-middleware',
config(opts, { command }) {
config(_, { command }) {
isCommandBuild = command === 'build';
return opts;
},
async resolveId(id) {
if (id === MIDDLEWARE_MODULE_ID) {
Expand Down
13 changes: 13 additions & 0 deletions packages/astro/test/config-vite.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import assert from 'node:assert/strict';
import { before, describe, it } from 'node:test';
import * as cheerio from 'cheerio';
import { loadFixture } from './test-utils.js';
import { getViteConfig } from '../dist/config/index.js'
import { resolveConfig } from 'vite';

describe('Vite Config', async () => {
let fixture;
Expand All @@ -21,3 +23,14 @@ describe('Vite Config', async () => {
assert.match($('link').attr('href'), /\/assets\/testing-[a-z\d]+\.css/);
});
});

describe("getViteConfig", () => {
it("Does not change the default config.", async () => {
const command = "serve";
const mode = "test";
const configFn = getViteConfig({});
const config = await configFn({ command, mode });
const resolvedConfig = await resolveConfig(config, command, mode);
assert.deepStrictEqual(resolvedConfig.resolve.conditions, ["astro"]);
Comment on lines +27 to +34
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before the fix, the test fails as follows. (The contents of the array are duplicated)

image

})
});
Loading