Skip to content

Commit 809aade

Browse files
committed
Merge remote-tracking branch 'origin/build/v2' into router-dev-improvements
2 parents 2ff2025 + 50422e8 commit 809aade

File tree

297 files changed

+8327
-3466
lines changed

Some content is hidden

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

297 files changed

+8327
-3466
lines changed

.changeset/pre.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
"common-breads-wait",
3535
"cyan-bottles-speak",
3636
"cyan-walls-sing",
37+
"dark-eagles-tap",
3738
"dirty-lemons-shop",
3839
"dirty-lines-march",
40+
"easy-geese-watch",
3941
"eighty-ligers-wink",
4042
"eighty-points-argue",
4143
"every-badgers-bake",
@@ -47,6 +49,7 @@
4749
"five-shoes-deny",
4850
"flat-hounds-burn",
4951
"fluffy-poets-raise",
52+
"fluffy-times-hug",
5053
"forty-garlics-train",
5154
"fresh-rocks-exercise",
5255
"friendly-beers-heal",
@@ -63,17 +66,22 @@
6366
"heavy-seas-carry",
6467
"hip-hornets-cheer",
6568
"hip-points-kick",
69+
"honest-berries-knock",
6670
"honest-pears-sniff",
6771
"itchy-comics-develop",
6872
"kind-toes-glow",
6973
"large-houses-watch",
74+
"lazy-tigers-dig",
75+
"lemon-dingos-dance",
7076
"lemon-tools-bathe",
7177
"little-ways-deny",
7278
"long-shirts-thank",
7379
"loud-dolphins-relate",
80+
"many-forks-ring",
7481
"many-tips-win",
7582
"mean-dingos-hug",
7683
"mean-parents-buy",
84+
"mean-tires-cover",
7785
"nervous-terms-explode",
7886
"nine-otters-repeat",
7987
"ninety-crabs-lay",
@@ -84,6 +92,7 @@
8492
"olive-yaks-prove",
8593
"open-beds-grab",
8694
"orange-otters-attend",
95+
"plain-eggs-clean",
8796
"polite-sloths-visit",
8897
"pretty-trees-check",
8998
"proud-houses-fix",
@@ -103,13 +112,16 @@
103112
"shaggy-poems-return",
104113
"sharp-apples-relate",
105114
"short-suits-bet",
115+
"shy-shirts-glow",
106116
"shy-walls-shake",
117+
"silly-pans-wear",
107118
"silly-symbols-sleep",
108119
"six-games-float",
109120
"sixty-grapes-beam",
110121
"slick-clowns-relax",
111122
"slimy-weeks-hope",
112123
"smooth-cups-press",
124+
"social-lizards-clean",
113125
"soft-insects-see",
114126
"solid-olives-know",
115127
"some-birds-juggle",
@@ -125,16 +137,19 @@
125137
"tame-glasses-explain",
126138
"tasty-penguins-ring",
127139
"tasty-turkeys-stand",
140+
"ten-emus-jog",
128141
"thirty-carrots-stand",
129142
"thirty-ravens-draw",
130143
"tiny-berries-bow",
131144
"tiny-cows-pick",
132145
"tricky-meals-heal",
133146
"tricky-peaches-buy",
134147
"twenty-goats-flow",
148+
"twenty-lines-prove",
135149
"unlucky-dodos-grab",
136150
"unlucky-olives-knock",
137151
"warm-camels-remain",
152+
"warm-spoons-punch",
138153
"wet-bobcats-decide",
139154
"wicked-pets-chew",
140155
"wide-boats-pump",

.changeset/twelve-buckets-brake.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: resuming shadow dom container with multiple root children

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,9 +920,9 @@ jobs:
920920
env:
921921
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
922922

923-
############ TRIGGER QWIKCITY E2E TEST ############
923+
############ TRIGGER QWIKKROUTER E2E TEST ############
924924
trigger-qwikrouter-e2e:
925-
name: Trigger Qwik City E2E
925+
name: Trigger Qwik Router E2E
926926
runs-on: ubuntu-latest
927927
if: github.ref == 'refs/heads/upcoming'
928928

.npmrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

e2e/adapters-e2e/src/entry.express.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const buildDir = join(distDir, 'build');
2121
// Allow for dynamic port
2222
const PORT = process.env.PORT ?? 3000;
2323

24-
// Create the Qwik City Node middleware
24+
// Create the Router Node middleware
2525
const { router, notFound } = createQwikRouter({
2626
render,
2727
// getOrigin(req) {
@@ -46,10 +46,10 @@ const app = express();
4646
app.use(`/build`, express.static(buildDir, { immutable: true, maxAge: '1y' }));
4747
app.use(express.static(distDir, { redirect: false }));
4848

49-
// Use Qwik City's page and endpoint request handler
49+
// Use Router's page and endpoint request handler
5050
app.use(router);
5151

52-
// Use Qwik City's 404 handler
52+
// Use Router's 404 handler
5353
app.use(notFound);
5454

5555
// Start the express server

e2e/adapters-e2e/src/entry.preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
import { createQwikRouter } from '@qwik.dev/router/middleware/node';
1414
import render from './entry.ssr';
1515

16-
/** The default export is the QwikCity adapter used by Vite preview. */
16+
/** The default export is the Qwik Router adapter used by Vite preview. */
1717
export default createQwikRouter({ render });

e2e/adapters-e2e/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"baseUrl": ".",
44
"allowJs": true,
5-
"target": "ES2017",
5+
"target": "ES2020",
66
"module": "ES2022",
77
"lib": ["es2022", "DOM", "WebWorker", "DOM.Iterable"],
88
"jsx": "react-jsx",

e2e/docs-e2e/.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
# Playwright
3+
node_modules/
4+
/test-results/
5+
/playwright-report/
6+
/blob-report/
7+
/playwright/.cache/

e2e/docs-e2e/package.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"name": "docs-e2e",
3+
"description": "",
4+
"version": "1.0.0",
5+
"author": "",
6+
"devDependencies": {
7+
"@playwright/test": "1.50.1",
8+
"@types/node": "24.2.1"
9+
},
10+
"keywords": [],
11+
"license": "ISC",
12+
"main": "index.js",
13+
"scripts": {
14+
"test": "pnpm exec playwright test --config=playwright.config.ts --project=chromium",
15+
"test-ui": "pnpm exec playwright test --config=playwright.config.ts --project=chromium --ui"
16+
},
17+
"type": "commonjs"
18+
}

e2e/docs-e2e/playwright.config.ts

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
import { defineConfig, devices } from '@playwright/test';
2+
3+
/** Read environment variables from file. https://github.com/motdotla/dotenv */
4+
// import dotenv from 'dotenv';
5+
// import path from 'path';
6+
// dotenv.config({ path: path.resolve(__dirname, '.env') });
7+
8+
/** See https://playwright.dev/docs/test-configuration. */
9+
10+
const TestingURL = 'http://localhost:3000';
11+
12+
export default defineConfig({
13+
testDir: './tests',
14+
/* Global timeout for each test */
15+
timeout: 60_000,
16+
expect: { timeout: 60_000 },
17+
/* Run tests in files in parallel */
18+
fullyParallel: true,
19+
/* Fail the build on CI if you accidentally left test.only in the source code. */
20+
forbidOnly: !!process.env.CI,
21+
/* Retry on CI only */
22+
retries: process.env.CI ? 2 : 0,
23+
/* Opt out of parallel tests on CI. */
24+
workers: process.env.CI ? 1 : undefined,
25+
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
26+
reporter: 'html',
27+
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
28+
use: {
29+
/* Base URL to use in actions like `await page.goto('/')`. */
30+
baseURL: TestingURL,
31+
actionTimeout: 30_000,
32+
navigationTimeout: 60_000,
33+
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
34+
trace: 'on-first-retry',
35+
},
36+
37+
/* Configure projects for major browsers */
38+
projects: [
39+
{
40+
name: 'chromium',
41+
use: { ...devices['Desktop Chrome'] },
42+
},
43+
44+
{
45+
name: 'firefox',
46+
use: { ...devices['Desktop Firefox'] },
47+
},
48+
49+
{
50+
name: 'webkit',
51+
use: { ...devices['Desktop Safari'] },
52+
},
53+
54+
/* Test against mobile viewports. */
55+
// {
56+
// name: 'Mobile Chrome',
57+
// use: { ...devices['Pixel 5'] },
58+
// },
59+
// {
60+
// name: 'Mobile Safari',
61+
// use: { ...devices['iPhone 12'] },
62+
// },
63+
64+
/* Test against branded browsers. */
65+
// {
66+
// name: 'Microsoft Edge',
67+
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
68+
// },
69+
// {
70+
// name: 'Google Chrome',
71+
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
72+
// },
73+
],
74+
75+
/* Run your local dev server before starting the tests */
76+
webServer: {
77+
command: 'pnpm -C ../.. run docs.dev',
78+
url: TestingURL,
79+
reuseExistingServer: !process.env.CI,
80+
},
81+
});

0 commit comments

Comments
 (0)