@zuplo/cli 1.81.0 → 1.83.0

package/dist/cmds/dev.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="e910dd81-7af4-5078-bc97-0a2561de6ce0")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="d957865b-71c7-52e9-907e-8620261193ad")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
@@ -17,11 +17,21 @@ export default {
             default: ".",
             normalize: true,
             hidden: true,
+        })
+            .option("start-editor", {
+            type: "boolean",
+            describe: "Start the editor with the local server",
+            default: true,
         })
             .option("port", {
             type: "number",
-            describe: "The port to run the zup on",
+            describe: "The port to run the local server on",
             default: 9000,
+        })
+            .option("editor-port", {
+            type: "number",
+            describe: "The port to run the route designer on",
+            default: 9100,
         })
             .middleware([setBlocking, identify])
             .check(async (argv) => {
@@ -34,4 +44,4 @@ export default {
     },
 };
 //# sourceMappingURL=dev.js.map
-//# debugId=e910dd81-7af4-5078-bc97-0a2561de6ce0
+//# debugId=d957865b-71c7-52e9-907e-8620261193ad

package/dist/cmds/editor.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="29e646b9-179b-5d9d-8e0f-c31b1185dfcf")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="39695608-20e6-59bb-8e32-8b6037d42575")}catch(e){}}();
 import { captureEvent } from "../common/analytics/lib.js";
 import { identify } from "../common/middleware/user-identification.js";
 import setBlocking from "../common/output.js";
@@ -16,7 +16,12 @@ export default {
             describe: "The directory containing your zup",
             default: ".",
             normalize: false,
-            hidden: false,
+            hidden: true,
+        })
+            .option("port", {
+            type: "number",
+            describe: "The port to run the route designer on",
+            default: "9100",
         })
             .middleware([setBlocking, identify])
             .check(async (argv) => {
@@ -29,4 +34,4 @@ export default {
     },
 };
 //# sourceMappingURL=editor.js.map
-//# debugId=29e646b9-179b-5d9d-8e0f-c31b1185dfcf
+//# debugId=39695608-20e6-59bb-8e32-8b6037d42575

package/dist/dev/handler.js

@@ -1,12 +1,14 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="c73be6b5-a5f8-54e9-8902-e6c42cb6b377")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="972fe043-9ee3-54a1-b4ff-beecb5715708")}catch(e){}}();
 import * as dotenv from "dotenv";
 import { cpSync, existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { locateDenoExecutable } from "../common/deno-utils/locator.js";
+import { logger } from "../common/logger.js";
 import { printDiagnosticsToConsole } from "../common/output.js";
+import { ApiServer } from "../editor/server/server.js";
 export async function dev(argv) {
     const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));
     const zuploRuntimePath = new URL("../../node_modules/@zuplo/runtime", import.meta.url);
@@ -17,17 +19,23 @@ export async function dev(argv) {
     }
     process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(new URL("../../node_modules", import.meta.url));
     process.env.DENO_EXECUTABLE = await locateDenoExecutable();
+    const loadedEnvFiles = [];
+    const envResult = dotenv.config();
+    if (envResult.error === undefined) {
+        loadedEnvFiles.push(".env");
+    }
     const envFile = join(sourceDirectory, ".env.zuplo");
     if (existsSync(envFile)) {
         const config = dotenv.parse(await readFile(envFile, "utf-8"));
         dotenv.populate(process.env, config);
+        loadedEnvFiles.push(".env.zuplo");
     }
     const config = {
         build_assets_url: pathToFileURL(sourceDirectory),
     };
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
     const core = await import("@zuplo/core");
-    const port = argv.port ?? 9000;
+    const port = argv.port;
     const serverProcess = await core.default.startDevServer({
         sourceDirectory,
         port,
@@ -37,18 +45,40 @@ export async function dev(argv) {
             disableIntegratedDevPortalBuild: false,
         },
     });
+    let editor;
+    if (argv["start-editor"]) {
+        editor = new ApiServer({
+            workingDir: sourceDirectory,
+            port: argv.editorPort,
+            isStandalone: false,
+        });
+        editor.start().catch(logger.error);
+    }
     printDiagnosticsToConsole("Started local development setup");
     printDiagnosticsToConsole("Ctrl+C to exit");
     printDiagnosticsToConsole("");
     printDiagnosticsToConsole(`🚀 Zuplo Gateway: http://localhost:${port}`);
+    if (argv["start-editor"]) {
+        printDiagnosticsToConsole(`📘 Route Designer: http://localhost:${argv.editorPort}`);
+    }
+    if (loadedEnvFiles.length > 0) {
+        printDiagnosticsToConsole(`⚙️  Loaded env files: \n    - ${loadedEnvFiles.join(" \n    - ")}`);
+    }
     printDiagnosticsToConsole("");
     printDiagnosticsToConsole("");
     return new Promise((resolve) => {
-        serverProcess.on("exit", () => {
+        async function exit() {
             printDiagnosticsToConsole("Closing local development setup");
-            resolve(void 0);
-        });
+            serverProcess.kill();
+            if (argv["start-editor"]) {
+                printDiagnosticsToConsole("Closing local route designer");
+                await editor.close();
+            }
+            resolve();
+        }
+        process.on("SIGTERM", exit);
+        process.on("SIGINT", exit);
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=c73be6b5-a5f8-54e9-8902-e6c42cb6b377
+//# debugId=972fe043-9ee3-54a1-b4ff-beecb5715708