@zuplo/cli 1.138.0 → 2.1.0

package/README.md

@@ -64,3 +64,12 @@ Commands:
   zup variable update      Updates an existing variable for a branch
 
 ```
+
+# Changelog
+
+## v2
+
+- Removes the use of Deno's test runner. We now use the built-in test runner in
+  Node.js. All features are preserved; however, the output of `zup test` follows
+  the Node.js
+  [spec reporter](https://nodejs.org/docs/latest-v18.x/api/test.html#test-reporters).

package/dist/test/esbuild-config.js

@@ -1,23 +1,24 @@
 
-!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]="f13aec76-f70a-5053-8b92-7e9a9134dbfc")}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]="5c127662-31c6-5178-a683-322b67f8580c")}catch(e){}}();
 import { TEST_OUT_FOLDER } from "../common/constants.js";
-import { denoTestPrepPlugin } from "./esbuild-plugins/deno-test-prep-plugin.js";
+import { nodeTestPrepPlugin } from "./esbuild-plugins/node-test-prep-plugin.js";
 export function generateBuildOptionsForTest(argv) {
     return {
         outdir: `${argv.dir}/${TEST_OUT_FOLDER}`,
+        external: ["chai", "dotenv/config", "node:test"],
+        platform: "node",
         bundle: true,
         treeShaking: true,
         format: "esm",
         outExtension: {
-            ".js": ".ts",
+            ".js": ".mjs",
         },
         plugins: [
-            denoTestPrepPlugin(argv, {
+            nodeTestPrepPlugin(argv, {
                 "@zuplo/test": "",
-                chai: "https://cdn.skypack.dev/chai@4.3.4?dts",
             }),
         ],
     };
 }
 //# sourceMappingURL=esbuild-config.js.map
-//# debugId=f13aec76-f70a-5053-8b92-7e9a9134dbfc
+//# debugId=5c127662-31c6-5178-a683-322b67f8580c

package/dist/test/esbuild-plugins/node-test-prep-plugin.js

@@ -0,0 +1,65 @@
+
+!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]="c847b970-590a-5cd3-b907-2b9fad49c028")}catch(e){}}();
+export function nodeTestPrepPlugin(argv, options) {
+    const aliases = Object.keys(options);
+    const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
+    return {
+        name: "alias",
+        setup(build) {
+            build.onResolve({ filter: re }, (args) => {
+                if (/@zuplo\/test/.test(args.path)) {
+                    return {
+                        path: args.path,
+                        namespace: "zuplo-url",
+                    };
+                }
+                else {
+                    return {
+                        path: options[args.path],
+                        namespace: "zuplo-url",
+                        external: true,
+                    };
+                }
+            });
+            build.onLoad({ filter: /.*/, namespace: "zuplo-url" }, (args) => {
+                if (/@zuplo\/test/.test(args.path)) {
+                    return { contents: generateTestContents(argv), loader: "ts" };
+                }
+            });
+        },
+    };
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function generateTestContents(argv) {
+    return `
+import 'dotenv/config'
+import { after, afterEach, describe, it, before, beforeEach } from "node:test"
+
+export class TestHelper {
+  static get TEST_URL() {
+    const url = "${argv.endpoint}";
+    if (url !== "undefined") {
+      return url;
+    }
+
+    throw new Error("TEST_URL is not set. Pass --endpoint <URL> to \`zuplo test\` on the CLI to set a value.");
+  }
+
+  static get environment() {
+      return process.env;
+  }
+}
+
+const afterAll = after;
+const beforeAll = before;
+
+describe.ignore = describe.skip;
+it.ignore = it.skip;
+
+export {afterAll, afterEach, beforeAll, beforeEach, describe, it};
+  `;
+}
+//# sourceMappingURL=node-test-prep-plugin.js.map
+//# debugId=c847b970-590a-5cd3-b907-2b9fad49c028

package/dist/test/handler.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]="1ca2f9a0-dd2a-5e05-9db2-0a83d26896ad")}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]="08888ef0-037c-5716-a727-dd52d53a2f00")}catch(e){}}();
 import fg from "fast-glob";
 import { rimrafSync } from "rimraf";
 import { TEST_IN_FOLDER, TEST_OUT_FOLDER } from "../common/constants.js";
@@ -25,4 +25,4 @@ export async function test(argv) {
     }
 }
 //# sourceMappingURL=handler.js.map
-//# debugId=1ca2f9a0-dd2a-5e05-9db2-0a83d26896ad
+//# debugId=08888ef0-037c-5716-a727-dd52d53a2f00

package/dist/test/invoke-test.js

@@ -1,28 +1,27 @@
 
-!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]="a86033b8-649a-53cf-9f24-6b9f118258b4")}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]="91819abd-e850-5b4f-83ac-b91327da0a26")}catch(e){}}();
 import { execa } from "execa";
 import { TEST_OUT_FOLDER } from "../common/constants.js";
-import { locateDenoExecutable, MissingDenoExecutableError, } from "../common/deno-utils/locator.js";
 import { logger } from "../common/logger.js";
+class MissingNodeExecutableError extends Error {
+    constructor() {
+        super("Missing executable: Cannot locate node executable");
+        Object.setPrototypeOf(this, MissingNodeExecutableError.prototype);
+    }
+}
 export async function runTests(argv) {
-    const denoExecutable = await locateDenoExecutable();
-    if (denoExecutable) {
-        const args = [
-            "test",
-            "--allow-env",
-            "--allow-net",
-            "--allow-read=.env,.env.defaults,.env.example,config/",
-            "--no-check",
-        ];
+    const nodeExecutable = process.platform === "win32" ? "node.exe" : "node";
+    if (nodeExecutable) {
+        const args = ["--test", "--test-reporter=spec"];
         if (argv.filter) {
-            args.push("--filter", argv.filter);
+            args.push("--test-name-pattern", argv.filter);
         }
         args.push(`${argv.dir}/${TEST_OUT_FOLDER}`);
-        const denoProcess = execa(denoExecutable, args);
-        denoProcess.stdout?.pipe(process.stdout);
-        denoProcess.stderr?.pipe(process.stderr);
+        const nodeProcess = execa(nodeExecutable, args);
+        nodeProcess.stdout?.pipe(process.stdout);
+        nodeProcess.stderr?.pipe(process.stderr);
         try {
-            const result = await denoProcess;
+            const result = await nodeProcess;
             return result;
         }
         catch (err) {
@@ -31,8 +30,8 @@ export async function runTests(argv) {
         }
     }
     else {
-        throw new MissingDenoExecutableError();
+        throw new MissingNodeExecutableError();
     }
 }
 //# sourceMappingURL=invoke-test.js.map
-//# debugId=a86033b8-649a-53cf-9f24-6b9f118258b4
+//# debugId=91819abd-e850-5b4f-83ac-b91327da0a26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.138.0",
+  "version": "2.1.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "description": "The command-line interface for Zuplo",
@@ -59,7 +59,6 @@
     "@sentry/node": "7.69.0",
     "@swc/core": "1.3.78",
     "@zuplo/core": "5.2458.0",
-    "@zuplo/deno-bin": "1.37.1",
     "@zuplo/pino-pretty-configurations": "^1.5.0",
     "@zuplo/runtime": "5.2458.0",
     "chalk": "^5.1.2",

package/dist/common/deno-utils/locator.js

@@ -1,29 +0,0 @@
-
-!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]="8edf8105-ebeb-518f-8885-8891eb778b11")}catch(e){}}();
-import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { logger } from "../logger.js";
-export class MissingDenoExecutableError extends Error {
-    constructor() {
-        super("Missing executable: Cannot locate deno executable");
-        Object.setPrototypeOf(this, MissingDenoExecutableError.prototype);
-    }
-}
-export async function locateDenoExecutable() {
-    return locateDeno(dirname(fileURLToPath(import.meta.url)));
-}
-export async function locateDeno(dir) {
-    const DENO_EXECUTABLE = process.platform === "win32" ? "deno.exe" : "deno";
-    if (dir === ".") {
-        return undefined;
-    }
-    const pathToDeno = resolve(dir, "node_modules", "@zuplo/deno-bin", "bin", DENO_EXECUTABLE);
-    if (await existsSync(pathToDeno)) {
-        logger.debug(`Path to deno: ${pathToDeno}`);
-        return pathToDeno;
-    }
-    return locateDeno(dirname(dir));
-}
-//# sourceMappingURL=locator.js.map
-//# debugId=8edf8105-ebeb-518f-8885-8891eb778b11

package/dist/test/esbuild-plugins/deno-test-prep-plugin.js

@@ -1,99 +0,0 @@
-
-!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]="327f255c-47ca-568f-9b06-a3716ca6b328")}catch(e){}}();
-export function denoTestPrepPlugin(argv, options) {
-    const aliases = Object.keys(options);
-    const re = new RegExp(`^(${aliases.map((x) => escapeRegExp(x)).join("|")})$`);
-    return {
-        name: "alias",
-        setup(build) {
-            build.onResolve({ filter: re }, (args) => {
-                if (/@zuplo\/test/.test(args.path)) {
-                    return {
-                        path: args.path,
-                        namespace: "deno-url",
-                    };
-                }
-                else {
-                    return {
-                        path: options[args.path],
-                        namespace: "deno-url",
-                        external: true,
-                    };
-                }
-            });
-            build.onLoad({ filter: /.*/, namespace: "deno-url" }, (args) => {
-                if (/@zuplo\/test/.test(args.path)) {
-                    return { contents: generateTestContents(argv), loader: "ts" };
-                }
-            });
-        },
-    };
-}
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function generateTestContents(argv) {
-    return `
-
-  // Load environment variables
-  import { load } from "https://deno.land/std@0.203.0/dotenv/mod.ts";
-  await load();
-
-  export class TestHelper {
-    static get TEST_URL() {
-      const url = "${argv.endpoint}";
-      if (url !== "undefined") {
-        return url;
-      }
-
-      throw new Error("TEST_URL is not set. Pass --endpoint <URL> to \`zuplo test\` on the CLI to set a value.");
-    }
-
-    static get environment() {
-      return Deno.env.toObject();
-    }
-  }
-
-  import {
-    afterAll,
-    afterEach,
-    beforeAll,
-    beforeEach,
-    describe as originalDescribe,
-    it,
-  } from "https://deno.land/std@0.203.0/testing/bdd.ts"; 
-
-  // We want to be able to disable test sanitizers by default to
-  // make tests easier/more familiar to write.
-  
-  function describe<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe(name, {
-      sanitizeExit: false,
-      sanitizeOps: false,
-      sanitizeResources: false,
-    }, fn);
-  }
-  
-  describe.only = function describeOnly<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe.only(name, fn);
-  };
-  
-  describe.ignore = function describeIgnore<T>(
-    name: string,
-    fn: () => void | Promise<void>,
-  ): TestSuite<T> {
-    return originalDescribe.ignore(name, fn);
-  };
-
-  export {afterAll, afterEach, beforeAll, beforeEach, describe, it};
-
-  `;
-}
-//# sourceMappingURL=deno-test-prep-plugin.js.map
-//# debugId=327f255c-47ca-568f-9b06-a3716ca6b328