fix: qwikloader.cjs missing in non esm environments

Author: maiieul

packages/qwik/package.json

@@ -111,7 +111,8 @@
       "require": "./dist/optimizer.cjs"
     },
     "./preloader": {
-      "import": "./dist/preloader.mjs"
+      "import": "./dist/preloader.mjs",
+      "require": "./dist/preloader.cjs"
     },
     "./server.cjs": "./dist/server.cjs",
     "./server.mjs": "./dist/server.mjs",

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

@@ -1,5 +1,5 @@
 import type { OutputBundle } from 'rollup';
-import { QWIK_PRELOADER_REAL_ID, type NormalizedQwikPluginOptions } from './plugins/plugin';
+import { type NormalizedQwikPluginOptions } from './plugins/plugin';
 import type { GlobalInjections, Path, QwikBundle, QwikManifest, SegmentAnalysis } from './types';
 
 // This is just the initial prioritization of the symbols and entries
@@ -482,7 +482,7 @@ export function generateManifestFromBundles(
       .map((m) => path.relative(opts.rootDir, m));
     if (modulePaths.length > 0) {
       bundle.origins = modulePaths;
-      if (modulePaths.some((m) => m.endsWith(QWIK_PRELOADER_REAL_ID))) {
+      if (modulePaths.some((m) => /[/\\]qwik[/\\]dist[/\\]preloader\.[cm]js$/.test(m))) {
         manifest.preloader = bundleFileName;
       } else if (modulePaths.some((m) => /[/\\]qwik[/\\]dist[/\\]core\.[^/]*js$/.test(m))) {
         manifest.core = bundleFileName;

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

@@ -936,10 +936,14 @@ 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') {
-      if (id.endsWith(QWIK_PRELOADER_REAL_ID) || id === '\0vite/preload-helper.js') {
+      if (
+        // The preloader has to stay in a separate chunk if it's a client build
+        // the vite preload helper must be included to prevent breaking circular dependencies
+        id.endsWith('@builder.io/qwik/build') ||
+        /[/\\]qwik[/\\]dist[/\\]preloader\.[cm]js$/.test(id) ||
+        id === '\0vite/preload-helper.js'
+      ) {
         return 'qwik-preloader';
       } else if (/qwik[\\/]dist[\\/]qwikloader\.js$/.test(id)) {
         return 'qwik-loader';
@@ -1090,7 +1094,6 @@ export const QWIK_CORE_SERVER = '@builder.io/qwik/server';
 export const QWIK_CLIENT_MANIFEST_ID = '@qwik-client-manifest';
 
 export const QWIK_PRELOADER_ID = '@builder.io/qwik/preloader';
-export const QWIK_PRELOADER_REAL_ID = 'qwik/dist/preloader.mjs';
 
 export const SRC_DIR_DEFAULT = 'src';
 

scripts/submodule-preloader.ts

@@ -55,8 +55,8 @@ export async function submodulePreloader(config: BuildConfig) {
       copyPublicDir: false,
       lib: {
         entry: join(config.srcQwikDir, 'core/preloader'),
-        formats: ['es'],
-        fileName: () => 'preloader.mjs',
+        formats: ['es', 'cjs'],
+        fileName: (format) => (format === 'es' ? 'preloader.mjs' : 'preloader.cjs'),
       },
       rollupOptions: {
         external: ['@builder.io/qwik/build'],