feat: use rolldown minify (#73)

Co-authored-by: Yury <[email protected]>
rolldown · Dec 26, 2024 · 16218c9 · 16218c9
1 parent 0ccb934
commit 16218c9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts
@@ -166,10 +166,10 @@ export interface BuildEnvironmentOptions {
   sourcemap?: boolean | 'inline' | 'hidden'
   /**
    * Set to `false` to disable minification, or specify the minifier to use.
-   * Available options are 'terser' or 'esbuild'.
-   * @default 'esbuild'
+   * Available options are 'terser' or 'esbuild' or 'oxc'.
+   * @default 'oxc'
    */
-  minify?: boolean | 'terser' | 'esbuild'
+  minify?: boolean | 'terser' | 'esbuild' | 'oxc'
   /**
    * Options for terser
    * https://terser.org/docs/api-reference#minify-options
@@ -415,7 +415,7 @@ export function resolveBuildEnvironmentOptions(
     {
       ...buildEnvironmentOptionsDefaults,
       cssCodeSplit: !raw.lib,
-      minify: consumer === 'server' ? false : 'esbuild',
+      minify: consumer === 'server' ? false : 'oxc',
       rollupOptions: {
         platform: consumer === 'server' ? 'node' : 'browser',
       },
@@ -435,7 +435,7 @@ export function resolveBuildEnvironmentOptions(
   if ((merged.minify as string) === 'false') {
     merged.minify = false
   } else if (merged.minify === true) {
-    merged.minify = 'esbuild'
+    merged.minify = 'oxc'
   }
 
   const defaultModulePreload = {
@@ -766,6 +766,7 @@ async function buildEnvironment(
           output.format === 'iife' ||
           (isSsrTargetWebworkerEnvironment &&
             (typeof input === 'string' || Object.keys(input).length === 1)),
+        minify: options.minify === 'oxc',
         ...output,
       }
     }

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -118,6 +118,7 @@ async function bundleWorkerEntry(
         config.build.assetsDir,
         '[name]-[hash].[ext]',
       ),
+      minify: config.build.minify === 'oxc',
       ...workerConfig,
       format,
       sourcemap: config.build.sourcemap,

diff --git a/playground/css-codesplit/__tests__/css-codesplit.spec.ts b/playground/css-codesplit/__tests__/css-codesplit.spec.ts
@@ -55,7 +55,7 @@ describe.runIf(isBuild)('build', () => {
     expect(sharedCSSWithJSChunk).toMatch(`/* empty css`)
     // there are functions and modules in the src code that should be tree-shaken
     expect(sharedCSSWithJSChunk).not.toMatch('function')
-    expect(sharedCSSWithJSChunk).not.toMatch(/import(?!".\/modulepreload)/)
+    expect(sharedCSSWithJSChunk).not.toMatch(/import(?!\s*".\/modulepreload)/)
   })
 
   test('should generate correct manifest', async () => {

diff --git a/playground/js-sourcemap/__tests__/js-sourcemap.spec.ts b/playground/js-sourcemap/__tests__/js-sourcemap.spec.ts
@@ -140,7 +140,7 @@ describe.runIf(isBuild)('build tests', () => {
     expect(formatSourcemapForSnapshot(JSON.parse(map))).toMatchInlineSnapshot(`
       {
         "ignoreList": [],
-        "mappings": ";4jCAAA,OAAO,6BAAuB,wBAE9B,QAAQ,IAAI",
+        "mappings": ";ypCAAA,OAAO,6BAAuB,wBAE9B,QAAQ,IAAI,wBAAuB",
         "sources": [
           "../../after-preload-dynamic.js",
         ],

diff --git a/playground/worker/__tests__/es/worker-es.spec.ts b/playground/worker/__tests__/es/worker-es.spec.ts
@@ -104,7 +104,7 @@ describe.runIf(isBuild)('build', () => {
     )
 
     // worker should have all imports resolved and no exports
-    expect(workerContent).not.toMatch(/import[^.]/)
+    expect(workerContent).not.toMatch(/import\s*["(]/)
     expect(workerContent).not.toMatch(/\bexport\b/)
     // chunk
     expect(content).toMatch(`new Worker("/es/assets`)
@@ -113,7 +113,7 @@ describe.runIf(isBuild)('build', () => {
     expect(content).toMatch(`(self.URL||self.webkitURL).createObjectURL`)
     expect(content).toMatch(`self.Blob`)
     expect(content).toMatch(
-      /try\{if\(\w+=\w+&&\(self\.URL\|\|self\.webkitURL\)\.createObjectURL\(\w+\),!\w+\)throw""/,
+      /try\{\w+=\w+&&\(self\.URL\|\|self\.webkitURL\)\.createObjectURL\(\w+\)[;\w()!]+throw\s*""/,
     )
     // inlined shared worker
     expect(content).toMatch(

diff --git a/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts b/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts
@@ -75,7 +75,7 @@ describe.runIf(isBuild)('build', () => {
     )
 
     // worker should have all imports resolved and no exports
-    expect(workerContent).not.toMatch(/import(?!\.)/) // accept import.meta.url
+    expect(workerContent).not.toMatch(/import\s*["(]/)
     expect(workerContent).not.toMatch(/\bexport\b/)
     // chunk
     expect(content).toMatch(`new Worker(""+new URL("../worker-entries/`)