Fix browser exclude (#1182)

Author: ije

server/build.go

@@ -510,7 +510,11 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 
 					// resolve specifier using the `browser` field of package.json
 					if !isRelPathSpecifier(specifier) && len(pkgJson.Browser) > 0 && ctx.isBrowserTarget() {
-						if name, ok := pkgJson.Browser[specifier]; ok {
+						name, ok := pkgJson.Browser[specifier]
+						if !ok && strings.HasPrefix(specifier, "node:") {
+							name, ok = pkgJson.Browser[specifier[5:]]
+						}
+						if ok {
 							if name == "" {
 								return esbuild.OnResolveResult{
 									Path:      args.Path,
@@ -1009,12 +1013,8 @@ func (ctx *BuildContext) buildModule(analyzeMode bool) (meta *BuildMeta, include
 			"global.process.env.NODE_ENV": fmt.Sprintf(`"%s"`, nodeEnv),
 		}
 	} else {
-		if ctx.isBrowserTarget() {
-			switch ctx.esmPath.PkgName {
-			case "react", "react-dom", "typescript":
-				// safe to reserve `process` for these packages
-				delete(define, "process")
-			}
+		if ctx.isBrowserTarget() && safeReserveProcessPackages[ctx.esmPath.PkgName] {
+			delete(define, "process")
 		}
 		if ctx.isDenoTarget() {
 			// deno 2 has removed the `window` global object, let's replace it with `globalThis`

server/build_resolver.go

@@ -1281,11 +1281,12 @@ func normalizeSavePath(zoneId string, pathname string) string {
 
 // normalizeImportSpecifier normalizes the given specifier.
 func normalizeImportSpecifier(specifier string) string {
-	if specifier == "." {
+	switch specifier {
+	case ".":
 		specifier = "./index"
-	} else if specifier == ".." {
+	case "..":
 		specifier = "../index"
-	} else {
+	default:
 		specifier = strings.TrimPrefix(specifier, "npm:")
 	}
 	if nodeBuiltinModules[specifier] {

server/consts.go

@@ -137,3 +137,10 @@ var forceNpmSpecifiers = map[string]bool{
 	"zlib-sync":         true,
 	"css-tree":          true,
 }
+
+// packages that are safe to reserve global `process` variable for browser target
+var safeReserveProcessPackages = map[string]bool{
+	"react":      true,
+	"react-dom":  true,
+	"typescript": true,
+}

test/common/misc.test.ts

@@ -3,8 +3,8 @@ import { assertEquals } from "jsr:@std/assert";
 import { BigInteger } from "http://localhost:8080/[email protected]";
 import { Netmask } from "http://localhost:8080/[email protected]";
 import { parseStringPromise } from "http://localhost:8080/[email protected]";
-import compareVersions from "http://localhost:8080/[email protected]";
 import { createTheme } from "http://localhost:8080/[email protected]";
+import compareVersions from "http://localhost:8080/[email protected]";
 
 Deno.test("fix some invalid exports", () => {
   assertEquals(typeof BigInteger, "function");

test/common/typescript.test.ts

@@ -0,0 +1,21 @@
+import { assertEquals } from "jsr:@std/assert";
+
+Deno.test("typescript", async () => {
+  const ts = await import("http://localhost:8080/[email protected]");
+  const result = ts.transpileModule(`let x: string = "string"`, {
+    compilerOptions: { module: ts.ModuleKind.CommonJS },
+  });
+  assertEquals(ts.version, "5.5.4");
+  assertEquals(result.outputText, `var x = "string";\n`);
+});
+
+Deno.test("typescript (target=browser)", async () => {
+  const js = await fetch("http://localhost:8080/[email protected]", {
+    headers: {
+      "user-agent": "i'm a browser",
+    },
+  }).then(res => res.text());
+  if (/\/node\/\w+\.mjs/.test(js)) {
+    throw new Error("node builtin modules should not be included in browser target");
+  }
+});