@commercebuild/extension 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercebuild/extension",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "types": "./types/index.d.ts",
   "exports": {
     ".": {

package/scripts/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { execFileSync, execSync } from "child_process";
+import { execFileSync } from "child_process";
 import { existsSync } from "fs";
 import { createRequire } from "module";
 import path from "path";
@@ -9,6 +9,23 @@ import { displayError } from "./utils.mjs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const args = process.argv.slice(2);
+// Resolve tools from THIS package, not from whatever the project hoisted.
+const require = createRequire(import.meta.url);
+
+/**
+ * Absolute path of a dependency's `bin` script. Goes through its
+ * package.json ("./package.json" is exported by every package we need,
+ * while "./bin/*" usually is not) and reads the declared bin entry, so a
+ * relocation of the script inside the package cannot break us.
+ */
+function binOf(pkg, name) {
+  const manifestPath = require.resolve(`${pkg}/package.json`);
+  const manifest = require(manifestPath);
+  const bin =
+    typeof manifest.bin === "string" ? manifest.bin : manifest.bin?.[name];
+  if (!bin) throw new Error(`${pkg} declares no "${name}" bin`);
+  return path.join(path.dirname(manifestPath), bin);
+}
 
 const USAGE =
   "Usage: commercebuild-extension <dev | build | type-check>\n" +
@@ -30,12 +47,25 @@ function hasAdminEntry() {
   );
 }
 
+/**
+ * Run vite without a shell: the project path goes to vite as one argument,
+ * so folders like "my-app(2)" or "My Apps" (spaces, parentheses — `open`
+ * numbers duplicate downloads that way) cannot be mis-parsed. Exit status
+ * is propagated by the caller through the thrown error.
+ */
+function vite(viteArgs, env = process.env) {
+  execFileSync(process.execPath, [binOf("vite", "vite"), ...viteArgs], {
+    stdio: "inherit",
+    env,
+  });
+}
+
 function build() {
-  execSync(`vite build --config ${viteConfigPath}`, { stdio: "inherit" });
+  vite(["build", "--config", viteConfigPath]);
   if (hasAdminEntry()) {
-    execSync(`vite build --config ${viteConfigPath}`, {
-      stdio: "inherit",
-      env: { ...process.env, CB_BUILD_TARGET: "admin" },
+    vite(["build", "--config", viteConfigPath], {
+      ...process.env,
+      CB_BUILD_TARGET: "admin",
     });
   }
 }
@@ -48,8 +78,7 @@ function build() {
  * involved, so the resolved path needs no quoting.
  */
 function typeCheck() {
-  const require = createRequire(import.meta.url);
-  const tsc = require.resolve("typescript/bin/tsc");
+  const tsc = binOf("typescript", "tsc");
   try {
     execFileSync(process.execPath, [tsc, "--noEmit", "-p", "."], {
       stdio: "inherit",
@@ -62,7 +91,7 @@ function typeCheck() {
 if (args.includes("dev")) {
   try {
     build();
-    execSync(`vite --config ${viteConfigPath}`, { stdio: "inherit" });
+    vite(["--config", viteConfigPath]);
   } catch (error) {
     displayError("Failed to start commercebuild extension server:", error);
   }