Skip to content

Commit c778f78

Browse files
committed
fix glob to exclude +server.js and fix tests
1 parent ed2ef30 commit c778f78

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

packages/kit/src/exports/vite/index.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,10 @@ async function kit({ svelte_config }) {
293293
cors: { preflightContinue: true }
294294
},
295295
optimizeDeps: {
296-
entries: [`${kit.files.routes}/**/+*.{svelte,js,ts}`, `!${kit.files.routes}/**/+*.server.{svelte,js,ts}`],
296+
entries: [
297+
`${kit.files.routes}/**/+*.{svelte,js,ts}`,
298+
`!${kit.files.routes}/**/+*server.{svelte,js,ts}`
299+
],
297300
exclude: [
298301
'@sveltejs/kit',
299302
// exclude kit features so that libraries using them work even when they are prebundled

packages/kit/test/apps/dev-only/test/test.js

-20
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,6 @@ test.describe('Vite', () => {
107107
expect(manifest).toHaveProperty('optimized.e2e-test-dep-page-universal');
108108
});
109109

110-
test('optimizes +page.server.js dependencies', async ({ page }) => {
111-
await page.goto('/');
112-
await page.getByText('hello world!').waitFor();
113-
114-
const manifest_path = path.join(__dirname, '../node_modules/.vite/deps/_metadata.json');
115-
const manifest = JSON.parse(fs.readFileSync(manifest_path, 'utf-8'));
116-
117-
expect(manifest).toHaveProperty('optimized.e2e-test-dep-page-server');
118-
});
119-
120110
test('optimizes +layout.svelte dependencies', async ({ page }) => {
121111
await page.goto('/');
122112
await page.getByText('hello world!').waitFor();
@@ -137,16 +127,6 @@ test.describe('Vite', () => {
137127
expect(manifest).toHaveProperty('optimized.e2e-test-dep-layout-universal');
138128
});
139129

140-
test('optimizes +layout.server.js dependencies', async ({ page }) => {
141-
await page.goto('/');
142-
await page.getByText('hello world!').waitFor();
143-
144-
const manifest_path = path.join(__dirname, '../node_modules/.vite/deps/_metadata.json');
145-
const manifest = JSON.parse(fs.readFileSync(manifest_path, 'utf-8'));
146-
147-
expect(manifest).toHaveProperty('optimized.e2e-test-dep-layout-server');
148-
});
149-
150130
test('optimizes +error.svelte dependencies', async ({ page }) => {
151131
await page.goto('/');
152132
await page.getByText('hello world!').waitFor();

0 commit comments

Comments
 (0)