fix(esbuild): umd helper insert into wrong position in lib mode (#11988)

vitejs · Feb 17, 2023 · 86bc243 · 86bc243
1 parent 6eee75c
commit 86bc243
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
@@ -29,7 +29,7 @@ const debug = createDebugger('vite:esbuild')
 const INJECT_HELPERS_IIFE_RE =
   /^(.*?)((?:const|var)\s+\S+\s*=\s*function\s*\([^)]*\)\s*\{.*?"use strict";)/s
 const INJECT_HELPERS_UMD_RE =
-  /^(.*?)(\(function\([^)]*\)\s*\{.+amd.+function\([^)]*\)\s*\{.*?"use strict";)/s
+  /^(.*?)(\(function\([^)]*\)\s*\{.+?amd.+?function\([^)]*\)\s*\{.*?"use strict";)/s
 
 let server: ViteDevServer
 

diff --git a/playground/lib/__tests__/lib.spec.ts b/playground/lib/__tests__/lib.spec.ts
@@ -19,7 +19,9 @@ describe.runIf(isBuild)('build', () => {
     const noMinifyCode = readFile('dist/nominify/my-lib-custom-filename.umd.js')
     // esbuild helpers are injected inside of the UMD wrapper
     expect(code).toMatch(/^\(function\(/)
-    expect(noMinifyCode).toMatch(/^\(function\(global/)
+    expect(noMinifyCode).toMatch(
+      /^\(function\(global.+?"use strict";var.+?function\smyLib\(/s,
+    )
   })
 
   test('iife', async () => {

diff --git a/playground/lib/src/main.js b/playground/lib/src/main.js
@@ -6,4 +6,7 @@ export default function myLib(sel) {
 
   // Env vars should not be replaced
   console.log(process.env.NODE_ENV)
+
+  // make sure umd helper has been moved to the right position
+  console.log(`amd function(){ "use strict"; }`)
 }