Skip to content

Commit 168efd5

Browse files
wmertenswmertens
authored
Merge pull request #7998 from QwikDev/v2-merge-main
chore: merge 1.16.1 into v2
2 parents 2b27088 + c2a7ef2 commit 168efd5

File tree

164 files changed

+3792
-3533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+3792
-3533
lines changed

‎.changeset/bright-cloths-film.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
Fix: Better configuration of Vite's optimizeDeps, preventing false duplication warnings, and verifying that Qwik dependencies are not in optimizeDeps.

‎.changeset/config.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
"access": "public",
1010
"baseBranch": "origin/build/v2",
1111
"updateInternalDependencies": "minor",
12-
"ignore": ["qwik-docs", "insights", "qwik-cli-e2e", "docs-e2e"],
12+
"ignore": [
13+
"qwik-docs",
14+
"insights",
15+
"qwik-cli-e2e",
16+
"qwik-react-test-app",
17+
"docs-e2e"
18+
],
1319
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
1420
"onlyUpdatePeerDependentsWhenOutOfRange": true
1521
}

‎.changeset/tidy-chefs-tickle.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@qwik.dev/core': patch
3+
---
4+
5+
fix: During deserialization, stores now correctly handle cyclic references to themselves

‎.github/workflows/ci.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,8 @@ jobs:
694694
mv artifact-create-qwik/* packages/create-qwik/dist/
695695
mkdir -p packages/eslint-plugin-qwik/dist/
696696
mv artifact-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
697+
mkdir -p packages/qwik-react/lib/
698+
mv artifact-qwikreact/lib/* packages/qwik-react/lib/
697699
698700
- run: pnpm install --frozen-lockfile
699701

@@ -706,10 +708,12 @@ jobs:
706708
- name: Playwright E2E Integration Tests
707709
run: pnpm run test.e2e.integrations.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
708710

709-
# RE-ENABBLE THIS AFTER qwik.dev/ packages are published
710-
# - name: Validate Create Qwik Cli
711-
# if: matrix.settings.host != 'windows-latest'
712-
# run: pnpm cli.validate
711+
- name: Playwright E2E Qwik React Tests
712+
run: pnpm run test.e2e.qwik-react.${{ matrix.settings.browser }} --timeout 60000 --retries 7 --workers 1
713+
714+
- name: Validate Create Qwik Cli
715+
if: matrix.settings.host != 'windows-latest'
716+
run: pnpm cli.validate
713717

714718
############ E2E CLI TEST ############
715719
test-cli-e2e:

‎e2e/docs-e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.0.0",
55
"author": "",
66
"devDependencies": {
7-
"@playwright/test": "1.50.1",
7+
"@playwright/test": "1.54.1",
88
"@types/node": "24.3.0"
99
},
1010
"keywords": [],

‎e2e/docs-e2e/tests/Docs/docs-components-pages-load.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
import { test, expect } from '@playwright/test';
22

33
test('Components Overview page loads', async ({ page }) => {
4-
await page.goto('/docs/components/overview/');
4+
await page.goto('/docs/core/overview/');
55
await expect(page).toHaveTitle('Overview | Components 📚 Qwik Documentation');
66
});
77

88
test('Components State page loads', async ({ page }) => {
9-
await page.goto('/docs/components/state/');
9+
await page.goto('/docs/core/state/');
1010
await expect(page).toHaveTitle('State | Components 📚 Qwik Documentation');
1111
});
1212

1313
test('Components Tasks and Lifecycle page loads', async ({ page }) => {
14-
await page.goto('/docs/components/tasks/');
14+
await page.goto('/docs/core/tasks/');
1515
await expect(page).toHaveTitle('Tasks and Lifecycle | Components 📚 Qwik Documentation');
1616
});
1717

1818
test('Components Context page loads', async ({ page }) => {
19-
await page.goto('/docs/components/context/');
19+
await page.goto('/docs/core/context/');
2020
await expect(page).toHaveTitle('Context | Components 📚 Qwik Documentation');
2121
});
2222

2323
test('Components Slots page loads', async ({ page }) => {
24-
await page.goto('/docs/components/slots/');
24+
await page.goto('/docs/core/slots/');
2525
await expect(page).toHaveTitle('Slots | Components 📚 Qwik Documentation');
2626
});
2727

2828
test('Components Rendering page loads', async ({ page }) => {
29-
await page.goto('/docs/components/rendering/');
29+
await page.goto('/docs/core/rendering/');
3030
await expect(page).toHaveTitle('Rendering | Components 📚 Qwik Documentation');
3131
});
3232

3333
test('Components Styles page loads', async ({ page }) => {
34-
await page.goto('/docs/components/styles/');
34+
await page.goto('/docs/core/styles/');
3535
await expect(page).toHaveTitle('Styles | Components 📚 Qwik Documentation');
3636
});
3737

‎e2e/qwik-react-e2e/.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
playwright-report
2+
dist
3+
logs
4+
server
5+
tmp

‎e2e/qwik-react-e2e/adapters/express/vite.config.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { nodeServerAdapter } from '@qwik.dev/router/adapters/node-server/vite';
2+
import { extendConfig } from '@qwik.dev/router/vite';
3+
import baseConfig from '../../vite.config';
4+
5+
export default extendConfig(baseConfig, () => {
6+
return {
7+
build: {
8+
ssr: true,
9+
rollupOptions: {
10+
input: ['src/entry.express.tsx'],
11+
},
12+
},
13+
plugins: [nodeServerAdapter({ name: 'express' })],
14+
};
15+
});

‎e2e/qwik-react-e2e/package.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"name": "qwik-react-test-app",
3+
"description": "Qwik react test app",
4+
"engines": {
5+
"node": "^18.17.0 || ^20.3.0 || >=21.0.0"
6+
},
7+
"private": true,
8+
"devDependencies": {
9+
"@qwik.dev/react": "workspace:*",
10+
"@types/react": "19.1.13",
11+
"@types/react-dom": "19.1.7",
12+
"react": "19.1.1",
13+
"react-dom": "19.1.1"
14+
},
15+
"scripts": {
16+
"build": "qwik build",
17+
"build.client": "vite build",
18+
"build.preview": "vite build --ssr src/entry.preview.tsx",
19+
"build.server": "vite build -c adapters/express/vite.config.ts",
20+
"build.types": "tsc --incremental --noEmit",
21+
"deploy": "vercel deploy",
22+
"dev": "vite --mode ssr",
23+
"dev.debug": "node --inspect-brk ./node_modules/vite/bin/vite.js --mode ssr --force",
24+
"express": "pnpm build && pnpm serve",
25+
"fmt": "prettier --write .",
26+
"fmt.check": "prettier --check .",
27+
"lint": "eslint \"src/**/*.ts*\"",
28+
"preview": "qwik build preview && vite preview --open",
29+
"qwik": "qwik",
30+
"serve": "node server/entry.express",
31+
"start": "vite --open --mode ssr",
32+
"test": "playwright test",
33+
"test.debug": "playwright test --debug",
34+
"test.ui": "playwright test --ui"
35+
},
36+
"type": "module"
37+
}

‎e2e/qwik-react-e2e/playwright.config.ts‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { defineConfig, devices } from '@playwright/test';
2+
3+
/** See https://playwright.dev/docs/test-configuration. */
4+
export default defineConfig({
5+
testDir: './tests',
6+
fullyParallel: true,
7+
forbidOnly: !!process.env.CI,
8+
retries: process.env.CI ? 2 : 0,
9+
workers: process.env.CI ? 1 : undefined,
10+
reporter: 'line',
11+
12+
use: {
13+
baseURL: 'http://localhost:3000',
14+
// trace: 'on-first-retry',
15+
// screenshot: 'only-on-failure',
16+
17+
// Increase timeouts for service worker operations
18+
actionTimeout: 10000,
19+
navigationTimeout: 10000,
20+
},
21+
22+
// Increase global timeout for service worker tests
23+
timeout: 30000,
24+
25+
projects: [
26+
{
27+
name: 'chromium',
28+
use: {
29+
...devices['Desktop Chrome'],
30+
},
31+
},
32+
// {
33+
// name: 'firefox',
34+
// use: { ...devices['Desktop Firefox'] },
35+
// },
36+
{
37+
name: 'webkit',
38+
use: { ...devices['Desktop Safari'] },
39+
},
40+
],
41+
42+
webServer: {
43+
command: 'npm run express',
44+
port: 3000,
45+
stdout: 'pipe',
46+
reuseExistingServer: !process.env.CI,
47+
},
48+
});

0 commit comments

Comments
 (0)