@zuplo/cli 1.109.0 → 1.111.0

package/dist/cli.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]="13f2d28d-a993-57e1-bc2e-1821b26c7cff")}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]="59466167-0404-586c-a0b1-a43e10b758a7")}catch(e){}}();
 import * as dotenv from "dotenv";
 dotenv.config();
 import * as Sentry from "@sentry/node";
@@ -23,6 +23,7 @@ import variable from "./cmds/variable/index.js";
 import { shutdownAnalytics } from "./common/analytics/lib.js";
 import { MAX_WAIT_PENDING_TIME_MS, SENTRY_DSN } from "./common/constants.js";
 import { logger } from "./common/logger.js";
+import { warnIfOutdatedVersion } from "./common/outdated.js";
 import { printCriticalFailureToConsoleAndExit } from "./common/output.js";
 const MIN_NODE_VERSION = "18.0.0";
 if (gte(process.versions.node, MIN_NODE_VERSION)) {
@@ -32,7 +33,7 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
     }
     catch (e) {
         logger.error(e);
-        printCriticalFailureToConsoleAndExit(`Unable to load @zuplo/cli. The package.json is missing or malformed.`);
+        await printCriticalFailureToConsoleAndExit(`Unable to load @zuplo/cli. The package.json is missing or malformed.`);
     }
     Sentry.init({
         dsn: SENTRY_DSN,
@@ -59,6 +60,7 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
         .help();
     try {
         await cli.argv;
+        void warnIfOutdatedVersion(packageJson?.version);
         void Sentry.close(MAX_WAIT_PENDING_TIME_MS).then(() => {
             process.exit(0);
         });
@@ -67,7 +69,7 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
         if (err instanceof Error) {
             Sentry.captureException(err);
         }
-        printCriticalFailureToConsoleAndExit(err.message ?? err);
+        await printCriticalFailureToConsoleAndExit(err.message ?? err);
         cli.showHelp();
     }
     finally {
@@ -75,9 +77,9 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
     }
 }
 else {
-    printCriticalFailureToConsoleAndExit(`The zup CLI requires at least node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of node.js.
+    await printCriticalFailureToConsoleAndExit(`The zup CLI requires at least node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of node.js.
 
     Consider using a Node.js version manager such as https://github.com/nvm-sh/nvm.`);
 }
 //# sourceMappingURL=cli.js.map
-//# debugId=13f2d28d-a993-57e1-bc2e-1821b26c7cff
+//# debugId=59466167-0404-586c-a0b1-a43e10b758a7

package/dist/common/constants.js

@@ -1,9 +1,10 @@
 
-!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]="8f9176c4-bdd2-5546-8161-2df78f8c8d2d")}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]="4daebd3e-ec9e-5f97-947a-e83332c8499e")}catch(e){}}();
 export const ZUPLO_PREFERRED_JSON_FILE = "zuplo.jsonc";
 export const ZUPLO_FALLBACK_JSON_FILE = "zuplo.json";
 export const ZUPLO_CLI_XDG_FOLDER_NAME = "zup";
 export const ZUPLO_AUTH_FILE_NAME = "auth.json";
+export const ZUPLO_VERSION_CHECK_FILE = "version.json";
 export const ZUPLO_SYSTEM_ENV_VAR = ".env.zuplo";
 export const DEPLOYER_METADATA_FILE = "deployer.json";
 export const ZUPLO_USER_ID_ARGV_KEY = "zuplo-user-id";
@@ -13,4 +14,4 @@ export const SENTRY_DSN = "https://28220fd3185a1281daff09ade2114dca@o1036703.ing
 export const MAX_WAIT_PENDING_TIME_MS = 1000;
 export const POST_HOG_CAPTURE_KEY = "phc_LDSwSTOvIjiDDZql2g54Q7xEXoQ0EN9RMYb3STbdz1V";
 //# sourceMappingURL=constants.js.map
-//# debugId=8f9176c4-bdd2-5546-8161-2df78f8c8d2d
+//# debugId=4daebd3e-ec9e-5f97-947a-e83332c8499e

package/dist/common/outdated.js

@@ -0,0 +1,70 @@
+
+!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]="f9015546-77f3-5e6e-9d05-4742665613e8")}catch(e){}}();
+import chalk from "chalk";
+import { existsSync, mkdirSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+import { gt } from "semver";
+import { ZUPLO_VERSION_CHECK_FILE } from "./constants.js";
+import { printWarningToConsole } from "./output.js";
+import box from "./utils/box.js";
+import { ZUPLO_XDG_STATE_HOME } from "./xdg/lib.js";
+export async function warnIfOutdatedVersion(currentVersion) {
+    if (!process.env.ZUPLO_OVERRIDE_CI_TO_TEST &&
+        (process.env.CI || process.env.ZUPLO_DISABLE_UPDATE_CHECK)) {
+        return false;
+    }
+    const versionCheckInfo = await getVersionCheckInfo();
+    const shouldWarn = gt(versionCheckInfo.latestVersion, currentVersion);
+    if (shouldWarn) {
+        printWarningToConsole(box(`Update available! ${chalk.gray(`v${currentVersion}`)} ≫ ${chalk.green(`v${versionCheckInfo.latestVersion}`)}
+Run ${chalk.cyan("npm install zuplo@latest")} to update.
+
+${chalk.gray("Older versions are unsupported and may not work as expected.")}`));
+    }
+    return shouldWarn;
+}
+async function getLatestVersion() {
+    const response = await fetch("https://raw.githubusercontent.com/zuplo/zuplo/main/packages/zuplo/package.json");
+    const result = await response.json();
+    return result.dependencies["@zuplo/cli"];
+}
+async function getVersionCheckInfo() {
+    if (!existsSync(ZUPLO_XDG_STATE_HOME)) {
+        mkdirSync(ZUPLO_XDG_STATE_HOME, { recursive: true });
+    }
+    const versionCheckPath = join(ZUPLO_XDG_STATE_HOME, ZUPLO_VERSION_CHECK_FILE);
+    let versionCheckInfo;
+    if (existsSync(versionCheckPath)) {
+        try {
+            versionCheckInfo = await readFile(versionCheckPath, "utf-8").then(JSON.parse);
+        }
+        catch (err) {
+        }
+        if (versionCheckInfo) {
+            if (typeof versionCheckInfo.lastCheck !== "number" ||
+                typeof versionCheckInfo.latestVersion !== "string") {
+                versionCheckInfo = undefined;
+            }
+        }
+    }
+    let shouldCheck = true;
+    if (versionCheckInfo) {
+        const now = Date.now();
+        const lastCheck = versionCheckInfo.lastCheck;
+        if (now - lastCheck < 1000 * 60 * 60 * 24) {
+            shouldCheck = false;
+        }
+    }
+    if (!versionCheckInfo || shouldCheck) {
+        const latestVersion = await getLatestVersion();
+        versionCheckInfo = {
+            lastCheck: Date.now(),
+            latestVersion,
+        };
+        await writeFile(versionCheckPath, JSON.stringify(versionCheckInfo), "utf-8");
+    }
+    return versionCheckInfo;
+}
+//# sourceMappingURL=outdated.js.map
+//# debugId=f9015546-77f3-5e6e-9d05-4742665613e8

package/dist/common/output.js

@@ -1,11 +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]="2df63d73-274e-5ba8-9b31-5a7a98c11051")}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]="c4c27bd6-8cfb-5bb5-86f6-e63b05aa573f")}catch(e){}}();
 import * as Sentry from "@sentry/node";
 import chalk from "chalk";
 import { MAX_WAIT_PENDING_TIME_MS } from "./constants.js";
 export function printDiagnosticsToConsole(message) {
     console.error(chalk.bold.blue(message));
 }
+export function printWarningToConsole(message) {
+    console.error(message);
+}
 export async function printCriticalFailureToConsoleAndExit(message) {
     console.error(chalk.bold.red(message));
     await Sentry.close(MAX_WAIT_PENDING_TIME_MS).then(() => {
@@ -51,4 +54,4 @@ export function textOrJson(text) {
     }
 }
 //# sourceMappingURL=output.js.map
-//# debugId=2df63d73-274e-5ba8-9b31-5a7a98c11051
+//# debugId=c4c27bd6-8cfb-5bb5-86f6-e63b05aa573f

package/dist/common/utils/box.js

@@ -0,0 +1,55 @@
+
+!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]="2581e0ba-5dec-5b76-8b00-e2ed57baadcf")}catch(e){}}();
+import chalk from "chalk";
+import stripAnsi from "strip-ansi";
+const border = ["─", "╭", "╮", "│", "│", "╰", "╯"];
+const nothing = ["─", "", "", "", "", "", ""];
+export default function box(message, { borderColor, padding = 1, textAlignment = "center", terminalColumns: cols = process.stdout.columns ||
+    (process.env.COLUMNS && parseInt(process.env.COLUMNS, 10)) ||
+    80, } = {}) {
+    const lines = message
+        .split(/\r?\n/)
+        .map((line) => [line, stripAnsi(line).length]);
+    const maxLine = lines.reduce((p, [, len]) => Math.max(p, len), 0);
+    const borderColorFn = (borderColor && chalk[borderColor]) || chalk.yellow;
+    const clampedSidePadding = Math.max(1, padding * 3);
+    const narrowMode = maxLine + 2 + clampedSidePadding * 2 > cols;
+    const sidePadding = narrowMode ? 0 : clampedSidePadding;
+    const innerWidth = Math.min(maxLine + sidePadding * 2, cols);
+    const [hr, topLeft, topRight, left, right, bottomLeft, bottomRight] = narrowMode ? nothing : border;
+    const spacerRow = narrowMode
+        ? "\n".repeat(padding)
+        : `${borderColorFn(`${left}${" ".repeat(innerWidth)}${right}`)}\n`.repeat(padding);
+    const renderLine = ([line, len]) => {
+        let leftPadding = 0;
+        let rightPadding = 0;
+        if (!narrowMode) {
+            leftPadding = sidePadding;
+            rightPadding = sidePadding;
+            if (textAlignment === "center") {
+                leftPadding += Math.floor((maxLine - len) / 2);
+                rightPadding += maxLine - len - leftPadding + sidePadding;
+            }
+            else if (textAlignment === "right") {
+                leftPadding += maxLine - len;
+            }
+            else if (textAlignment === "left") {
+                rightPadding += maxLine - len;
+            }
+        }
+        return (borderColorFn(left) +
+            " ".repeat(leftPadding) +
+            line +
+            " ".repeat(rightPadding) +
+            borderColorFn(right));
+    };
+    return (borderColorFn(`${topLeft}${hr.repeat(innerWidth)}${topRight}`) +
+        "\n" +
+        spacerRow +
+        lines.map(renderLine).join("\n") +
+        "\n" +
+        spacerRow +
+        borderColorFn(`${bottomLeft}${hr.repeat(innerWidth)}${bottomRight}`));
+}
+//# sourceMappingURL=box.js.map
+//# debugId=2581e0ba-5dec-5b76-8b00-e2ed57baadcf

package/dist/dev/handler.js

@@ -1,9 +1,8 @@
 
-!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]="7fbaf77e-7785-5c59-af8e-6a90090cfb6f")}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]="dde8dcee-5646-5949-b230-50ff08e9b24e")}catch(e){}}();
 import { cpSync, existsSync } from "node:fs";
 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";
@@ -17,7 +16,6 @@ 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 envFile = join(sourceDirectory, ".env");
     if (existsSync(envFile)) {
@@ -33,9 +31,10 @@ export async function dev(argv) {
     process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));
     const core = await import("@zuplo/core");
     const port = argv.port;
-    const serverProcess = await core.default.startDevServer({
+    await core.default.startDevServer({
         sourceDirectory,
         port,
+        devServerPort: undefined,
         generateSourceMaps: true,
         flags: {
             remoteModules: false,
@@ -67,7 +66,6 @@ export async function dev(argv) {
     return new Promise((resolve) => {
         async function exit() {
             printDiagnosticsToConsole("Closing local development setup");
-            serverProcess.kill();
             if (argv["start-editor"]) {
                 printDiagnosticsToConsole("Closing local route designer");
                 await editor.close();
@@ -79,4 +77,4 @@ export async function dev(argv) {
     });
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=7fbaf77e-7785-5c59-af8e-6a90090cfb6f
+//# debugId=dde8dcee-5646-5949-b230-50ff08e9b24e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.109.0",
+  "version": "1.111.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",
@@ -54,20 +54,20 @@
     "mocha": "^10.2.0",
     "openapi-types": "^12.1.3",
     "prettier-plugin-organize-imports": "^3.2.2",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "undici": "^6.10.1"
   },
   "dependencies": {
     "@fastify/cors": "^8.3.0",
     "@fastify/static": "^6.10.2",
-    "@google-cloud/tasks": "5.1.1",
     "@inquirer/prompts": "^3.0.4",
     "@opentelemetry/api": "^1.8.0",
     "@sentry/node": "7.69.0",
     "@swc/core": "1.3.78",
-    "@zuplo/core": "5.1982.0",
+    "@zuplo/core": "5.2074.0",
     "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
-    "@zuplo/runtime": "5.1982.0",
+    "@zuplo/runtime": "5.2074.0",
     "chalk": "^5.1.2",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",
@@ -91,9 +91,11 @@
     "rollup-plugin-node-polyfills": "^0.2.1",
     "semver": "^7.5.2",
     "simple-git": "^3.17.0",
+    "strip-ansi": "^7.1.0",
     "tar": "^6.1.13",
     "temp": "^0.9.4",
     "uuid": "^9.0.1",
+    "workerd": "1.20240405.0",
     "yargs": "^17.7.1"
   }
 }