feat: add charset config option

vitejs · Nov 8, 2022 · 87aad09 · 87aad09
1 parent a4d2e26
commit 87aad09
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts b/packages/vite/src/node/__tests__/plugins/esbuild.spec.ts
@@ -17,7 +17,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'es'
     )
     expect(options).toEqual({
-      charset: 'utf8',
       target: 'es2020',
       format: 'esm',
       keepNames: true,
@@ -151,7 +150,6 @@ describe('resolveEsbuildTranspileOptions', () => {
       'cjs'
     )
     expect(options).toEqual({
-      charset: 'utf8',
       target: undefined,
       format: 'cjs',
       keepNames: true,

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -116,6 +116,8 @@ export type PluginOption =
   | PluginOption[]
   | Promise<Plugin | false | null | undefined | PluginOption[]>
 
+type Charset = 'ascii' | 'utf8'
+
 export interface UserConfig {
   /**
    * Project root directory. Can be an absolute path, or a path relative from
@@ -152,6 +154,11 @@ export interface UserConfig {
    * each command, and can be overridden by the command line --mode option.
    */
   mode?: string
+  /**
+   * Charset
+   * @default 'utf8'
+   */
+  charset?: Charset
   /**
    * Define global variable replacements.
    * Entries will be defined on `window` during dev and replaced during build.
@@ -630,6 +637,7 @@ export async function resolveConfig(
     resolve: resolveOptions,
     publicDir: resolvedPublicDir,
     cacheDir,
+    charset: config.charset ?? 'utf8',
     command,
     mode,
     ssr,

diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
@@ -308,6 +308,7 @@ export function resolveEsbuildTranspileOptions(
   const esbuildOptions = config.esbuild || {}
   const options: TransformOptions = {
     ...esbuildOptions,
+    charset: config.charset,
     target: target || undefined,
     format: rollupToEsbuildFormatMap[format],
     // the final build should always support dynamic import and import.meta.
@@ -375,7 +376,6 @@ export function resolveEsbuildTranspileOptions(
     return {
       ...options,
       minify: true,
-      charset: 'utf8',
       treeShaking: true
     }
   }