Skip to content

Commit 50422e8

Browse files
wmertenswmertens
authored
Merge pull request #7951 from QwikDev/v2-merge-main
chore: merge 1.16+nightly into v2
2 parents 28de164 + 6c7a4e1 commit 50422e8

File tree

275 files changed

+7665
-2973
lines changed

Some content is hidden

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

275 files changed

+7665
-2973
lines changed

‎.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+
});

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

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
import { test, expect } from '@playwright/test';
2+
3+
test('Advanced Dollar Function page loads', async ({ page }) => {
4+
await page.goto('/docs/advanced/dollar/');
5+
6+
await expect(page).toHaveTitle('The $ dollar sign | Advanced 📚 Qwik Documentation');
7+
});
8+
9+
test('Advanced Containers page loads', async ({ page }) => {
10+
await page.goto('/docs/advanced/containers/');
11+
await expect(page).toHaveTitle('Containers | Advanced 📚 Qwik Documentation');
12+
});
13+
14+
test('Advanced QRL page loads', async ({ page }) => {
15+
await page.goto('/docs/advanced/qrl/');
16+
await expect(page).toHaveTitle('QRL | Advanced 📚 Qwik Documentation');
17+
});
18+
19+
test('Advanced Library page loads', async ({ page }) => {
20+
await page.goto('/docs/advanced/library/');
21+
await expect(page).toHaveTitle('Component library | Advanced 📚 Qwik Documentation');
22+
});
23+
24+
test('Advanced Qwikloader page loads', async ({ page }) => {
25+
await page.goto('/docs/advanced/qwikloader/');
26+
await expect(page).toHaveTitle('Qwikloader | Advanced 📚 Qwik Documentation');
27+
});
28+
29+
test('Advanced Optimizer page loads', async ({ page }) => {
30+
await page.goto('/docs/advanced/optimizer/');
31+
await expect(page).toHaveTitle('Optimizer Rules | Advanced 📚 Qwik Documentation');
32+
});
33+
34+
test('Advanced Prefetching Modules page loads', async ({ page }) => {
35+
await page.goto('/docs/advanced/modules-prefetching/');
36+
await expect(page).toHaveTitle('Prefetching | Advanced 📚 Qwik Documentation');
37+
});
38+
39+
test('Advanced Custom Build Directory page loads', async ({ page }) => {
40+
await page.goto('/docs/advanced/custom-build-dir/');
41+
await expect(page).toHaveTitle('Custom Build Output Directory | Advanced 📚 Qwik Documentation');
42+
});
43+
44+
test('Advanced Vite page loads', async ({ page }) => {
45+
await page.goto('/docs/advanced/vite/');
46+
await expect(page).toHaveTitle('Vite | Advanced 📚 Qwik Documentation');
47+
});
48+
49+
test('Advanced Routing page loads', async ({ page }) => {
50+
await page.goto('/docs/advanced/routing/');
51+
await expect(page).toHaveTitle('Advanced Routing | Qwik Router 📚 Qwik Documentation');
52+
});
53+
54+
test('Advanced Plugins page loads', async ({ page }) => {
55+
await page.goto('/docs/advanced/plugins/');
56+
await expect(page).toHaveTitle('Qwik Plugins | Qwik Router 📚 Qwik Documentation');
57+
});
58+
59+
test('Advanced Request Handling page loads', async ({ page }) => {
60+
await page.goto('/docs/advanced/request-handling/');
61+
await expect(page).toHaveTitle('Request Handling | Advanced 📚 Qwik Documentation');
62+
});
63+
64+
test('Advanced Speculative Module Fetching page loads', async ({ page }) => {
65+
await page.goto('/docs/advanced/speculative-module-fetching/');
66+
await expect(page).toHaveTitle('Speculative Module Fetching | Advanced 📚 Qwik Documentation');
67+
});
68+
69+
test('Advanced Menu page loads', async ({ page }) => {
70+
await page.goto('/docs/advanced/menu/');
71+
await expect(page).toHaveTitle('Menu | Advanced 📚 Qwik Documentation');
72+
});
73+
74+
test('Advanced Generating Sitemaps page loads', async ({ page }) => {
75+
await page.goto('/docs/advanced/sitemaps/');
76+
await expect(page).toHaveTitle('Generating Sitemaps | Advanced 📚 Qwik Documentation');
77+
});
78+
79+
test('Advanced ESLint-Rules page loads', async ({ page }) => {
80+
await page.goto('/docs/advanced/eslint/');
81+
// currently does not have a custom title
82+
await expect(page).toHaveTitle('Qwik - Framework reimagined for the edge');
83+
});
84+
85+
test('Advanced Content Security Policy page loads', async ({ page }) => {
86+
await page.goto('/docs/advanced/content-security-policy/');
87+
await expect(page).toHaveTitle('Content Security Policy | Advanced 📚 Qwik Documentation');
88+
});
89+
90+
test('Advanced Complex Forms page loads', async ({ page }) => {
91+
await page.goto('/docs/advanced/complex-forms/');
92+
await expect(page).toHaveTitle('Complex Forms | Advanced 📚 Qwik Documentation');
93+
});

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { test, expect } from '@playwright/test';
2+
3+
test('Community Projects page loads', async ({ page }) => {
4+
await page.goto('/community/projects/');
5+
await expect(page).toHaveTitle('Projects | Qwik Community 📚 Qwik Documentation');
6+
});
7+
8+
test('Community Groups page loads', async ({ page }) => {
9+
await page.goto('/community/groups/');
10+
await expect(page).toHaveTitle('Groups | Qwik Community 📚 Qwik Documentation');
11+
});
12+
13+
test('Community Values page loads', async ({ page }) => {
14+
await page.goto('/community/values/');
15+
await expect(page).toHaveTitle('Values | Qwik Community 📚 Qwik Documentation');
16+
});

0 commit comments

Comments
 (0)