fix: shadow global define in __commonJS

Author: magic-akari

internal/bundler_tests/bundler_loader_test.go

@@ -1697,6 +1697,32 @@ func TestLoaderBundleWithTypeJSONOnlyDefaultExport(t *testing.T) {
 	})
 }
 
+func TestLoaderUmdDefineShouldBeShadowed(t *testing.T) {
+	loader_suite.expectBundled(t, bundled{
+		files: map[string]string{
+			"/entry.js": `
+				const LZString = "test";
+				if (typeof define === 'function' && define.amd) {
+				  define(function () { return LZString; });
+				} else if( typeof module !== 'undefined' && module != null ) {
+				  module.exports = LZString
+				} else if( typeof angular !== 'undefined' && angular != null ) {
+				  angular.module('LZString', [])
+				  .factory('LZString', function () {
+				    return LZString;
+				  });
+				}
+			`,
+		},
+		entryPaths: []string{"/entry.js"},
+		options: config.Options{
+			Mode:          config.ModeConvertFormat,
+			OutputFormat:  config.FormatESModule,
+			AbsOutputFile: "/out.js",
+		},
+	})
+}
+
 func TestLoaderJSONPrototype(t *testing.T) {
 	loader_suite.expectBundled(t, bundled{
 		files: map[string]string{

internal/bundler_tests/snapshots/snapshots_loader.txt

@@ -968,6 +968,27 @@ var y_default = "y";
 var x_txt = require_x();
 console.log(x_txt, y_default);
 
+================================================================================
+TestLoaderUmdDefineShouldBeShadowed
+---------- /out.js ----------
+var require_entry = __commonJS({
+  "entry.js"(exports, module, define) {
+    const LZString = "test";
+    if (typeof define === "function" && define.amd) {
+      define(function() {
+        return LZString;
+      });
+    } else if (typeof module !== "undefined" && module != null) {
+      module.exports = LZString;
+    } else if (typeof angular !== "undefined" && angular != null) {
+      angular.module("LZString", []).factory("LZString", function() {
+        return LZString;
+      });
+    }
+  }
+});
+export default require_entry();
+
 ================================================================================
 TestRequireCustomExtensionBase64
 ---------- /out.js ----------

internal/graph/graph.go

@@ -396,6 +396,9 @@ func (g *LinkerGraph) GenerateSymbolImportAndUse(
 	if ref == repr.AST.ModuleRef {
 		repr.AST.UsesModuleRef = true
 	}
+	if ref == repr.AST.DefineRef {
+		repr.AST.UsesDefineRef = true
+	}
 
 	// Track that this specific symbol was imported
 	if sourceIndexToImportFrom != sourceIndex {

internal/js_ast/js_ast.go

@@ -1589,6 +1589,7 @@ type AST struct {
 
 	ExportsRef ast.Ref
 	ModuleRef  ast.Ref
+	DefineRef  ast.Ref
 	WrapperRef ast.Ref
 
 	ApproximateLineCount  int32
@@ -1601,6 +1602,7 @@ type AST struct {
 	// here because only the parser checks those.
 	UsesExportsRef bool
 	UsesModuleRef  bool
+	UsesDefineRef  bool
 	ExportsKind    ExportsKind
 }
 

internal/js_parser/js_parser.go

@@ -224,6 +224,7 @@ type parser struct {
 	exportsRef    ast.Ref
 	requireRef    ast.Ref
 	moduleRef     ast.Ref
+	defineRef     ast.Ref
 	importMetaRef ast.Ref
 	promiseRef    ast.Ref
 	regExpRef     ast.Ref
@@ -14615,6 +14616,7 @@ func (p *parser) visitExprInOut(expr js_ast.Expr, in exprIn) (js_ast.Expr, exprO
 					if p.options.mode == config.ModeBundle && !p.isFileConsideredToHaveESMExports {
 						p.recordUsage(p.moduleRef)
 						p.recordUsage(p.exportsRef)
+						p.recordUsage(p.defineRef)
 					}
 
 					// Mark this scope and all parent scopes as containing a direct eval.
@@ -17520,10 +17522,12 @@ func (p *parser) prepareForVisitPass() {
 		// CommonJS-style exports
 		p.exportsRef = p.declareCommonJSSymbol(ast.SymbolHoisted, "exports")
 		p.moduleRef = p.declareCommonJSSymbol(ast.SymbolHoisted, "module")
+		p.defineRef = p.declareCommonJSSymbol(ast.SymbolHoisted, "define")
 	} else {
 		// ESM-style exports
 		p.exportsRef = p.newSymbol(ast.SymbolHoisted, "exports")
 		p.moduleRef = p.newSymbol(ast.SymbolHoisted, "module")
+		p.defineRef = p.newSymbol(ast.SymbolHoisted, "define")
 	}
 
 	// Handle "@jsx" and "@jsxFrag" pragmas now that lexing is done
@@ -17939,6 +17943,7 @@ func (p *parser) toAST(before, parts, after []js_ast.Part, hashbang string, dire
 	exportsKind := js_ast.ExportsNone
 	usesExportsRef := p.symbols[p.exportsRef.InnerIndex].UseCountEstimate > 0
 	usesModuleRef := p.symbols[p.moduleRef.InnerIndex].UseCountEstimate > 0
+	usesDefineRef := p.symbols[p.defineRef.InnerIndex].UseCountEstimate > 0
 
 	if p.esmExportKeyword.Len > 0 || p.esmImportMeta.Len > 0 || p.topLevelAwaitKeyword.Len > 0 {
 		exportsKind = js_ast.ExportsESM
@@ -17975,6 +17980,7 @@ func (p *parser) toAST(before, parts, after []js_ast.Part, hashbang string, dire
 		Symbols:                         p.symbols,
 		ExportsRef:                      p.exportsRef,
 		ModuleRef:                       p.moduleRef,
+		DefineRef:                       p.defineRef,
 		WrapperRef:                      wrapperRef,
 		Hashbang:                        hashbang,
 		Directives:                      directives,
@@ -17995,6 +18001,7 @@ func (p *parser) toAST(before, parts, after []js_ast.Part, hashbang string, dire
 		// CommonJS features
 		UsesExportsRef: usesExportsRef,
 		UsesModuleRef:  usesModuleRef,
+		UsesDefineRef:  usesDefineRef,
 		ExportsKind:    exportsKind,
 
 		// ES6 features

internal/linker/linker.go

@@ -4791,8 +4791,11 @@ func (c *linkerContext) generateCodeForFileInChunkJS(
 			args := []js_ast.Arg{}
 			if repr.AST.UsesExportsRef || repr.AST.UsesModuleRef {
 				args = append(args, js_ast.Arg{Binding: js_ast.Binding{Data: &js_ast.BIdentifier{Ref: repr.AST.ExportsRef}}})
-				if repr.AST.UsesModuleRef {
+				if repr.AST.UsesModuleRef || repr.AST.UsesDefineRef {
 					args = append(args, js_ast.Arg{Binding: js_ast.Binding{Data: &js_ast.BIdentifier{Ref: repr.AST.ModuleRef}}})
+					if repr.AST.UsesDefineRef {
+						args = append(args, js_ast.Arg{Binding: js_ast.Binding{Data: &js_ast.BIdentifier{Ref: repr.AST.DefineRef}}})
+					}
 				}
 			}