fix(vite): mark core+router as unique; better optimizeDeps discovery

Author: wmertens

packages/qwik-router/src/buildtime/types.ts

@@ -112,13 +112,13 @@ export interface RewriteRouteOption {
 
 /** @public */
 export interface PluginOptions {
-  /** Directory of the `routes`. Defaults to `src/routes`. */
+  /** Directory of the `routes`. Defaults to `"src/routes"`. */
   routesDir?: string;
-  /** Directory of the `server plugins`. Defaults to `src/server-plugins`. */
+  /** Directory of the `server plugins`. Defaults to `routesDir`. */
   serverPluginsDir?: string;
   /**
    * The base pathname is used to create absolute URL paths up to the `hostname`, and must always
-   * start and end with a `/`. Defaults to `/`.
+   * start and end with a `/`. Defaults to `"/""`.
    */
   basePathname?: string;
   /**

packages/qwik-router/src/buildtime/vite/plugin.ts

@@ -52,6 +52,8 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
   let devServer: ViteDevServer | null = null;
 
   let devSsrServer = userOpts?.devSsrServer;
+  const routesDir = userOpts?.routesDir ?? 'src/routes';
+  const serverPluginsDir = userOpts?.serverPluginsDir ?? routesDir;
 
   const api: QwikRouterPluginApi = {
     getBasePathname: () => ctx?.opts.basePathname ?? '/',
@@ -81,6 +83,7 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
         },
         appType: 'custom',
         resolve: {
+          dedupe: [QWIK_ROUTER, '@builder.io/qwik-city'],
           alias: [
             { find: '@builder.io/qwik-city', replacement: '@qwik.dev/router' },
             { find: /^@builder\.io\/qwik-city\/(.*)/, replacement: '@qwik.dev/router/$1' },
@@ -90,6 +93,12 @@ function qwikRouterPlugin(userOpts?: QwikRouterVitePluginOptions): any {
           ],
         },
         optimizeDeps: {
+          // Let Vite find all app deps, these are not part of the static imports from `src/root`
+          entries: [
+            `${routesDir}/**/index*`,
+            `${routesDir}/**/layout*`,
+            `${serverPluginsDir}/plugin@*`,
+          ],
           exclude: [
             QWIK_ROUTER,
             QWIK_ROUTER_CONFIG_ID,

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

@@ -28,7 +28,15 @@ import {
 import { createRollupError, normalizeRollupOutputOptions } from './rollup';
 import { configurePreviewServer, getViteIndexTags } from './dev';
 
-const DEDUPE = [QWIK_CORE_ID, QWIK_JSX_RUNTIME_ID, QWIK_JSX_DEV_RUNTIME_ID];
+const DEDUPE = [
+  QWIK_CORE_ID,
+  QWIK_JSX_RUNTIME_ID,
+  QWIK_JSX_DEV_RUNTIME_ID,
+  QWIK_CORE_INTERNAL_ID,
+  '@builder.io/qwik',
+  '@builder.io/qwik/jsx-runtime',
+  '@builder.io/qwik/jsx-dev-runtime',
+];
 
 const STYLING = ['.css', '.scss', '.sass', '.less', '.styl', '.stylus'];
 const FONTS = ['.woff', '.woff2', '.ttf'];