@plasmicapp/nextjs-app-router 1.0.10 → 1.0.12

package/dist/with-plasmic-prepass.cjs.js

@@ -460,19 +460,19 @@ var require_enoent = __commonJS({
         spawnargs: original.args
       });
     }
-    function hookChildProcess(cp2, parsed) {
+    function hookChildProcess(cp, parsed) {
       if (!isWin) {
         return;
       }
-      const originalEmit = cp2.emit;
-      cp2.emit = function(name, arg1) {
+      const originalEmit = cp.emit;
+      cp.emit = function(name, arg1) {
         if (name === "exit") {
           const err = verifyENOENT(arg1, parsed, "spawn");
           if (err) {
-            return originalEmit.call(cp2, "error", err);
+            return originalEmit.call(cp, "error", err);
           }
         }
-        return originalEmit.apply(cp2, arguments);
+        return originalEmit.apply(cp, arguments);
       };
     }
     function verifyENOENT(status, parsed) {
@@ -500,23 +500,23 @@ var require_enoent = __commonJS({
 var require_cross_spawn = __commonJS({
   "../../node_modules/cross-spawn/index.js"(exports, module2) {
     "use strict";
-    var cp2 = require("child_process");
+    var cp = require("child_process");
     var parse = require_parse();
     var enoent = require_enoent();
-    function spawn(command2, args, options) {
+    function spawn2(command2, args, options) {
       const parsed = parse(command2, args, options);
-      const spawned = cp2.spawn(parsed.command, parsed.args, parsed.options);
+      const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
       return spawned;
     }
     function spawnSync(command2, args, options) {
       const parsed = parse(command2, args, options);
-      const result = cp2.spawnSync(parsed.command, parsed.args, parsed.options);
+      const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
       return result;
     }
-    module2.exports = spawn;
-    module2.exports.spawn = spawn;
+    module2.exports = spawn2;
+    module2.exports.spawn = spawn2;
     module2.exports.sync = spawnSync;
     module2.exports._parse = parse;
     module2.exports._enoent = enoent;
@@ -2201,7 +2201,7 @@ var require_ps_list2 = __commonJS({
 });
 
 // src/with-dev-server.mts
-var import_child_process = __toESM(require("child_process"), 1);
+var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 
 // ../../node_modules/fkill/index.js
 var import_node_process3 = __toESM(require("node:process"), 1);
@@ -7551,7 +7551,7 @@ async function startDevServer(command2, port, opts) {
   console.log(
     `Plasmic: starting prepass dev server at http://localhost:${port} via "npm run ${command2}"...`
   );
-  const devServerProcess = import_child_process.default.spawn(`npm`, ["run", command2], {
+  const devServerProcess = (0, import_cross_spawn.spawn)(`npm`, ["run", command2], {
     env: {
       PLASMIC_PREPASS_SERVER: "true",
       ...import_process.default.env,
@@ -7599,15 +7599,13 @@ async function main() {
   });
   const killDevServer = () => {
     devProcess.kill("SIGKILL");
-    fkill(`:${port}`, { force: true }).then(() => {
-      import_process.default.exit(commandProcess.exitCode ?? void 0);
-    }).catch((err) => {
+    return fkill(`:${port}`, { force: true }).catch((err) => {
       console.error(`Plasmic: Failed to kill dev server: ${err}`);
     });
   };
   const command2 = argv._.map((x) => `${x}`);
   console.log(`Plasmic: Running command: ${command2.join(" ")}`);
-  const commandProcess = import_child_process.default.spawn(command2[0], command2.slice(1), {
+  const commandProcess = (0, import_cross_spawn.spawn)(command2[0], command2.slice(1), {
     env: {
       ...import_process.default.env,
       PLASMIC_PREPASS_HOST: `http://localhost:${port}`
@@ -7618,11 +7616,15 @@ async function main() {
   commandProcess.stderr?.pipe(import_process.default.stderr);
   commandProcess.on("error", (err) => {
     console.error(`Plasmic: Command error: ${err}`);
-    killDevServer();
+    killDevServer().then(() => {
+      import_process.default.exit(commandProcess.exitCode ?? void 0);
+    });
   });
   commandProcess.on("exit", () => {
     console.log(`Plasmic: Command finished; killing prepass dev server...`);
-    killDevServer();
+    killDevServer().then(() => {
+      import_process.default.exit(void 0);
+    });
   });
 }
 if (require.main === module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plasmicapp/nextjs-app-router",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
   "module": "./dist/index.esm.js",
@@ -27,6 +27,7 @@
   "dependencies": {
     "@plasmicapp/prepass": "1.0.17",
     "@plasmicapp/query": "0.1.79",
+    "cross-spawn": "^7.0.3",
     "fkill": "^8.1.0",
     "get-port": "^7.0.0",
     "node-html-parser": "^6.1.5",
@@ -65,6 +66,7 @@
     "access": "public"
   },
   "devDependencies": {
+    "@types/cross-spawn": "^6.0.6",
     "@types/node": "^20.8.9",
     "@types/react": "^18.0.27",
     "@types/yargs": "^17.0.32",
@@ -72,5 +74,5 @@
     "react": "^18.2.0",
     "typescript": "^5.2.2"
   },
-  "gitHead": "2f8ee12f8f9c75c0f0af3834b8302b0bea542cbd"
+  "gitHead": "9e7af0b37cc771d0189c30332d65b12cc891e48c"
 }