fixup

Author: wmertens

.github/workflows/ci.yml

@@ -920,9 +920,9 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  ############ TRIGGER QWIKCITY E2E TEST ############
+  ############ TRIGGER QWIKKROUTER E2E TEST ############
   trigger-qwikrouter-e2e:
-    name: Trigger Qwik City E2E
+    name: Trigger Qwik Router E2E
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/upcoming'
 

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

@@ -21,7 +21,7 @@ const buildDir = join(distDir, 'build');
 // Allow for dynamic port
 const PORT = process.env.PORT ?? 3000;
 
-// Create the Qwik City Node middleware
+// Create the Router Node middleware
 const { router, notFound } = createQwikRouter({
   render,
   // getOrigin(req) {
@@ -46,10 +46,10 @@ const app = express();
 app.use(`/build`, express.static(buildDir, { immutable: true, maxAge: '1y' }));
 app.use(express.static(distDir, { redirect: false }));
 
-// Use Qwik City's page and endpoint request handler
+// Use Router's page and endpoint request handler
 app.use(router);
 
-// Use Qwik City's 404 handler
+// Use Router's 404 handler
 app.use(notFound);
 
 // Start the express server

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

@@ -13,5 +13,5 @@
 import { createQwikRouter } from '@qwik.dev/router/middleware/node';
 import render from './entry.ssr';
 
-/** The default export is the QwikCity adapter used by Vite preview. */
+/** The default export is the Qwik Router adapter used by Vite preview. */
 export default createQwikRouter({ render });

e2e/docs-e2e/playwright.config.ts

@@ -7,7 +7,7 @@ import { defineConfig, devices } from '@playwright/test';
 
 /** See https://playwright.dev/docs/test-configuration. */
 
-const TestingURL = 'http://127.0.0.1:3000';
+const TestingURL = 'http://localhost:3000';
 
 export default defineConfig({
   testDir: './tests',
@@ -40,10 +40,6 @@ export default defineConfig({
       name: 'chromium',
       use: { ...devices['Desktop Chrome'] },
     },
-    {
-      name: 'chrome',
-      use: { ...devices['Desktop Chrome'] },
-    },
 
     {
       name: 'firefox',
@@ -78,7 +74,7 @@ export default defineConfig({
 
   /* Run your local dev server before starting the tests */
   webServer: {
-    command: 'pnpm -C ../../ run docs.dev',
+    command: 'pnpm -C ../.. run docs.dev',
     url: TestingURL,
     reuseExistingServer: !process.env.CI,
   },

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

@@ -48,12 +48,12 @@ test('Advanced Vite page loads', async ({ page }) => {
 
 test('Advanced Routing page loads', async ({ page }) => {
   await page.goto('/docs/advanced/routing/');
-  await expect(page).toHaveTitle('Advanced Routing | Qwik City 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Advanced Routing | Qwik Router 📚 Qwik Documentation');
 });
 
 test('Advanced Plugins page loads', async ({ page }) => {
   await page.goto('/docs/advanced/plugins/');
-  await expect(page).toHaveTitle('Qwik Plugins | Qwik City 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Qwik Plugins | Qwik Router 📚 Qwik Documentation');
 });
 
 test('Advanced Request Handling page loads', async ({ page }) => {

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

@@ -38,6 +38,5 @@ test('Components Styles page loads', async ({ page }) => {
 test('Components API Reference page loads', async ({ page }) => {
   await page.goto('/api/qwik/');
 
-  // todo V2: change this to @qwik.dev
-  await expect(page).toHaveTitle('@builder.io/qwik API Reference 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('@qwik.dev/qwik API Reference 📚 Qwik Documentation');
 });

e2e/docs-e2e/tests/Docs/experimental-pages-load.spec.ts

@@ -0,0 +1,16 @@
+import { test, expect } from '@playwright/test';
+
+test('Experimental Overview page loads', async ({ page }) => {
+  await page.goto('/docs/labs/');
+  await expect(page).toHaveTitle('🧪 Experimental | Overview 📚 Qwik Documentation');
+});
+
+test('Experimental Insights page loads', async ({ page }) => {
+  await page.goto('/docs/labs/insights/');
+  await expect(page).toHaveTitle('🧪 Insights | Experimental 📚 Qwik Documentation');
+});
+
+test('Experimental usePreventNavigate page loads', async ({ page }) => {
+  await page.goto('/docs/labs/usePreventNavigate/');
+  await expect(page).toHaveTitle('🧪 usePreventNavigate | Experimental 📚 Qwik Documentation');
+});

e2e/docs-e2e/tests/Docs/guides-pages-load.spec.ts

@@ -39,5 +39,5 @@ test('Guides Bundle Optimization page loads', async ({ page }) => {
 
 test('Guides Environment Variables page loads', async ({ page }) => {
   await page.goto('/docs/guides/env-variables/');
-  await expect(page).toHaveTitle('Environment variables | Qwik City 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Environment variables | Qwik Router 📚 Qwik Documentation');
 });

e2e/docs-e2e/tests/Docs/integrations-pages-load.spec.ts

@@ -2,7 +2,7 @@ import { test, expect } from '@playwright/test';
 
 test('Integrations Overview page loads', async ({ page }) => {
   await page.goto('/docs/integrations/');
-  await expect(page).toHaveTitle('Qwik City Integrations | Guides 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Qwik Router Integrations | Guides 📚 Qwik Documentation');
 });
 
 test('Integrations Astro page loads', async ({ page }) => {
@@ -72,7 +72,7 @@ test('Integrations OG Image / Open Graph Image page loads', async ({ page }) =>
 
 test('Integrations Orama page loads', async ({ page }) => {
   await page.goto('/docs/integrations/orama/');
-  await expect(page).toHaveTitle('Qwik City and Orama 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Qwik Router and Orama 📚 Qwik Documentation');
 });
 
 test('Integrations Panda CSS page loads', async ({ page }) => {

e2e/docs-e2e/tests/Docs/pages-load-test.spec.ts

@@ -38,12 +38,12 @@ test('docs page loads', async ({ page }) => {
 
   expect(componentsLinksOnPage).toStrictEqual(expectedComponentLinks);
 
-  const qwikCityLinksOnPage = await page
+  const qwikRouterLinksOnPage = await page
     .locator('#qwik-sidebar')
-    .locator('details:has(summary h5:text("Qwik City")) ul li a')
+    .locator('details:has(summary h5:text("Qwik Router")) ul li a')
     .allTextContents();
 
-  const expectedQwikCityLinks = [
+  const expectedQwikRouterLinks = [
     'Overview',
     'Routing',
     'Pages',
@@ -61,7 +61,7 @@ test('docs page loads', async ({ page }) => {
     'API reference',
   ];
 
-  expect(qwikCityLinksOnPage).toStrictEqual(expectedQwikCityLinks);
+  expect(qwikRouterLinksOnPage).toStrictEqual(expectedQwikRouterLinks);
 
   const cookbookLinksOnPage = await page
     .locator('#qwik-sidebar')
@@ -84,6 +84,7 @@ test('docs page loads', async ({ page }) => {
     'Theme Management',
     'Drag & Drop',
     'View Transition',
+    'Detect img tag onLoad',
   ];
 
   // if you are adding a new page to the cookbook, please add a new test for the page to load too
@@ -146,6 +147,7 @@ test('docs page loads', async ({ page }) => {
     'Self-Hosting',
     'Vercel Edge',
     'Static Site',
+    'GitHub Pages',
     'Azion',
   ];
 
@@ -166,6 +168,7 @@ test('docs page loads', async ({ page }) => {
     'Best Practices',
     'Bundle Optimization',
     'Env variables',
+    'Rewrites',
   ];
 
   expect(guidesLinksOnPage).toStrictEqual(expectedGuidesLinks);
@@ -217,20 +220,20 @@ test('docs page loads', async ({ page }) => {
 
   expect(referenceLinksOnPage).toStrictEqual(expectedReferenceLinks);
 
-  const qwikLabsLinksOnPage = await page
+  const ExperimentalLinksOnPage = await page
     .locator('#qwik-sidebar')
-    .locator('details:has(summary h5:text("Qwik Labs 🧪")) ul li a')
+    .locator('details:has(summary h5:text("Experimental 🧪")) ul li a')
     .allTextContents();
 
-  const expectedQwikLabsLinks = [
+  const expectedExperimentalLinks = [
     'Overview',
     'Insights',
     'Typed Routes',
     'Devtools',
     'usePreventNavigate',
   ];
 
-  expect(qwikLabsLinksOnPage).toStrictEqual(expectedQwikLabsLinks);
+  expect(ExperimentalLinksOnPage).toStrictEqual(expectedExperimentalLinks);
 
   const communityLinksOnPage = await page
     .locator('#qwik-sidebar')
@@ -249,7 +252,7 @@ test('getting started page loads', async ({ page }) => {
 
 test('Project Structure page loads', async ({ page }) => {
   await page.goto('/docs/project-structure/');
-  await expect(page).toHaveTitle('Project Structure | Qwik City 📚 Qwik Documentation');
+  await expect(page).toHaveTitle('Project Structure | Qwik Router 📚 Qwik Documentation');
 });
 
 test('FAQ page loads', async ({ page }) => {