Replace patch with hoist script

buildtools/wasm/Dockerfile

@@ -6,11 +6,10 @@ RUN corepack enable
 
 COPY buildtools/wasm/package.json buildtools/wasm/pnpm-lock.yaml ./
 RUN pnpm install --frozen-lockfile
+COPY buildtools/wasm/*.mjs ./
 COPY buildtools/wasm/*.ts ./
 COPY buildtools/wasm/tsconfig.json ./
 RUN pnpm run build
-COPY buildtools/wasm/patch.txt ./
-RUN patch -p0 < patch.txt
 
 FROM ghcr.io/webassembly/wasi-sdk:wasi-sdk-21
 

buildtools/wasm/hoist-imports.mjs

@@ -0,0 +1,31 @@
+import readline from "node:readline";
+
+async function run() {
+  const lines = readline.createInterface({
+    input: process.stdin,
+    terminal: false,
+  });
+
+  const imports = [];
+  const others = [];
+
+  for await (const line of lines) {
+    if (
+      line.startsWith("import ") &&
+      (line.endsWith(' "std";') || line.endsWith(' "os";'))
+    ) {
+      imports.push(line);
+    } else {
+      others.push(line);
+    }
+  }
+
+  for (const line of imports) {
+    console.log(line);
+  }
+  for (const line of others) {
+    console.log(line);
+  }
+}
+
+await run();

buildtools/wasm/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "type": "module",
   "scripts": {
-    "build": "esbuild --external:std --bundle protoc-gen-connect-es.ts --format=esm --outfile=dist/protoc-gen-connect-es.js"
+    "build": "esbuild --external:std --bundle protoc-gen-connect-es.ts --format=esm | node hoist-imports.mjs > dist/protoc-gen-connect-es.js"
   },
   "keywords": [],
   "author": "",