remove cjs file from rest of modules

JerryWu1234 · JerryWu1234 · commit 6eda0a4ff2d6 · 2025-11-05T17:52:57.000+08:00
diff --git a/package.json b/package.json
@@ -196,7 +196,7 @@
     "build.wasm": "tsx --require ./scripts/runBefore.ts scripts/index.ts --wasm",
     "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": "pnpm build.cli && node packages/create-qwik/create-qwik.mjs && tsx --require ./scripts/runBefore.ts scripts/validate-cli.ts --copy-local-qwik-dist",
     "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",
diff --git a/packages/create-qwik/create-qwik.cjs b/packages/create-qwik/create-qwik.cjs
diff --git a/packages/create-qwik/create-qwik.mjs b/packages/create-qwik/create-qwik.mjs
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import * as createQwik from './dist/index.mjs';
+createQwik.runCli();
diff --git a/packages/create-qwik/package.json b/packages/create-qwik/package.json
@@ -3,7 +3,7 @@
   "description": "Interactive CLI for create Qwik projects and adding features.",
   "version": "2.0.0-beta.12",
   "author": "Qwik Team",
-  "bin": "./create-qwik.cjs",
+  "bin": "./create-qwik.mjs",
   "bugs": "https://github.com/QwikDev/qwik/issues",
   "devDependencies": {
     "@clack/prompts": "0.11.0",
@@ -20,7 +20,7 @@
   "engines-annotation": "Mostly required by sharp which needs a Node-API v9 compatible runtime",
   "files": [
     "README.md",
-    "create-qwik.cjs",
+    "create-qwik.mjs",
     "dist"
   ],
   "homepage": "https://qwik.dev/",
@@ -31,7 +31,7 @@
     "template"
   ],
   "license": "MIT",
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.mjs",
   "repository": {
     "type": "git",
     "url": "https://github.com/QwikDev/qwik.git",
diff --git a/packages/qwik-react/package.json b/packages/qwik-react/package.json
@@ -18,13 +18,11 @@
   "exports": {
     ".": {
       "types": "./lib/types/index.qwik.d.ts",
-      "import": "./lib/index.qwik.mjs",
-      "require": "./lib/index.qwik.cjs"
+      "import": "./lib/index.qwik.mjs"
     },
     "./vite": {
       "types": "./lib/types/vite.d.ts",
-      "import": "./lib/vite.mjs",
-      "require": "./lib/vite.cjs"
+      "import": "./lib/vite.mjs"
     }
   },
   "files": [
diff --git a/packages/qwik-react/vite.config.ts b/packages/qwik-react/vite.config.ts
@@ -8,8 +8,8 @@ export default defineConfig(() => {
       target: 'es2020',
       lib: {
         entry: ['./src/index.qwik.ts', './src/vite.ts'],
-        formats: ['es', 'cjs'],
-        fileName: (format, entryName) => `${entryName}.${format === 'es' ? 'mjs' : 'cjs'}`,
+        formats: ['es'],
+        fileName: (format, entryName) => `${entryName}.mjs`,
       },
       rollupOptions: {
         external: [
diff --git a/packages/qwik-router/package.json b/packages/qwik-router/package.json
@@ -48,63 +48,51 @@
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
-      "import": "./lib/index.qwik.mjs",
-      "require": "./lib/index.qwik.cjs"
+      "import": "./lib/index.qwik.mjs"
     },
     "./adapters/azure-swa/vite": {
       "types": "./lib/adapters/azure-swa/vite/index.d.ts",
-      "import": "./lib/adapters/azure-swa/vite/index.mjs",
-      "require": "./lib/adapters/azure-swa/vite/index.cjs"
+      "import": "./lib/adapters/azure-swa/vite/index.mjs"
     },
     "./adapters/cloudflare-pages/vite": {
       "types": "./lib/adapters/cloudflare-pages/vite/index.d.ts",
-      "import": "./lib/adapters/cloudflare-pages/vite/index.mjs",
-      "require": "./lib/adapters/cloudflare-pages/vite/index.cjs"
+      "import": "./lib/adapters/cloudflare-pages/vite/index.mjs"
     },
     "./adapters/cloud-run/vite": {
       "types": "./lib/adapters/cloud-run/vite/index.d.ts",
-      "import": "./lib/adapters/cloud-run/vite/index.mjs",
-      "require": "./lib/adapters/cloud-run/vite/index.cjs"
+      "import": "./lib/adapters/cloud-run/vite/index.mjs"
     },
     "./adapters/bun-server/vite": {
       "types": "./lib/adapters/bun-server/vite/index.d.ts",
-      "import": "./lib/adapters/bun-server/vite/index.mjs",
-      "require": "./lib/adapters/bun-server/vite/index.cjs"
+      "import": "./lib/adapters/bun-server/vite/index.mjs"
     },
     "./adapters/deno-server/vite": {
       "types": "./lib/adapters/deno-server/vite/index.d.ts",
-      "import": "./lib/adapters/deno-server/vite/index.mjs",
-      "require": "./lib/adapters/deno-server/vite/index.cjs"
+      "import": "./lib/adapters/deno-server/vite/index.mjs"
     },
     "./adapters/node-server/vite": {
       "types": "./lib/adapters/node-server/vite/index.d.ts",
-      "import": "./lib/adapters/node-server/vite/index.mjs",
-      "require": "./lib/adapters/node-server/vite/index.cjs"
+      "import": "./lib/adapters/node-server/vite/index.mjs"
     },
     "./adapters/netlify-edge/vite": {
       "types": "./lib/adapters/netlify-edge/vite/index.d.ts",
-      "import": "./lib/adapters/netlify-edge/vite/index.mjs",
-      "require": "./lib/adapters/netlify-edge/vite/index.cjs"
+      "import": "./lib/adapters/netlify-edge/vite/index.mjs"
     },
     "./adapters/shared/vite": {
       "types": "./lib/adapters/shared/vite/index.d.ts",
-      "import": "./lib/adapters/shared/vite/index.mjs",
-      "require": "./lib/adapters/shared/vite/index.cjs"
+      "import": "./lib/adapters/shared/vite/index.mjs"
     },
     "./adapters/static/vite": {
       "types": "./lib/adapters/ssg/vite/index.d.ts",
-      "import": "./lib/adapters/ssg/vite/index.mjs",
-      "require": "./lib/adapters/ssg/vite/index.cjs"
+      "import": "./lib/adapters/ssg/vite/index.mjs"
     },
     "./adapters/ssg/vite": {
       "types": "./lib/adapters/ssg/vite/index.d.ts",
-      "import": "./lib/adapters/ssg/vite/index.mjs",
-      "require": "./lib/adapters/ssg/vite/index.cjs"
+      "import": "./lib/adapters/ssg/vite/index.mjs"
     },
     "./adapters/vercel-edge/vite": {
       "types": "./lib/adapters/vercel-edge/vite/index.d.ts",
-      "import": "./lib/adapters/vercel-edge/vite/index.mjs",
-      "require": "./lib/adapters/vercel-edge/vite/index.cjs"
+      "import": "./lib/adapters/vercel-edge/vite/index.mjs"
     },
     "./middleware/azure-swa": {
       "types": "./lib/middleware/azure-swa/index.d.ts",
@@ -136,37 +124,31 @@
     },
     "./middleware/node": {
       "types": "./lib/middleware/node/index.d.ts",
-      "import": "./lib/middleware/node/index.mjs",
-      "require": "./lib/middleware/node/index.cjs"
+      "import": "./lib/middleware/node/index.mjs"
     },
     "./middleware/request-handler": {
       "types": "./lib/middleware/request-handler/index.d.ts",
-      "import": "./lib/middleware/request-handler/index.mjs",
-      "require": "./lib/middleware/request-handler/index.cjs"
+      "import": "./lib/middleware/request-handler/index.mjs"
     },
     "./middleware/vercel-edge": {
       "types": "./lib/middleware/vercel-edge/index.d.ts",
       "import": "./lib/middleware/vercel-edge/index.mjs"
     },
     "./static": {
       "types": "./lib/ssg/index.d.ts",
-      "import": "./lib/ssg/index.mjs",
-      "require": "./lib/ssg/index.cjs"
+      "import": "./lib/ssg/index.mjs"
     },
     "./ssg": {
       "types": "./lib/ssg/index.d.ts",
-      "import": "./lib/ssg/index.mjs",
-      "require": "./lib/ssg/index.cjs"
+      "import": "./lib/ssg/index.mjs"
     },
     "./vite": {
       "types": "./lib/vite/index.d.ts",
-      "import": "./lib/vite/index.mjs",
-      "require": "./lib/vite/index.cjs"
+      "import": "./lib/vite/index.mjs"
     },
     "./service-worker": {
       "types": "./service-worker.d.ts",
-      "import": "./lib/service-worker.mjs",
-      "require": "./lib/service-worker.cjs"
+      "import": "./lib/service-worker.mjs"
     },
     "./package.json": "./package.json"
   },
diff --git a/packages/qwik-router/vite.config.ts b/packages/qwik-router/vite.config.ts
@@ -48,15 +48,6 @@ export default defineConfig(() => {
             entryFileNames: (chunkInfo) =>
               chunkInfo.name === 'index' ? '[name].qwik.mjs' : '[name]/index.mjs',
           },
-          {
-            format: 'cjs',
-            chunkFileNames: (chunkInfo) =>
-              chunkInfo.moduleIds.some((id) => id.includes('runtime'))
-                ? 'chunks/[name].qwik.cjs'
-                : 'chunks/[name].cjs',
-            entryFileNames: (chunkInfo) =>
-              chunkInfo.name === 'index' ? '[name].qwik.cjs' : '[name]/index.cjs',
-          },
         ],
         external: [
           /node:.*/,
diff --git a/packages/qwik/package.json b/packages/qwik/package.json
@@ -48,11 +48,6 @@
         "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"
       }
     },
     "./jsx-runtime": {
@@ -62,11 +57,6 @@
         "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"
       }
     },
     "./jsx-dev-runtime": {
@@ -76,11 +66,6 @@
         "production": "./dist/core.prod.mjs",
         "min": "./dist/core.min.mjs",
         "default": "./dist/core.mjs"
-      },
-      "require": {
-        "development": "./dist/core.cjs",
-        "production": "./dist/core.prod.cjs",
-        "default": "./dist/core.cjs"
       }
     },
     "./build": {
diff --git a/packages/supabase-auth-helpers-qwik/package.json b/packages/supabase-auth-helpers-qwik/package.json
@@ -13,8 +13,7 @@
   "exports": {
     ".": {
       "types": "./lib/types/index.d.ts",
-      "import": "./lib/index.qwik.mjs",
-      "require": "./lib/index.qwik.cjs"
+      "import": "./lib/index.qwik.mjs"
     }
   },
   "files": [
diff --git a/packages/supabase-auth-helpers-qwik/vite.config.ts b/packages/supabase-auth-helpers-qwik/vite.config.ts
@@ -10,8 +10,8 @@ export default defineConfig((config) => {
       outDir: 'lib',
       lib: {
         entry: ['./src/index.ts'],
-        formats: ['es', 'cjs'],
-        fileName: (format) => `index.qwik.${format === 'es' ? 'mjs' : 'cjs'}`,
+        formats: ['es'],
+        fileName: () => `index.qwik.mjs`,
       },
       rollupOptions: {
         external: [
diff --git a/scripts/binding-wasm.ts b/scripts/binding-wasm.ts
@@ -49,12 +49,6 @@ export async function buildWasmBinding(config: BuildConfig) {
     exports: 'named',
   });
 
-  await build.write({
-    format: 'cjs',
-    file: join(config.distBindingsDir, 'qwik.wasm.cjs'),
-    exports: 'named',
-  });
-
   await copyFile(
     join(tmpBuildDir, 'qwik_wasm_bg.wasm'),
     join(config.distBindingsDir, 'qwik_wasm_bg.wasm')
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -159,18 +159,10 @@ export async function build(config: BuildConfig) {
       await watchDirectories({
         [join(config.srcQwikDir, 'core')]: async () => {
           await submoduleCore({ ...config, dev: true });
-          await copyFile(
-            join(config.srcQwikDir, '..', 'dist', 'core.cjs'),
-            join(config.srcQwikDir, '..', 'dist', 'core.prod.cjs')
-          );
           await copyFile(
             join(config.srcQwikDir, '..', 'dist', 'core.mjs'),
             join(config.srcQwikDir, '..', 'dist', 'core.prod.mjs')
           );
-          console.log(
-            join(config.srcQwikDir, '..', 'dist', 'core.cjs'),
-            join(config.srcQwikDir, '..', 'dist', 'core.prod.cjs')
-          );
         },
         [join(config.srcQwikDir, 'cli')]: () => submoduleCli(config),
         [join(config.srcQwikDir, 'optimizer')]: () => submoduleOptimizer(config),
diff --git a/scripts/create-qwik-cli.ts b/scripts/create-qwik-cli.ts
@@ -34,10 +34,10 @@ async function bundleCreateQwikCli(config: BuildConfig, srcCliDir: string, distC
 
   await build({
     entryPoints: [join(srcCliDir, 'index.ts')],
-    outfile: join(distCliDir, 'index.cjs'),
+    outfile: join(distCliDir, 'index.mjs'),
     target: nodeTarget,
     platform: 'node',
-    format: 'cjs',
+    format: 'esm',
     bundle: true,
     sourcemap: false,
     minify: !config.dev,
diff --git a/scripts/index.ts b/scripts/index.ts
@@ -11,7 +11,6 @@ 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!
diff --git a/scripts/submodule-backpatch.ts b/scripts/submodule-backpatch.ts
@@ -42,21 +42,6 @@ export async function submoduleBackpatch(config: BuildConfig) {
   await generateBackpatchSubmodule(config);
 }
 
-export async function inlineBackpatchScriptsEsBuild(config: BuildConfig) {
-  const define: { [varName: string]: string } = {};
-
-  define['globalThis.QWIK_BACKPATCH_EXECUTOR_MINIFIED'] = await getLoaderJsonString(
-    config,
-    'backpatch-executor.js'
-  );
-  define['globalThis.QWIK_BACKPATCH_EXECUTOR_DEBUG'] = await getLoaderJsonString(
-    config,
-    'backpatch-executor.debug.js'
-  );
-
-  return define;
-}
-
 export async function generateBackpatchSubmodule(config: BuildConfig) {
   const backpatchDistDir = join(config.distQwikPkgDir, 'backpatch');
 
diff --git a/scripts/submodule-optimizer.ts b/scripts/submodule-optimizer.ts
@@ -30,7 +30,7 @@ export async function submoduleOptimizer(config: BuildConfig) {
       lib: {
         entry: entryPoint,
         name: 'optimizer',
-        fileName: (format) => `optimizer.${format === 'es' ? 'mjs' : 'cjs'}`,
+        fileName: () => `optimizer.mjs`,
       },
     },
     define: {
@@ -78,33 +78,8 @@ export async function submoduleOptimizer(config: BuildConfig) {
     },
   };
 
-  // CJS Build
-  const cjsConfig: UserConfig = {
-    ...commonConfig,
-    build: {
-      ...commonConfig.build,
-      outDir: config.distQwikPkgDir,
-      lib: {
-        ...commonConfig.build!.lib,
-        formats: ['cjs'],
-      },
-      rollupOptions: {
-        ...commonConfig.build?.rollupOptions,
-        output: {
-          banner: `globalThis.qwikOptimizer = (function (module) {\n${getBanner('@qwik.dev/core/optimizer', config.distVersion)}`,
-          footer: `return module.exports; })(typeof module === 'object' && module.exports ? module : { exports: {} });`,
-        },
-      },
-    },
-    define: {
-      ...commonConfig.define,
-      'globalThis.IS_CJS': 'true',
-      'globalThis.IS_ESM': 'false',
-    },
-  };
-
   // Build both formats
-  await Promise.all([viteBuild(esmConfig), viteBuild(cjsConfig)]);
+  await Promise.all([viteBuild(esmConfig)]);
 
   // Note: Minification is now handled automatically by Vite in production builds
   // The output files will be minified when config.dev is false
diff --git a/scripts/submodule-server.ts b/scripts/submodule-server.ts
diff --git a/scripts/validate-build.ts b/scripts/validate-build.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/usr/bin/env node`
	`2`	`+import * as createQwik from './dist/index.mjs';`
	`3`	`+createQwik.runCli();`