@clary-so/measure 0.4.7 → 0.4.8

package/esbuild-bin.mjs

@@ -1,44 +1,43 @@
 import * as esbuild from "esbuild";
-import { writeFileSync } from "fs";
+import { readFileSync, writeFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
 
-// Step 1: Bundle just React into its own file
-await esbuild.build({
-  absWorkingDir: new URL(".", import.meta.url).pathname,
-  stdin: {
-    contents: `module.exports = require("react");`,
-    resolveDir: ".",
-  },
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// Bundle the CLI entry with react, ink, react-reconciler, and yoga all inlined.
+// Keep node builtins and heavy deps (express, socket.io) external.
+const result = await esbuild.build({
+  absWorkingDir: __dirname,
+  entryPoints: ["dist/server/bin.js"],
   bundle: true,
   platform: "node",
   target: "node18",
-  outfile: "dist/react-bundled.js",
+  outfile: "dist/bin-bundled.js",
+  // Keep native/heavy deps external — they don't have React conflicts
+  external: [
+    "express",
+    "cors",
+    "socket.io",
+    "commander",
+    "@clary-so/*",
+    // yoga has a native .node binary that can't be bundled
+    "yoga-layout-prebuilt",
+  ],
+  // Ensure single React instance by letting esbuild deduplicate
+  alias: {
+    // Force all react requires to resolve from this package's node_modules
+    react: join(__dirname, "node_modules/react"),
+  },
   define: {
     "process.env.NODE_ENV": '"production"',
   },
+  logLevel: "info",
 });
 
-// Step 2: Create a wrapper that patches require('react') to use our bundled copy,
-// then runs the original bin
-const wrapper = `#!/usr/bin/env node
-"use strict";
-const path = require("path");
-const Module = require("module");
-
-// Load our single bundled React instance
-const bundledReact = require(path.join(__dirname, "react-bundled.js"));
-
-// Patch require so all packages resolve to the same React instance
-const origResolve = Module._resolveFilename;
-Module._resolveFilename = function(request, parent, ...args) {
-  if (request === "react") {
-    return path.join(__dirname, "react-bundled.js");
-  }
-  return origResolve.call(this, request, parent, ...args);
-};
-
-// Now load the actual bin
-require("./server/bin.js");
-`;
+// Strip duplicate shebang if present
+let code = readFileSync(join(__dirname, "dist/bin-bundled.js"), "utf8");
+code = code.replace(/^(#!.*\n)(#!.*\n)/, "$1");
+writeFileSync(join(__dirname, "dist/bin-bundled.js"), code);
 
-writeFileSync(new URL("dist/bin-bundled.js", import.meta.url), wrapper);
-console.log("Created bin-bundled.js wrapper");
+console.log("Bundled bin-bundled.js");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@clary-so/measure",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "author": {
     "name": "Almouro",
     "email": "alexandrem@bam.tech"
   },
   "license": "MIT",
   "bin": {
-    "perf-profiler-measure": "dist/server/bin.js"
+    "perf-profiler-measure": "dist/bin-bundled.js"
   },
   "bundledDependencies": [
     "react",
@@ -42,7 +42,7 @@
     "supertest": "^6.3.4"
   },
   "scripts": {
-    "build": "yarn parcel build src/webapp/index.html",
+    "build": "yarn parcel build src/webapp/index.html && node esbuild-bin.mjs",
     "start": "yarn parcel src/webapp/index.html"
   },
   "publishConfig": {