Skip to content

Commit 1b7fd1d

Browse files
wmertenswmertens
authored
Merge pull request #7382 from QwikDev/v2-vite-6
chore: vite 6 (just upgrade, no env)
2 parents 8619d6a + 5a00c0b commit 1b7fd1d

File tree

13 files changed

+845
-712
lines changed

13 files changed

+845
-712
lines changed

‎package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"dependencies": [
3030
"vite"
3131
],
32-
"pinVersion": "^5"
32+
"pinVersion": ">=5 <7"
3333
},
3434
{
3535
"label": "use workspace protocol for local packages and allow patch versions (used in e.g. qwik-react)",
@@ -115,7 +115,7 @@
115115
"@types/which-pm-runs": "1.0.2",
116116
"@typescript-eslint/eslint-plugin": "7.16.1",
117117
"@typescript-eslint/parser": "7.16.1",
118-
"@vitest/coverage-v8": "3.0.8",
118+
"@vitest/coverage-v8": "3.1.1",
119119
"all-contributors-cli": "6.26.1",
120120
"brotli": "1.3.3",
121121
"concurrently": "8.2.2",
@@ -139,7 +139,7 @@
139139
"prettier-plugin-jsdoc": "1.3.2",
140140
"pretty-quick": "4.0.0",
141141
"prompts": "2.4.2",
142-
"rollup": "4.24.2",
142+
"rollup": "4.39.0",
143143
"semver": "7.6.3",
144144
"simple-git-hooks": "2.11.1",
145145
"snoop": "1.0.4",
@@ -152,11 +152,11 @@
152152
"tsx": "4.19.2",
153153
"typescript": "5.8.2",
154154
"vfile": "6.0.2",
155-
"vite": "5.4.10",
156-
"vite-imagetools": "7.0.4",
157-
"vite-plugin-dts": "4.3.0",
155+
"vite": "6.2.6",
156+
"vite-imagetools": "7.0.5",
157+
"vite-plugin-dts": "4.5.3",
158158
"vite-tsconfig-paths": "5.1.4",
159-
"vitest": "3.0.8",
159+
"vitest": "3.1.1",
160160
"watchlist": "0.3.1",
161161
"which-pm-runs": "1.1.0",
162162
"zod": "3.22.4"
@@ -175,7 +175,8 @@
175175
"@supabase/realtime-js": "2.8.4"
176176
},
177177
"patchedDependencies": {
178-
"[email protected]": "patches/[email protected]"
178+
"[email protected]": "patches/[email protected]",
179+
"@auth/qwik": "patches/@auth__qwik.patch"
179180
}
180181
},
181182
"private": true,

‎packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"typescript": "5.8.2",
5757
"undici": "*",
5858
"valibot": "0.33.3",
59-
"vite": "5.4.10",
59+
"vite": "6.2.6",
6060
"vite-plugin-inspect": "0.8.5",
6161
"wrangler": "3.65.1"
6262
},

‎packages/docs/vite.config.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,6 @@ export default defineConfig(async () => {
100100
optimizeDeps: {
101101
entries: ['./src/routes/**/index.tsx', './src/routes/**/layout.tsx'],
102102
},
103-
dev: {
104-
headers: {
105-
'Cache-Control': 'public, max-age=0',
106-
},
107-
},
108103
preview: {
109104
headers: {
110105
'Cache-Control': 'public, max-age=600',

‎packages/insights/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Qwik Insights dashboard",
44
"version": "0.1.0",
55
"dependencies": {
6-
"@auth/qwik": "0.2.2",
6+
"@auth/qwik": "0.6.0",
77
"@libsql/client": "^0.14.0",
88
"@modular-forms/qwik": "^0.24.0",
99
"@typescript/analyze-trace": "^0.10.1",
@@ -33,9 +33,9 @@
3333
"tailwindcss": "3.4.6",
3434
"typescript": "5.8.2",
3535
"undici": "*",
36-
"vite": "5.4.10",
36+
"vite": "6.2.6",
3737
"vite-tsconfig-paths": "5.1.4",
38-
"vitest": "3.0.8",
38+
"vitest": "3.1.1",
3939
"zod": "3.22.4"
4040
},
4141
"engines": {

‎packages/insights/vite.config.ts

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,22 @@ import { qwikRouter } from '@qwik.dev/router/vite';
55
import { defineConfig, loadEnv } from 'vite';
66
import tsconfigPaths from 'vite-tsconfig-paths';
77

8-
export default defineConfig(async () => {
9-
return {
10-
plugins: [
11-
macroPlugin({ preset: 'pandacss' }),
12-
qwikRouter(),
13-
qwikVite({
14-
experimental: ['insights'],
15-
}),
16-
tsconfigPaths({ projects: ['.'] }),
17-
qwikInsights({ publicApiKey: loadEnv('', '.', '').PUBLIC_QWIK_INSIGHTS_KEY }),
18-
],
19-
dev: {
20-
headers: {
21-
'Cache-Control': 'public, max-age=0',
22-
},
8+
export default defineConfig({
9+
plugins: [
10+
macroPlugin({ preset: 'pandacss' }),
11+
qwikRouter(),
12+
qwikVite({
13+
experimental: ['insights'],
14+
}),
15+
tsconfigPaths({ projects: ['.'] }),
16+
qwikInsights({ publicApiKey: loadEnv('', '.', '').PUBLIC_QWIK_INSIGHTS_KEY }),
17+
],
18+
preview: {
19+
headers: {
20+
'Cache-Control': 'public, max-age=600',
2321
},
24-
preview: {
25-
headers: {
26-
'Cache-Control': 'public, max-age=600',
27-
},
28-
},
29-
optimizeDeps: {
30-
include: ['@auth/core'],
31-
},
32-
};
22+
},
23+
optimizeDeps: {
24+
include: ['@auth/core'],
25+
},
3326
});

‎packages/qwik-react/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"react": "18.3.1",
1111
"react-dom": "18.3.1",
1212
"typescript": "5.8.2",
13-
"vite": "5.4.10"
13+
"vite": "6.2.6"
1414
},
1515
"engines": {
1616
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -40,7 +40,7 @@
4040
"@types/react-dom": "^18",
4141
"react": "^18",
4242
"react-dom": "^18",
43-
"vite": "^5"
43+
"vite": ">=5 <7"
4444
},
4545
"publishConfig": {
4646
"access": "public"

‎packages/qwik-router/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"undici": "*",
1212
"valibot": ">=0.36.0 <2",
1313
"vfile": "6.0.2",
14-
"vite": "^5",
15-
"vite-imagetools": "^7",
14+
"vite": ">=5 <7",
15+
"vite-imagetools": "^7.0.5",
1616
"zod": "3.22.4"
1717
},
1818
"devDependencies": {
@@ -176,7 +176,7 @@
176176
"license": "MIT",
177177
"main": "./lib/index.qwik.mjs",
178178
"peerDependencies": {
179-
"vite": "^5"
179+
"vite": ">=5 <7"
180180
},
181181
"publishConfig": {
182182
"access": "public"

‎packages/qwik/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"kleur": "4.1.5",
1919
"prettier": "3.4.2",
2020
"ts-morph": "23.0.0",
21-
"vitest": "3.0.8"
21+
"vitest": "3.1.1"
2222
},
2323
"engines": {
2424
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
@@ -178,8 +178,8 @@
178178
"main": "./src/index.ts",
179179
"peerDependencies": {
180180
"prettier": "*",
181-
"vite": "^5",
182-
"vitest": "^2"
181+
"vite": ">=5 <7",
182+
"vitest": ">=2 <3"
183183
},
184184
"peerDependenciesMeta": {
185185
"vitest": {

‎packages/qwik/src/core/shared/shared-serialization.ts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,8 @@ const inflate = (
324324
case TypeIds.Error: {
325325
const d = data as unknown[];
326326
target.message = d[0];
327-
const second = d[1];
328-
if (second && Array.isArray(second)) {
329-
for (let i = 0; i < second.length; i++) {
330-
target[second[i++]] = second[i];
331-
}
332-
target.stack = d[2];
333-
} else {
334-
target.stack = second;
327+
for (let i = 1; i < d.length; i += 2) {
328+
target[d[i] as string] = d[i + 1];
335329
}
336330
break;
337331
}
@@ -818,7 +812,7 @@ export const createSerializationContext = (
818812
) {
819813
// ignore
820814
} else if (obj instanceof Error) {
821-
discoveredValues.push(...Object.values(obj));
815+
discoveredValues.push(obj.message, ...Object.values(obj), isDev && obj.stack);
822816
} else if (isStore(obj)) {
823817
const target = getStoreTarget(obj)!;
824818
const effects = getStoreHandler(obj)!.$effects$;
@@ -1268,13 +1262,11 @@ function serialize(serializationContext: SerializationContext): void {
12681262
output(TypeIds.Regex, value.toString());
12691263
} else if (value instanceof Error) {
12701264
const out: any[] = [value.message];
1271-
const extraProps = Object.entries(value).flat();
1272-
if (extraProps.length) {
1273-
out.push(extraProps);
1274-
}
1265+
// flatten gives us the right output
1266+
out.push(...Object.entries(value).flat());
12751267
/// In production we don't want to leak the stack trace.
12761268
if (isDev) {
1277-
out.push(value.stack);
1269+
out.push('stack', value.stack);
12781270
}
12791271
output(TypeIds.Error, out);
12801272
} else if ($isSsrNode$(value)) {

‎packages/qwik/src/core/shared/shared-serialization.unit.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,26 +161,28 @@ describe('shared-serialization', () => {
161161
err.stack = err
162162
.stack!.replaceAll(/([A-Z]:){0,1}(\/|\\).*\./g, '/...path/file.')
163163
.replaceAll(/:\d+:\d+/g, ':123:456');
164-
expect(await dump(err)).toMatchInlineSnapshot(`
164+
const dumpNoSize = async (obj: any) =>
165+
(await dump(obj)).replaceAll(/\(\d+ chars\)/g, '(x chars)');
166+
expect(await dumpNoSize(err)).toMatchInlineSnapshot(`
165167
"
166168
0 Error [
167169
String "hi"
170+
String "stack"
168171
String "Error: hi\\n at /...path/file.ts:123:456\\n at file:/...path/file.js:123:456\\n at file:/...path/file.js:123:456\\"...
169172
]
170-
(487 chars)"
173+
(x chars)"
171174
`);
172175
(err as any).extra = 'yey';
173-
expect(await dump(err)).toMatchInlineSnapshot(`
176+
expect(await dumpNoSize(err)).toMatchInlineSnapshot(`
174177
"
175178
0 Error [
176179
String "hi"
177-
Array [
178-
String "extra"
179-
String "yey"
180-
]
180+
String "extra"
181+
String "yey"
182+
String "stack"
181183
String "Error: hi\\n at /...path/file.ts:123:456\\n at file:/...path/file.js:123:456\\n at file:/...path/file.js:123:456\\"...
182184
]
183-
(509 chars)"
185+
(x chars)"
184186
`);
185187
});
186188
it(title(TypeIds.Object), async () => {

0 commit comments

Comments
 (0)