Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/eight-donkeys-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/vite-plugin-svelte': patch
---

fix: allow preprocess plugin to run twice
34 changes: 34 additions & 0 deletions packages/e2e-tests/build-multiple/__tests__/build-multiple.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { fileURLToPath } from 'node:url';
import { build, type Rollup, type InlineConfig } from 'vite';
import { svelte } from '@sveltejs/vite-plugin-svelte';
import { isBuild } from '~utils';

test.runIf(isBuild)('build-multiple', async () => {
const sharedConfig: InlineConfig = {
configFile: false,
root: fileURLToPath(new URL('../', import.meta.url)),
build: {
write: false
},
logLevel: 'silent',
plugins: [svelte()]
};

// Ensure two builds work as expected and have no build errors

const output1 = await build({ ...sharedConfig, mode: 'production' });
expect(output1).toHaveProperty('output');
expect(
(output1 as Rollup.RollupOutput).output.find(
(c) => c.type === 'chunk' && c.code.includes('mode: production')
)
).toBeDefined();

const output2 = await build({ ...sharedConfig, mode: 'staging' });
expect(output2).toHaveProperty('output');
expect(
(output2 as Rollup.RollupOutput).output.find(
(c) => c.type === 'chunk' && c.code.includes('mode: staging')
)
).toBeDefined();
});
12 changes: 12 additions & 0 deletions packages/e2e-tests/build-multiple/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Svelte App</title>
</head>
<body>
<script type="module" src="/src/index.js"></script>
</body>
</html>
16 changes: 16 additions & 0 deletions packages/e2e-tests/build-multiple/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "e2e-tests-build-multiple",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "workspace:^",
"svelte": "^5.38.2",
"vite": "^7.1.2"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/e2e-tests/build-multiple/src/App.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<p>mode: {import.meta.env.MODE}</p>
3 changes: 3 additions & 0 deletions packages/e2e-tests/build-multiple/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import App from './App.svelte';
import { mount } from 'svelte';
mount(App, { target: document.body });
6 changes: 6 additions & 0 deletions packages/e2e-tests/build-multiple/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { svelte } from '@sveltejs/vite-plugin-svelte';
import { defineConfig } from 'vite';

export default defineConfig({
plugins: [svelte()]
});
9 changes: 6 additions & 3 deletions packages/vite-plugin-svelte/src/plugins/preprocess.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,21 @@ export function preprocess(api) {
name: 'vite-plugin-svelte:preprocess',
enforce: 'pre',
configResolved(c) {
//@ts-expect-error defined below but filter not in type
plugin.transform.filter = api.filter;
options = api.options;
if (arraify(options.preprocess).length > 0) {
preprocessSvelte = createPreprocessSvelte(options, c);
// @ts-expect-error defined below but filter not in type
plugin.transform.filter = api.filter;
} else {
log.debug(
`disabling ${plugin.name} because no preprocessor is configured`,
undefined,
'preprocess'
);
delete plugin.transform;
// @ts-expect-error force set undefined to clear memory
preprocessSvelte = undefined;
// @ts-expect-error defined below but filter not in type
plugin.transform.filter = { id: /$./ }; // never match
}
},
configureServer(server) {
Expand Down
34 changes: 18 additions & 16 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading