server/embed: add npm polyfills

server/build.go

@@ -448,10 +448,11 @@ func (ctx *BuildContext) buildModule() (result BuildResult, err error) {
 						}
 					}
 
-					// use polyfilled 'fsevents' module for browser
+					// use the polyfilled 'fsevents' module for browser
 					if specifier == "fsevents" && ctx.isBrowserTarget() {
+						data := npmPolyfills[specifier]
 						return api.OnResolveResult{
-							Path:     "npm_fsevents.js",
+							Path:     fmt.Sprintf("data:text/javascript;base64,%s", base64.StdEncoding.EncodeToString(data)),
 							External: true,
 						}, nil
 					}

server/build_resolver.go

@@ -780,7 +780,7 @@ func (ctx *BuildContext) resolveExternalModule(specifier string, kind api.Resolv
 		return
 	}
 	if specifier == "node-fetch" && ctx.target != "node" {
-		resolvedPath = "/npm_node-fetch.js"
+		resolvedPath = "/node/fetch.js"
 		return
 	}
 

server/embed.go

@@ -18,13 +18,18 @@ var (
 )
 
 type EmbedFS interface {
+	ReadDir(name string) ([]os.DirEntry, error)
 	ReadFile(name string) ([]byte, error)
 }
 
 type MockEmbedFS struct {
 	cwd string
 }
 
+func (fs MockEmbedFS) ReadDir(name string) ([]os.DirEntry, error) {
+	return os.ReadDir(path.Join(fs.cwd, name))
+}
+
 func (fs MockEmbedFS) ReadFile(name string) ([]byte, error) {
 	return os.ReadFile(path.Join(fs.cwd, name))
 }
@@ -57,46 +62,38 @@ func loadNodeLibs(fs EmbedFS) (err error) {
 		}
 	}
 	// override some libs
-	node_async_hooks_js, err := fs.ReadFile("server/embed/polyfills/node_async_hooks.js")
+	entries, err := fs.ReadDir("server/embed/polyfills")
 	if err != nil {
 		return
 	}
-	nodeLibs["node/async_hooks.js"] = string(node_async_hooks_js)
-	// extra libs
-	node_filename_resolver_js, err := fs.ReadFile("server/embed/polyfills/node_filename_resolver.js")
-	if err != nil {
-		return
+	for _, entry := range entries {
+		name := entry.Name()
+		if !entry.IsDir() && strings.HasPrefix(name, "node_") && strings.HasSuffix(name, ".js") {
+			data, err := fs.ReadFile("server/embed/polyfills/" + name)
+			if err != nil {
+				return err
+			}
+			nodeLibs["node/"+name[5:]] = string(data)
+		}
 	}
-	nodeLibs["node/filename_resolver.js"] = string(node_filename_resolver_js)
 	return nil
 }
 
 func loadNpmPolyfills(fs EmbedFS) (err error) {
-	data, err := fs.ReadFile("server/embed/npm-polyfills.tar.gz")
+	entries, err := fs.ReadDir("server/embed/polyfills/npm")
 	if err != nil {
 		return
 	}
-	gr, err := gzip.NewReader(bytes.NewReader(data))
-	if err != nil {
-		return
-	}
-	tr := tar.NewReader(gr)
-	for {
-		h, err := tr.Next()
-		if err != nil {
-			break
-		}
-		if h.Typeflag == tar.TypeReg {
-			data, err := io.ReadAll(tr)
+	for _, entry := range entries {
+		name := entry.Name()
+		if !entry.IsDir() && strings.HasSuffix(name, ".mjs") {
+			data, err := fs.ReadFile("server/embed/polyfills/npm/" + name)
 			if err != nil {
 				return err
 			}
-			if strings.HasSuffix(h.Name, ".mjs") {
-				name := strings.TrimSuffix(path.Base(h.Name), ".mjs")
-				data = bytes.ReplaceAll(data, []byte{';', '\n'}, []byte{';'})
-				data = bytes.TrimSuffix(data, []byte{';'})
-				npmPolyfills[name] = data
-			}
+			data = bytes.ReplaceAll(data, []byte{';', '\n'}, []byte{';'})
+			data = bytes.TrimSuffix(data, []byte{';'})
+			npmPolyfills[strings.TrimSuffix(name, ".mjs")] = data
 		}
 	}
 	return nil

server/embed/polyfills/npm/README.md

@@ -0,0 +1,37 @@
+# esm-npm-polyfills
+
+Using _native_ APIs instead of importing from NPM.
+
+- [abort-controller](https://www.npmjs.com/package/abort-controller) → [abort-controller.mjs](./abort-controller.mjs)
+- [array-every](https://www.npmjs.com/package/array-every) → [array-every.mjs](./array-every.mjs)
+- [array-flatten](https://www.npmjs.com/package/array-flatten) → [array-flatten.mjs](./array-flatten.mjs)
+- [array-includes](https://www.npmjs.com/package/array-includes) → [array-includes.mjs](./array-includes.mjs)
+- [array.prototype.find](https://www.npmjs.com/package/array.prototype.find) → [array.prototype.find.mjs](./array.prototype.find.mjs)
+- [define-properties](https://www.npmjs.com/package/define-properties) → [define-properties.mjs](./define-properties.mjs)
+- [define-property](https://www.npmjs.com/package/define-property) → [define-property.mjs](./define-property.mjs)
+- [es-define-property](https://www.npmjs.com/package/es-define-property) → [es-define-property.mjs](./es-define-property.mjs)
+- [filter-array](https://www.npmjs.com/package/filter-array) → [filter-array.mjs](./filter-array.mjs)
+- [for-each](https://www.npmjs.com/package/for-each) → [for-each.mjs](./for-each.mjs)
+- [function-bind](https://www.npmjs.com/package/function-bind) → [function-bind.mjs](./function-bind.mjs)
+- [has-own-prop](https://www.npmjs.com/package/has-own-prop) → [has-own-prop.mjs](./has-own-prop.mjs)
+- [has-own](https://www.npmjs.com/package/has-own) → [has-own.mjs](./has-own.mjs)
+- [has-property-descriptors](https://www.npmjs.com/package/has-property-descriptors) → [has-property-descriptors.mjs](./has-property-descriptors.mjs)
+- [has-proto](https://www.npmjs.com/package/has-proto) → [has-proto.mjs](./has-proto.mjs)
+- [has-symbols](https://www.npmjs.com/package/has-symbols) → [has-symbols.mjs](./has-symbols.mjs)
+- [has-tostringtag](https://www.npmjs.com/package/has-tostringtag) → [has-tostringtag.mjs](./has-tostringtag.mjs)
+- [hasown](https://www.npmjs.com/package/hasown) → [hasown.mjs](./hasown.mjs)
+- [index-of](https://www.npmjs.com/package/index-of) → [index-of.mjs](./index-of.mjs)
+- [is-even](https://www.npmjs.com/package/is-even) → [is-even.mjs](./is-even.mjs)
+- [is-nan](https://www.npmjs.com/package/is-nan) → [is-nan.mjs](./is-nan.mjs)
+- [is-number](https://www.npmjs.com/package/is-number) → [is-number.mjs](./is-number.mjs)
+- [is-odd](https://www.npmjs.com/package/is-odd) → [is-odd.mjs](./is-odd.mjs)
+- [is-regexp](https://www.npmjs.com/package/is-regexp) → [is-regexp.mjs](./is-regexp.mjs)
+- [is-string](https://www.npmjs.com/package/is-string) → [is-string.mjs](./is-string.mjs)
+- [left-pad](https://www.npmjs.com/package/left-pad) → [left-pad.mjs](./left-pad.mjs)
+- [pad-left](https://www.npmjs.com/package/pad-left) → [pad-left.mjs](./pad-left.mjs)
+- [object-assign](https://www.npmjs.com/package/object-assign) → [object-assign.mjs](./object-assign.mjs)
+- [object-is](https://www.npmjs.com/package/object-is) → [object-is.mjs](./object-is.mjs)
+- [object-keys](https://www.npmjs.com/package/object-keys) → [object-keys.mjs](./object-keys.mjs)
+- [object.entries](https://www.npmjs.com/package/object.entries) → [object.entries.mjs](./object.entries.mjs)
+- [object.values](https://www.npmjs.com/package/object.values) → [object.values.mjs](./object.values.mjs)
+- [regexp.prototype.flags](https://www.npmjs.com/package/regexp.prototype.flags) → [regexp.prototype.flags.mjs](./regexp.prototype.flags.mjs)

server/embed/polyfills/npm/abort-controller.mjs

@@ -0,0 +1,3 @@
+export const AbortSignal=globalThis.AbortSignal;
+export const AbortController=globalThis.AbortController;
+export default AbortController;

server/embed/polyfills/npm/array-every.mjs

@@ -0,0 +1,2 @@
+export const every=(a,p,t)=>a.every(p,t);
+export default every;

server/embed/polyfills/npm/array-flatten.mjs

@@ -0,0 +1,2 @@
+export const flatten=(a,d)=>a.flat(typeof d<"u"?d:Infinity);
+export default flatten;

server/embed/polyfills/npm/array-includes.mjs

@@ -0,0 +1 @@
+export default (a,p,i)=>a.includes(p,i);

server/embed/polyfills/npm/array.prototype.find.mjs

@@ -0,0 +1 @@
+export default (a,p,t)=>a.find(p,t);

server/embed/polyfills/npm/define-properties.mjs

@@ -0,0 +1 @@
+export default Object.defineProperties;

server/embed/polyfills/npm/define-property.mjs

@@ -0,0 +1 @@
+export default Object.defineProperty;

server/embed/polyfills/npm/es-define-property.mjs

@@ -0,0 +1 @@
+export default Object.defineProperty;

server/embed/polyfills/npm/filter-array.mjs

@@ -0,0 +1 @@
+export default (a,p,t)=>a.filter(p,t);

server/embed/polyfills/npm/for-each.mjs

@@ -0,0 +1,9 @@
+export default (v, cb) => {
+  if (Array.isArray(v)) {
+    v.forEach(cb);
+  } else if (v && typeof v === "object") {
+    for (const k in v) {
+      cb(v[k], k, v);
+    }
+  }
+};

server/embed/polyfills/npm/function-bind.mjs

@@ -0,0 +1 @@
+export default Function.prototype.bind;

server/embed/polyfills/npm/has-own-prop.mjs

@@ -0,0 +1 @@
+export default (obj,prop)=>Object.prototype.hasOwnProperty.call(obj,prop);

server/embed/polyfills/npm/has-own.mjs

@@ -0,0 +1 @@
+export default Object.hasOwn??((o,p)=>Object.prototype.hasOwnProperty.call(o,p));

server/embed/polyfills/npm/has-property-descriptors.mjs

@@ -0,0 +1 @@
+export default () => true;

server/embed/polyfills/npm/has-proto.mjs

@@ -0,0 +1,3 @@
+const foo={bar:{}};
+const O=Object;
+export default ()=>({__proto__:foo}).bar===foo.bar&&!({__proto__:null}instanceof O);

server/embed/polyfills/npm/has-symbols.mjs

@@ -0,0 +1 @@
+export default ()=>true;

server/embed/polyfills/npm/has-tostringtag.mjs

@@ -0,0 +1 @@
+export default ()=>typeof Symbol.toStringTag==="symbol";

server/embed/polyfills/npm/hasown.mjs

@@ -0,0 +1 @@
+export default Object.hasOwn??((o,p)=>Object.prototype.hasOwnProperty.call(o,p));

server/embed/polyfills/npm/index-of.mjs

@@ -0,0 +1 @@
+export default (a,el,i)=>a.indexOf(el,i);

server/embed/polyfills/npm/is-even.mjs

@@ -0,0 +1 @@
+export default n=>(n%2)===0;

server/embed/polyfills/npm/is-nan.mjs

@@ -0,0 +1 @@
+export default Number.isNaN;

server/embed/polyfills/npm/is-number.mjs

@@ -0,0 +1 @@
+export default v=>typeof v==="number";

server/embed/polyfills/npm/is-odd.mjs

@@ -0,0 +1 @@
+export default n=>(n%2)===1;

server/embed/polyfills/npm/is-regexp.mjs

@@ -0,0 +1 @@
+export default v=>v instanceof RegExp;

server/embed/polyfills/npm/is-string.mjs

@@ -0,0 +1 @@
+export default v=>typeof v==="string";

server/embed/polyfills/npm/left-pad.mjs

@@ -0,0 +1 @@
+export default (s,l,c)=>s.padStart(l,c);

server/embed/polyfills/npm/object-assign.mjs

@@ -0,0 +1 @@
+export default Object.assign;

server/embed/polyfills/npm/object-is.mjs

@@ -0,0 +1 @@
+export default Object.is;

server/embed/polyfills/npm/object-keys.mjs

@@ -0,0 +1 @@
+export default Object.keys;

server/embed/polyfills/npm/object.entries.mjs

@@ -0,0 +1 @@
+export default Object.entries;

server/embed/polyfills/npm/object.values.mjs

@@ -0,0 +1 @@
+export default Object.values;

server/embed/polyfills/npm/pad-left.mjs

@@ -0,0 +1 @@
+export default (s,l,c)=>s.padStart(l,c);

server/embed/polyfills/npm/regexp.prototype.flags.mjs

@@ -0,0 +1 @@
+export default r=>r.flags;

server/router.go

@@ -472,16 +472,9 @@ func router() rex.Handle {
 			return rex.Content(pathname, startTime, bytes.NewReader(code))
 		}
 
-		// use embed polyfills/types
-		if endsWith(pathname, ".js", ".d.ts") && strings.Count(pathname, "/") == 1 {
-			var data []byte
-			var err error
-			isDts := strings.HasSuffix(pathname, ".d.ts")
-			if isDts {
-				data, err = embedFS.ReadFile("server/embed/types" + pathname)
-			} else {
-				data, err = embedFS.ReadFile("server/embed/polyfills" + pathname)
-			}
+		// use embed types
+		if strings.HasSuffix(pathname, ".d.ts") && strings.Count(pathname, "/") == 1 {
+			data, err := embedFS.ReadFile("server/embed/types" + pathname)
 			if err == nil {
 				ifNoneMatch := ctx.R.Header.Get("If-None-Match")
 				if ifNoneMatch != "" && ifNoneMatch == globalETag {
@@ -495,18 +488,7 @@ func router() rex.Handle {
 						header.Set("ETag", globalETag)
 					}
 				}
-				if isDts {
-					header.Set("Content-Type", ctTypeScript)
-				} else {
-					target := getBuildTargetByUA(userAgent)
-					code, err := minify(string(data), targets[target], api.LoaderJS)
-					if err != nil {
-						return throwErrorJS(ctx, fmt.Sprintf("Transform error: %v", err), false)
-					}
-					data = []byte(code)
-					header.Set("Content-Type", ctJavaScript)
-					appendVaryHeader(header, "User-Agent")
-				}
+				header.Set("Content-Type", ctTypeScript)
 				return rex.Content(pathname, startTime, bytes.NewReader(data))
 			}
 		}

test/esm-worker/test.ts

@@ -241,14 +241,6 @@ Deno.test("esm-worker", { sanitizeOps: false, sanitizeResources: false }, async
     assertEquals(res6.headers.get("Content-Type"), "application/javascript; charset=utf-8");
     assertEquals(res6.headers.get("Cache-Control"), "public, max-age=31536000, immutable");
 
-    const res7 = await fetch(`${workerOrigin}/npm_node-fetch.js`);
-    assertEquals(res7.status, 200);
-    assertEquals(res7.headers.get("Content-Type"), "application/javascript; charset=utf-8");
-    assertEquals(res7.headers.get("Etag"), `W/"${version}"`);
-    assertEquals(res7.headers.get("Cache-Control"), "public, max-age=86400");
-    assertStringIncludes(res7.headers.get("Vary")!, "User-Agent");
-    assertStringIncludes(await res7.text(), "fetch");
-
     const fs = await import(`${workerOrigin}/node/fs.js`);
     fs.writeFileSync("foo.txt", "bar", "utf8");
     assertEquals(fs.readFileSync("foo.txt", "utf8"), "bar");

worker/src/index.ts

@@ -296,7 +296,7 @@ function withESMWorker(middleware?: Middleware, cache: Cache = (caches as any).d
       pathname === "/run.d.ts" ||
       pathname === "/sw" ||
       pathname === "/tsx" ||
-      ((pathname.startsWith("/node/") || pathname.startsWith("/npm_")) && pathname.endsWith(".js"))
+      (pathname.startsWith("/node/") && pathname.endsWith(".js"))
     ) {
       const varyUA = !pathname.endsWith(".ts");
       const isChunkjs = pathname.startsWith("/node/chunk-");