refactor: remove cjs build from vite core

packages/vite/package.json

@@ -19,11 +19,7 @@
   "main": "./dist/node/index.js",
   "types": "./dist/node/index.d.ts",
   "exports": {
-    ".": {
-      "module-sync": "./dist/node/index.js",
-      "import": "./dist/node/index.js",
-      "require": "./index.cjs"
-    },
+    ".": "./dist/node/index.js",
     "./client": {
       "types": "./client.d.ts"
     },

packages/vite/rollup.config.ts

@@ -169,32 +169,11 @@ const moduleRunnerConfig = defineConfig({
   },
 })
 
-const cjsConfig = defineConfig({
-  ...sharedNodeOptions,
-  input: {
-    publicUtils: path.resolve(__dirname, 'src/node/publicUtils.ts'),
-  },
-  output: {
-    ...sharedNodeOptions.output,
-    entryFileNames: `node-cjs/[name].cjs`,
-    chunkFileNames: 'node-cjs/chunks/dep-[hash].js',
-    format: 'cjs',
-    target: 'node20',
-  },
-  external: ['fsevents', 'supports-color', ...Object.keys(pkg.dependencies)],
-  plugins: [
-    bundleSizeLimit(120),
-    exportCheck(),
-    externalizeDepsInWatchPlugin(),
-  ],
-})
-
 export default defineConfig([
   envConfig,
   clientConfig,
   nodeConfig,
   moduleRunnerConfig,
-  cjsConfig,
 ])
 
 // #region Plugins
@@ -430,33 +409,4 @@ function bundleSizeLimit(limit: number): Plugin {
   }
 }
 
-function exportCheck(): Plugin {
-  return {
-    name: 'export-check',
-    async writeBundle() {
-      if (this.meta.watchMode) return
-
-      // escape import so that it's not bundled while config load
-      const dynImport = (id: string) => import(id)
-      // ignore warning from CJS entrypoint to avoid misleading logs
-      process.env.VITE_CJS_IGNORE_WARNING = 'true'
-
-      const esmNamespace = await dynImport('./dist/node/index.js')
-      const cjsModuleExports = (await dynImport('./index.cjs')).default
-      const cjsModuleExportsKeys = new Set(
-        Object.getOwnPropertyNames(cjsModuleExports),
-      )
-      const lackingExports = Object.keys(esmNamespace).filter(
-        (key) => !cjsModuleExportsKeys.has(key),
-      )
-      if (lackingExports.length > 0) {
-        this.error(
-          `Exports missing from cjs build: ${lackingExports.join(', ')}.` +
-            ` Please update index.cjs or src/publicUtils.ts.`,
-        )
-      }
-    },
-  }
-}
-
 // #endregion

packages/vite/src/node/__tests__/config.spec.ts

@@ -6,7 +6,8 @@ import type { InlineConfig, PluginOption } from '..'
 import type { UserConfig, UserConfigExport } from '../config'
 import { defineConfig, loadConfigFromFile, resolveConfig } from '../config'
 import { resolveEnvPrefix } from '../env'
-import { createLogger, mergeConfig } from '../publicUtils'
+import { mergeConfig } from '../utils'
+import { createLogger } from '../logger'
 
 describe('mergeConfig', () => {
   test('handles configs with different alias schemas', () => {

packages/vite/src/node/__tests_dts__/config.ts

@@ -9,7 +9,7 @@ import {
   type UserConfigFnPromise,
   defineConfig,
 } from '../config'
-import { mergeConfig } from '../publicUtils'
+import { mergeConfig } from '../utils'
 
 const configObjectDefined = defineConfig({})
 const configObjectPromiseDefined = defineConfig(Promise.resolve({}))

packages/vite/src/node/build.ts

@@ -51,6 +51,7 @@ import {
   emptyDir,
   getPkgName,
   joinUrlSegments,
+  mergeConfig,
   mergeWithDefaults,
   normalizePath,
   partialEncodeURIPath,
@@ -70,7 +71,6 @@ import {
   resolveEmptyOutDir,
 } from './watch'
 import { completeSystemWrapPlugin } from './plugins/completeSystemWrap'
-import { mergeConfig } from './publicUtils'
 import { webWorkerPostPlugin } from './plugins/worker'
 import { getHookHandler } from './plugins'
 import {

packages/vite/src/node/publicUtils.ts

@@ -1,8 +1,4 @@
-/**
- * Exported sync utils should go here.
- * This file will be bundled to ESM and CJS and redirected by ../index.cjs
- * Please control the side-effects by checking the ./dist/node-cjs/publicUtils.cjs bundle
- */
+// TODO: move contents of this file to src/node/index.ts
 export {
   VERSION as version,
   DEFAULT_CLIENT_CONDITIONS as defaultClientConditions,