From 51e3d13e45d45dc0eaf6e6125de00a56c63345d8 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Fri, 1 Nov 2024 15:21:08 +0800
Subject: [PATCH] refactor: set defaults

---
 packages/vite/src/node/__tests__/plugins/esbuild.spec.ts | 7 -------
 packages/vite/src/node/config.ts                         | 3 +++
 packages/vite/src/node/optimizer/index.ts                | 1 +
 packages/vite/src/node/plugins/css.ts                    | 2 +-
 packages/vite/src/node/plugins/define.ts                 | 2 +-
 packages/vite/src/node/plugins/esbuild.ts                | 2 --
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts b/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
index 936415f9c33826..19fb3c4e1787ba 100644
--- a/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
+++ b/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
@@ -20,7 +20,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: 'es2020',
       format: 'esm',
@@ -64,7 +63,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: undefined,
       format: 'esm',
@@ -95,7 +93,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: 'es2020',
       format: 'esm',
@@ -128,7 +125,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: undefined,
       format: 'esm',
@@ -161,7 +157,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'cjs',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: undefined,
       format: 'cjs',
@@ -193,7 +188,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: undefined,
       format: 'esm',
@@ -229,7 +223,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'cjs',
     )
     expect(options).toEqual({
-      charset: 'utf8',
       loader: 'js',
       target: undefined,
       format: 'cjs',
diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index d9f8c4083c65c1..39c0570e0a16f7 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -1243,6 +1243,9 @@ export async function resolveConfig(
         ? false
         : {
             jsxDev: !isProduction,
+            // change defaults that fit better for vite
+            charset: 'utf8',
+            legalComments: 'none',
             ...config.esbuild,
           },
     server,
diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index 921326bdda0adb..3406a32e6fb422 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -798,6 +798,7 @@ async function prepareEsbuildOptimizerRun(
     metafile: true,
     plugins,
     charset: 'utf8',
+    legalComments: 'none',
     ...esbuildOptions,
     supported: {
       ...defaultEsbuildSupported,
diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
index 9677d3c2439d24..4c6352020bb40f 100644
--- a/packages/vite/src/node/plugins/css.ts
+++ b/packages/vite/src/node/plugins/css.ts
@@ -1926,7 +1926,7 @@ function resolveMinifyCssEsbuildOptions(
   options: ESBuildOptions,
 ): TransformOptions {
   const base: TransformOptions = {
-    charset: options.charset ?? 'utf8',
+    charset: options.charset,
     logLevel: options.logLevel,
     logLimit: options.logLimit,
     logOverride: options.logOverride,
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index 36c9b57dbfeb6c..0a133ca7457529 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -191,7 +191,7 @@ export async function replaceDefine(
 
   const result = await transform(code, {
     loader: 'js',
-    charset: esbuildOptions.charset ?? 'utf8',
+    charset: esbuildOptions.charset,
     platform: 'neutral',
     define,
     sourcefile: id,
diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
index 6d3ffc86f33b06..c461bf9fb68a5c 100644
--- a/packages/vite/src/node/plugins/esbuild.ts
+++ b/packages/vite/src/node/plugins/esbuild.ts
@@ -248,7 +248,6 @@ export function esbuildPlugin(config: ResolvedConfig): Plugin {
   // and for build as the final optimization is in `buildEsbuildPlugin`
   const transformOptions: TransformOptions = {
     target: 'esnext',
-    charset: 'utf8',
     ...esbuildTransformOptions,
     minify: false,
     minifyIdentifiers: false,
@@ -390,7 +389,6 @@ export function resolveEsbuildTranspileOptions(
   const esbuildOptions = config.esbuild || {}
 
   const options: TransformOptions = {
-    charset: 'utf8',
     ...esbuildOptions,
     loader: 'js',
     target: target || undefined,