fix: don't transform to cjs twice, resolves #675

egoist · Aug 12, 2022 · 7000c8b · 7000c8b · vercel · Aug 12, 2022
1 parent c06b5e1
commit 7000c8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/esbuild/index.ts b/src/esbuild/index.ts
@@ -266,13 +266,13 @@ export async function runEsbuild(
 
   // Manually write files
   if (result && result.outputFiles) {
-    const timeInMs = Date.now() - startTime
-    logger.success(format, `⚡️ Build success in ${Math.floor(timeInMs)}ms`)
-
     await pluginContainer.buildFinished({
       outputFiles: result.outputFiles,
       metafile: result.metafile,
     })
+
+    const timeInMs = Date.now() - startTime
+    logger.success(format, `⚡️ Build success in ${Math.floor(timeInMs)}ms`)
   }
 
   if (result.metafile) {

diff --git a/src/plugins/cjs-splitting.ts b/src/plugins/cjs-splitting.ts
@@ -1,7 +1,6 @@
 // Workaround to enable code splitting for cjs format
 // Manually transform esm to cjs
 // TODO: remove this once esbuild supports code splitting for cjs natively
-import path from 'path'
 import { Plugin } from '../plugin'
 
 export const cjsSplitting = (): Plugin => {
@@ -11,6 +10,7 @@ export const cjsSplitting = (): Plugin => {
     async renderChunk(code, info) {
       if (
         !this.splitting ||
+        this.options.treeshake || // <-- handled by rollup
         this.format !== 'cjs' ||
         info.type !== 'chunk' ||
         !/\.(js|cjs)$/.test(info.path)