refactor: Doesn't generate CJS while building when config.qwik is true. Remove CJS generation configuration one module at a time, which makes it easier to find bugs.

Author: JerryWu1234

package.json

@@ -199,7 +199,7 @@
     "build.watch": "tsx --require ./scripts/runBefore.ts scripts/index.ts --qwik --qwikrouter --watch --dev --platform-binding",
     "change": "changeset",
     "cli": "pnpm build.cli && node packages/create-qwik/create-qwik.cjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
-    "cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.cjs",
+    "cli.qwik": "pnpm build.cli && node packages/qwik/qwik-cli.mjs",
     "cli.validate": "tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts",
     "deps": "corepack pnpm upgrade -i -r --latest && syncpack fix-mismatches && corepack pnpm dedupe",
     "docs.dev": "pnpm -C packages/docs build.repl-sw && pnpm -C packages/docs dev",

packages/qwik/package.json

@@ -4,7 +4,7 @@
   "version": "2.0.0-beta.12",
   "author": "Qwik Team",
   "bin": {
-    "qwik": "./qwik-cli.cjs"
+    "qwik": "./qwik-cli.mjs"
   },
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "dependencies": {
@@ -35,15 +35,10 @@
         "production": "./dist/core.prod.mjs",
         "min": "./dist/core.min.mjs",
         "default": "./dist/core.prod.mjs"
-      },
-      "require": {
-        "development": "./dist/core.cjs",
-        "production": "./dist/core.prod.cjs",
-        "default": "./dist/core.prod.cjs"
       }
     },
     "./cli": {
-      "require": "./dist/cli.cjs"
+      "require": "./dist/cli.mjs"
     },
     "./handlers.mjs": "./handlers.mjs",
     "./internal": {
@@ -94,17 +89,11 @@
         "development": "./dist/build/index.dev.mjs",
         "production": "./dist/build/index.prod.mjs",
         "default": "./dist/build/index.mjs"
-      },
-      "require": {
-        "development": "./dist/build/index.dev.cjs",
-        "production": "./dist/build/index.prod.cjs",
-        "default": "./dist/build/index.cjs"
       }
     },
     "./loader": {
       "types": "./dist/loader/index.d.ts",
-      "import": "./dist/loader/index.mjs",
-      "require": "./dist/loader/index.cjs"
+      "import": "./dist/loader/index.mjs"
     },
     "./insights": {
       "types": "./dist/insights.d.ts",
@@ -113,31 +102,24 @@
     },
     "./insights/vite": {
       "types": "./dist/insights/vite.d.ts",
-      "import": "./dist/insights/vite/index.mjs",
-      "require": "./dist/insights/vite/index.cjs"
+      "import": "./dist/insights/vite/index.mjs"
     },
-    "./optimizer.cjs": "./dist/optimizer.cjs",
     "./optimizer.mjs": "./dist/optimizer.mjs",
     "./optimizer": {
       "types": "./dist/optimizer.d.ts",
-      "import": "./dist/optimizer.mjs",
-      "require": "./dist/optimizer.cjs"
+      "import": "./dist/optimizer.mjs"
     },
     "./preloader": {
-      "import": "./dist/preloader.mjs",
-      "require": "./dist/preloader.cjs"
+      "import": "./dist/preloader.mjs"
     },
-    "./server.cjs": "./dist/server.cjs",
     "./server.mjs": "./dist/server.mjs",
     "./server": {
       "types": "./server.d.ts",
-      "import": "./dist/server.mjs",
-      "require": "./dist/server.cjs"
+      "import": "./dist/server.mjs"
     },
     "./testing": {
       "types": "./dist/testing/index.d.ts",
-      "import": "./dist/testing/index.mjs",
-      "require": "./dist/testing/index.cjs"
+      "import": "./dist/testing/index.mjs"
     },
     "./qwikloader.js": "./dist/qwikloader.js",
     "./qwikloader.debug.js": "./dist/qwikloader.debug.js",
@@ -161,7 +143,7 @@
     "public.d.ts",
     "server.d.ts",
     "testing.d.ts",
-    "qwik-cli.cjs"
+    "qwik-cli.mjs"
   ],
   "homepage": "https://qwik.dev/",
   "keywords": [

packages/qwik/qwik-cli.cjs renamed to packages/qwik/qwik-cli.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 // This requires the build to be run first.
-const qwik = require('./dist/cli.cjs');
+const qwik = require('./dist/cli.mjs');
 qwik.runCli();

packages/qwik/src/cli/qwik.cjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-const qwik = require('./cli.cjs');
+const qwik = require('./cli.mjs');
 qwik.runCli();

scripts/index.ts

@@ -11,6 +11,7 @@ const args = process.argv.slice(2);
 // load our build config, which figures out all the paths
 // the rest of the build process uses.
 const config = loadConfig(args);
+console.log(config);
 config.esmNode = true;
 
 // let's do this!

scripts/submodule-backpatch.ts

@@ -71,19 +71,13 @@ export async function generateBackpatchSubmodule(config: BuildConfig) {
     ...code,
     `export { QWIK_BACKPATCH_EXECUTOR_MINIFIED, QWIK_BACKPATCH_EXECUTOR_DEBUG };`,
   ];
-  const cjsCode = [
-    ...code,
-    `exports.QWIK_BACKPATCH_EXECUTOR_MINIFIED = QWIK_BACKPATCH_EXECUTOR_MINIFIED;`,
-    `exports.QWIK_BACKPATCH_EXECUTOR_DEBUG = QWIK_BACKPATCH_EXECUTOR_DEBUG;`,
-  ];
   const dtsCode = [
     `export declare const QWIK_BACKPATCH_EXECUTOR_MINIFIED: string;`,
     `export declare const QWIK_BACKPATCH_EXECUTOR_DEBUG: string;`,
   ];
 
   ensureDir(backpatchDistDir);
   await writeFile(join(backpatchDistDir, 'index.mjs'), esmCode.join('\n') + '\n');
-  await writeFile(join(backpatchDistDir, 'index.cjs'), cjsCode.join('\n') + '\n');
   await writeFile(join(backpatchDistDir, 'index.d.ts'), dtsCode.join('\n') + '\n');
 
   const backpatchPkg: PackageJSON = {

scripts/submodule-build.ts

@@ -50,18 +50,5 @@ export async function bundleIndex(config: BuildConfig, entryName: string) {
     outExtension: { '.js': '.mjs' },
   });
 
-  const cjs = build({
-    ...opts,
-    format: 'cjs',
-
-    banner: {
-      js: `globalThis.qwikBuild = (function (module) {`,
-    },
-    footer: {
-      js: `return module.exports; })(typeof module === 'object' && module.exports ? module : { exports: {} });`,
-    },
-    outExtension: { '.js': '.cjs' },
-  });
-
-  await Promise.all([esm, cjs]);
+  await Promise.all([esm]);
 }

scripts/submodule-cli.ts

@@ -10,14 +10,14 @@ export async function submoduleCli(config: BuildConfig) {
 
   await build({
     entryPoints: [join(config.srcQwikDir, submodule, 'index.ts')],
-    outfile: join(config.distQwikPkgDir, 'cli.cjs'),
-    format: 'cjs',
+    outfile: join(config.distQwikPkgDir, 'cli.mjs'),
+    format: 'esm',
     platform: 'node',
     target: nodeTarget,
     sourcemap: false,
     bundle: true,
     banner: { js: getBanner('@qwik.dev/core/cli', config.distVersion) },
-    outExtension: { '.js': '.cjs' },
+    outExtension: { '.js': '.mjs' },
     plugins: [
       {
         name: 'colorAlias',

scripts/submodule-core.ts

@@ -56,23 +56,9 @@ async function submoduleCoreProd(config: BuildConfig) {
     banner: getBanner('@qwik.dev/core', config.distVersion),
   };
 
-  const cjsOutput: OutputOptions = {
-    dir: join(config.distQwikPkgDir),
-    format: 'umd',
-    name: 'qwikCore',
-    entryFileNames: 'core.cjs',
-    sourcemap: true,
-    globals: {
-      '@qwik.dev/core/build': 'qwikBuild',
-      // not actually used
-      '@qwik.dev/core/preloader': 'qwikPreloader',
-    },
-    banner: getBanner('@qwik.dev/core', config.distVersion),
-  };
-
   const build = await rollup(input);
 
-  await Promise.all([build.write(esmOutput), build.write(cjsOutput)]);
+  await Promise.all([build.write(esmOutput)]);
 
   console.log('🦊 core.mjs:', await fileSize(join(config.distQwikPkgDir, 'core.mjs')));
 
@@ -174,13 +160,7 @@ async function submoduleCoreProd(config: BuildConfig) {
   console.log('🐭 core.min.mjs:', await fileSize(join(config.distQwikPkgDir, 'core.min.mjs')));
 
   let esmCode = await readFile(join(config.distQwikPkgDir, 'core.mjs'), 'utf-8');
-  let cjsCode = await readFile(join(config.distQwikPkgDir, 'core.cjs'), 'utf-8');
-  // fixup the Vite base url
-  cjsCode = cjsCode.replaceAll('undefined.BASE_URL', 'globalThis.BASE_URL||"/"');
-  await writeFile(join(config.distQwikPkgDir, 'core.cjs'), cjsCode);
-
   await submoduleCoreProduction(config, esmCode, join(config.distQwikPkgDir, 'core.prod.mjs'));
-  await submoduleCoreProduction(config, cjsCode, join(config.distQwikPkgDir, 'core.prod.cjs'));
 }
 
 async function submoduleCoreProduction(config: BuildConfig, code: string, outPath: string) {
@@ -238,41 +218,11 @@ async function submoduleCoreDev(config: BuildConfig) {
     outExtension: { '.js': '.mjs' },
   });
 
-  // We do a CJS build, only for the repl service worker
-  const cjs = build({
-    ...opts,
-    // we don't externalize qwik build because then the repl service worker sees require()
-    define: {
-      ...opts.define,
-      // We need to get rid of the import.meta.env values
-      // Vite's base url
-      'import.meta.env.BASE_URL': 'globalThis.BASE_URL',
-      // Vite's devserver mode
-      'import.meta.env.DEV': 'false',
-    },
-    format: 'cjs',
-    outExtension: { '.js': '.cjs' },
-    banner: {
-      js: `globalThis.qwikCore = (function (module) {`,
-    },
-    footer: {
-      js: `return module.exports; })(typeof module === 'object' && module.exports ? module : { exports: {} });`,
-    },
-  });
-
-  await Promise.all([esm, cjs]);
+  await Promise.all([esm]);
 
   // Point the minified and prod versions to the dev versions
   await writeFile(join(config.distQwikPkgDir, 'core.prod.mjs'), `export * from './core.mjs';\n`);
-  await writeFile(
-    join(config.distQwikPkgDir, 'core.prod.cjs'),
-    `module.exports = require('./core.cjs');\n`
-  );
   await writeFile(join(config.distQwikPkgDir, 'core.min.mjs'), `export * from './core.mjs';\n`);
-  await writeFile(
-    join(config.distQwikPkgDir, 'core.min.cjs'),
-    `module.exports = require('./core.cjs');\n`
-  );
 
   console.log('🐬', submodule, '(dev)');
 }

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', 'cjs'],
-        fileName: (format) => (format === 'es' ? 'preloader.mjs' : 'preloader.cjs'),
+        formats: ['es'],
+        fileName: () => 'preloader.mjs',
       },
       rollupOptions: {
         external: ['@qwik.dev/core/build'],