Skip to content

Commit fd4ecab

Browse files
committed
add rolldown-vite to test matrix, improve setup for kit-node test
1 parent f02083d commit fd4ecab

File tree

5 files changed

+16
-7
lines changed

5 files changed

+16
-7
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ jobs:
8888
- node: 20.19
8989
os: ubuntu-latest
9090
vite: '6.3.0'
91+
# future test with rolldown-vite
92+
- node: 24
93+
os: ubuntu-latest
94+
vite: 'npm:rolldown-vite@latest'
9195
steps:
9296
- uses: actions/checkout@v4
9397
- uses: actions/setup-node@v4

packages/e2e-tests/_test_dependencies/vite-plugins/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export function writeResolvedConfig() {
6363
};
6464
const dir = path.join(config.root, 'logs', 'resolved-configs');
6565
if (!fs.existsSync(dir)) {
66-
fs.mkdirSync(dir);
66+
fs.mkdirSync(dir, { recursive: true });
6767
}
6868
const filename = path.join(dir, `vite.config.${cmd}${config.build.ssr ? '.ssr' : ''}.json`);
6969
fs.writeFileSync(filename, JSON.stringify(serializableConfig, replacer, '\t'), 'utf-8');

packages/e2e-tests/kit-node/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ node_modules
66
#.env
77
.env.*
88
!.env.example
9+
logs

packages/e2e-tests/scan-deps/__tests__/scan-deps.spec.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ import { describe, expect, it } from 'vitest';
33
describe('vite import scan', () => {
44
it('should not fail to discover dependencies exported from script module', async () => {
55
// vite logs an error if scan fails but continues, so validate no errors logged
6-
expect(
7-
e2eServer.logs.server.err.length,
8-
`unexpected errors:\n${e2eServer.logs.server.err.join('\n')}`
9-
).toBe(0);
6+
// rolldown-vite logs an error for optimizeDeps.esbuildOptions that is unrelated
7+
const errorLogs = e2eServer.logs.server.err.filter(
8+
(m) => !m.startsWith('You or a plugin you are using have set `optimizeDeps.esbuildOptions`')
9+
);
10+
expect(errorLogs.length, `unexpected errors:\n${errorLogs.join('\n')}`).toBe(0);
1011
});
1112
it('should work with exports from module context', async () => {
1213
expect(await getText('#svelte5')).toBe('svelte5');

packages/e2e-tests/vitestSetup.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,11 @@ beforeAll(
141141
if (fs.existsSync(tempViteCache)) {
142142
await fs.rm(tempViteCache, { force: true, recursive: true });
143143
}
144-
145-
await fs.mkdir(path.join(tempDir, 'logs'));
144+
const logsDir = path.join(tempDir, 'logs');
145+
if (fs.existsSync(logsDir)) {
146+
fs.rmSync(logsDir, { recursive: true, force: true });
147+
}
148+
await fs.mkdir(logsDir);
146149
const customServerScript = path.resolve(path.dirname(testPath), 'serve.js');
147150
const defaultServerScript = path.resolve(e2eTestsRoot, 'e2e-server.js');
148151
const hasCustomServer = fs.existsSync(customServerScript);

0 commit comments

Comments
 (0)