Merge pull request #7569 from QwikDev/v2-fixes

fix(core): find core qrl chunk correctly

Author: wmertens

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

@@ -427,7 +427,7 @@ export function generateManifestFromBundles(
     return canonPath(bundle.fileName);
   };
 
-  let qwikBundleName: string | undefined;
+  let qwikHandlersName: string | undefined;
   // We need to find our QRL exports
   const qrlNames = new Set(segments.map((h) => h.name));
   for (const outputBundle of Object.values(outputBundles)) {
@@ -475,12 +475,10 @@ 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))
-      ) {
-        qwikBundleName = bundleFileName;
+      } else if (modulePaths.some((m) => /[/\\](core|qwik)[/\\]handlers\.[cm]js$/.test(m))) {
+        qwikHandlersName = bundleFileName;
       }
     }
 
@@ -507,7 +505,7 @@ export function generateManifestFromBundles(
       loc: segment.loc,
     };
   }
-  if (qwikBundleName) {
+  if (qwikHandlersName) {
     for (const symbol of extraSymbols) {
       manifest.symbols[symbol] = {
         origin: 'Qwik core',
@@ -520,7 +518,7 @@ export function generateManifestFromBundles(
         parent: null,
         loc: [0, 0],
       };
-      manifest.mapping[symbol] = qwikBundleName;
+      manifest.mapping[symbol] = qwikHandlersName;
     }
   } else {
     console.error('Qwik bundle not found, is Qwik actually used in this project?');

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

@@ -949,14 +949,21 @@ export const manifest = ${JSON.stringify(serverManifest)};\n`;
   }
 
   function manualChunks(id: string, { getModuleInfo }: Rollup.ManualChunkMeta) {
-    // The preloader has to stay in a separate chunk if it's a client build
-    // 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')
-    ) {
-      return 'qwik-preloader';
+    if (opts.target === 'client') {
+      if (
+        // The preloader has to stay in a separate chunk if it's a client build
+        // the vite preload helper must be included or to prevent breaking circular dependencies
+        /[/\\](core|qwik)[/\\]dist[/\\]preloader\.[cm]js$/.test(id) ||
+        id === '\0vite/preload-helper.js'
+      ) {
+        return 'qwik-preloader';
+      } else if (
+        // likewise, core and handlers have to be in the same chunk so there's no import waterfall
+        id.endsWith('@qwik.dev/core/build') ||
+        /[/\\](core|qwik)[/\\](handlers|dist[/\\]core(\.prod|\.min)?)\.[cm]js$/.test(id)
+      ) {
+        return 'qwik-core';
+      }
     }
 
     const module = getModuleInfo(id)!;