fix(v2): fixup after main merge (#7568)

fixup

Author: wmertens

packages/docs/src/routes/docs/(qwik)/advanced/custom-build-dir/index.mdx

@@ -24,7 +24,7 @@ Usually with Vite.js we do it like this:
 ```ts title="vite.config.mts"
 import { defineConfig } from 'vite';
 import { qwikVite } from '@qwik.dev/core/optimizer';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 import { resolve } from 'node:path';
 /* VITE_IMPORTS */
 
@@ -59,7 +59,7 @@ So instead of changing the settings in Vite.js directly, we just need to change
 ```ts title="vite.config.mts"
 import { defineConfig } from 'vite';
 import { qwikVite } from '@qwik.dev/core/optimizer';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig(() => {

packages/docs/src/routes/docs/(qwik)/advanced/vite/index.mdx

@@ -31,7 +31,7 @@ Qwik comes with two plugins that make it easy to use Vite with Qwik and Qwik Rou
 
 ```ts title="vite.config.mts"
 import { defineConfig } from 'vite';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 import { qwikVite } from '@qwik.dev/core/optimizer';
 import tsconfigPaths from 'vite-tsconfig-paths';
 

packages/docs/src/routes/docs/(qwikrouter)/guides/mdx/index.mdx

@@ -101,7 +101,7 @@ These plugins can be disabled independently in the following way:
 
 ```tsx title="vite.config.js"
 import { defineConfig } from 'vite';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 // See below
 import rehypeAutolinkHeadings from 'rehype-autolink-headings';
 export default defineConfig(() => {

packages/docs/src/routes/docs/(qwikrouter)/routing/index.mdx

@@ -398,7 +398,7 @@ You can set the rewrite rules as follows in your `vite.config.mts`:
 
 ```tsx
 import { defineConfig } from 'vite';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 
 export default defineConfig(async () => {
   return {

packages/qwik/src/optimizer/src/manifest.ts

@@ -475,9 +475,11 @@ export function generateManifestFromBundles(
       .map((m) => path.relative(opts.rootDir, m));
     if (modulePaths.length > 0) {
       bundle.origins = modulePaths;
-      if (modulePaths.some((m) => /\/(core|qwik)\/dist\/preloader\.[cm]js$/.test(m))) {
+      if (modulePaths.some((m) => /[/\\](core|qwik)[/\\]dist[/\\]preloader\.[cm]js/.test(m))) {
         manifest.preloader = bundleFileName;
-      } else if (modulePaths.some((m) => /\/(core|qwik)\/dist\/core(\.prod)?\.[cm]js$/.test(m))) {
+      } else if (
+        modulePaths.some((m) => /[/\\](core|qwik)[/\\]dist[/\\]core(\.prod)?\.[cm]js/.test(m))
+      ) {
         qwikBundleName = bundleFileName;
       }
     }

packages/qwik/src/optimizer/src/plugins/bundle-graph.ts

@@ -45,6 +45,10 @@ export function convertManifestToBundleGraph(
   // All known chunks and symbols
   const graph = { ...manifest.bundles };
   for (const [symbol, bundleName] of Object.entries(manifest.mapping)) {
+    if (symbol.startsWith('_') && symbol.length < 10) {
+      // internal QRLs are not included in the bundle graph
+      continue;
+    }
     const hash = getSymbolHash(symbol);
     if (hash) {
       /**

packages/qwik/src/optimizer/src/plugins/plugin.ts

@@ -953,7 +953,8 @@ export const manifest = ${JSON.stringify(serverManifest)};\n`;
     // the vite preload helper must be included or to prevent breaking circular dependencies
     if (
       opts.target === 'client' &&
-      (/\/(core|qwik)\/dist\/preloader\.[cm]js/.test(id) || id === '\0vite/preload-helper.js')
+      (/[/\\](core|qwik)[/\\]dist[/\\]preloader\.[cm]js/.test(id) ||
+        id === '\0vite/preload-helper.js')
     ) {
       return 'qwik-preloader';
     }

packages/qwik/src/testing/README.md

@@ -4,7 +4,7 @@
 //vite.config.mts
 import { defineConfig } from 'vite';
 import { qwikVite } from '@qwik.dev/core/optimizer';
-import { qwikRouter } from '@qwik.dev/router';
+import { qwikRouter } from '@qwik.dev/router/vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
 export default defineConfig(() => {

starters/apps/base/vite.config.mts

@@ -3,7 +3,7 @@
  * When building, the adapter config is used which loads this file and extends it.
  */
 import { qwikVite } from "@qwik.dev/core/optimizer";
-import { qwikRouter } from "@qwik.dev/router";
+import { qwikRouter } from "@qwik.dev/router/vite";
 import { defineConfig, type UserConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
 import pkg from "./package.json";