Merge pull request #7748 from QwikDev/v2-router-things

feat: refactor build configuration

Author: wmertens

.changeset/all-cloths-hammer.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': minor
+---
+
+FEAT: the QRL segment mapping during Vite dev mode now happens in core and does not require providing a separate `symbolMapper` function any more.

.changeset/green-drinks-strive.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/router': minor
+---
+
+FEAT: qwikRouter middleware no longer needs qwikRouterConfig, it handles it internally

.changeset/large-houses-watch.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': patch
+---
+
+FIX: the `srcInput` option to `qwikVite` is deprecated because it's unused.

.changeset/many-tips-win.md

@@ -0,0 +1,6 @@
+---
+'@qwik.dev/core': minor
+'@qwik.dev/router': patch
+---
+
+FEAT: Server output chunk files are now under their own build/ subdir, like the client build. This makes it easier to override the chunk filenames. This is possible because the Router metadata files are now an earlier part of the build process.

.changeset/short-suits-bet.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': minor
+---
+
+FIX: `qwikVite` has better vite config handling around input files, and no longer writes the q-manifest file to a temp dir.

e2e/adapters-e2e/adapters/express/vite.config.ts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ['src/entry.express.tsx', '@qwik-router-config'],
+        input: ['src/entry.express.tsx'],
       },
     },
     plugins: [nodeServerAdapter({ name: 'express' })],

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

@@ -9,7 +9,6 @@
  */
 import { createQwikRouter } from '@qwik.dev/router/middleware/node';
 import 'dotenv/config';
-import qwikRouterConfig from '@qwik-router-config';
 import render from './entry.ssr';
 import express from 'express';
 import { fileURLToPath } from 'node:url';
@@ -25,7 +24,6 @@ const PORT = process.env.PORT ?? 3000;
 // Create the Qwik City Node middleware
 const { router, notFound } = createQwikRouter({
   render,
-  qwikRouterConfig,
   // getOrigin(req) {
   //   // If deploying under a proxy, you may need to build the origin from the request headers
   //   // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-Proto

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

@@ -11,9 +11,8 @@
  *
  */
 import { createQwikRouter } from '@qwik.dev/router/middleware/node';
-import qwikRouterConfig from '@qwik-router-config';
 // make sure qwikCityPlan is imported before entry
 import render from './entry.ssr';
 
 /** The default export is the QwikCity adapter used by Vite preview. */
-export default createQwikRouter({ render, qwikRouterConfig });
+export default createQwikRouter({ render });

e2e/adapters-e2e/tests/express.spec.ts

@@ -1,5 +1,12 @@
 import { expect, test } from '@playwright/test';
 
+test.beforeEach(async ({ page }) => {
+  page.on('console', (msg) => {
+    // eslint-disable-next-line no-console
+    console.log(`[browser ${msg.type()}] ${msg.text()}`);
+  });
+});
+
 test.describe('Verifying Express Adapter', () => {
   test('should ignore unknown qdata', async ({ page, request }) => {
     page.goto('/');

packages/docs/adapters/cloudflare-pages/vite.config.ts

@@ -7,7 +7,7 @@ export default extendConfig(baseConfig, () => {
     build: {
       ssr: true,
       rollupOptions: {
-        input: ['src/entry.cloudflare-pages.tsx', '@qwik-router-config'],
+        input: ['src/entry.cloudflare-pages.tsx'],
       },
       minify: false,
     },
@@ -18,7 +18,7 @@ export default extendConfig(baseConfig, () => {
           exclude: ['/demo/*', '/shop/*'],
           origin:
             (process.env.CF_PAGES_BRANCH !== 'main' ? process.env.CF_PAGES_URL : null) ??
-            'https://qwik.builder.io',
+            'https://qwik.dev',
         },
       }),
     ],