@todesktop/cli 1.17.0 → 1.18.0

package/dist/cli.js

@@ -192,6 +192,11 @@ var firebaseApp = (0, import_app.initializeApp)({
 });
 var auth = (0, import_auth.getAuth)(firebaseApp);
 var db = (0, import_firestore.getFirestore)(firebaseApp);
+var _a;
+var [host, port] = ((_a = environmentVariables.TODESKTOP_CLI_FIRESTORE_HOST) == null ? void 0 : _a.split(":")) || [];
+if (host && port) {
+  (0, import_firestore.connectFirestoreEmulator)(db, host, Number.parseInt(port, 10));
+}
 var currentUser = () => {
   return auth.currentUser;
 };
@@ -199,7 +204,7 @@ var signInWithCustomToken = async (token) => {
   return (0, import_auth.signInWithCustomToken)(auth, token);
 };
 var onUserAuth = (handler) => (0, import_auth.onAuthStateChanged)(auth, (user) => {
-  handler(user != null ? user : {});
+  handler(user ?? {});
 });
 var firestore_default = db;
 
@@ -382,10 +387,10 @@ function fixMacUrl(url) {
 // src/components/BuildCompleteMessage.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
 var BuildCompleteMessage = ({ build }) => {
-  var _a;
+  var _a2;
   const exit = useExit_default();
   let url = build.standardUniversalDownloadUrl;
-  if (process.platform === "darwin" && ((_a = build.mac) == null ? void 0 : _a.standardDownloadUrl)) {
+  if (process.platform === "darwin" && ((_a2 = build.mac) == null ? void 0 : _a2.standardDownloadUrl)) {
     url = fixMacUrl(build.mac.standardDownloadUrl);
   }
   logForCI_default(`Build complete! ${url}`);
@@ -567,18 +572,18 @@ var import_ink5 = require("ink");
 var import_react3 = require("react");
 
 // src/utilities/CliError.ts
-var CliError = class extends Error {
+var CliError = class _CliError extends Error {
   constructor(message2, { cause, type = "error" } = {}) {
     super(message2, { cause });
     this.type = type;
   }
   static from(e, type = "error") {
     if (e instanceof Error) {
-      return new CliError(e.message, { cause: e, type });
+      return new _CliError(e.message, { cause: e, type });
     } else if (typeof e === "string") {
-      return new CliError(e, { type });
+      return new _CliError(e, { type });
     } else {
-      return new CliError(JSON.stringify(e), { type });
+      return new _CliError(JSON.stringify(e), { type });
     }
   }
 };
@@ -649,8 +654,9 @@ var app = (0, import_app2.initializeApp)({
   appId: env.TODESKTOP_CLI_FIREBASE_ID
 });
 var functions = (0, import_functions.getFunctions)(app);
-if (env.TODESKTOP_CLI_ENV === "development") {
-  const firebaseUrl = new URL(env.TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE);
+var firebaseFunctionsBase = env.TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE || "";
+if (firebaseFunctionsBase.includes("localhost")) {
+  const firebaseUrl = new URL(firebaseFunctionsBase);
   (0, import_functions.connectFunctionsEmulator)(
     functions,
     firebaseUrl.hostname,
@@ -1018,9 +1024,13 @@ async function postToFirebaseFunction_default(functionName, body = {}, config2 =
     { scrub: { functionName, body, config: config2 } },
     "postToFirebaseFunction"
   );
+  let baseUrl = TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE;
+  if (!baseUrl.endsWith("/")) {
+    baseUrl += "/";
+  }
   try {
     const response = await import_axios.default.post(
-      `${TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE}${functionName}`,
+      `${baseUrl}${functionName}`,
       body,
       config2
     );
@@ -1659,6 +1669,7 @@ var schema_default = {
         }
       }
     },
+    bytenode: { $ref: "#/definitions/bytenodeConfigProperty" },
     asar: { $ref: "#/definitions/asarProperty" },
     asarUnpack: { $ref: "#/definitions/asarUnpackProperty" },
     buildVersion: { $ref: "#/definitions/buildVersionProperty" },
@@ -1751,6 +1762,34 @@ var schema_default = {
       examples: ["com.microsoft.word"],
       default: "auto-generated"
     },
+    bytenodeConfigProperty: {
+      type: "object",
+      additionalProperties: false,
+      description: "Compile selected source files to .jsc using Bytenode during the build. Provide glob patterns relative to your appPath.",
+      default: { enabled: false },
+      properties: {
+        enabled: {
+          type: "boolean",
+          default: false,
+          description: "Enable Bytenode compilation."
+        },
+        files: {
+          type: "array",
+          items: { type: "string", minLength: 1 },
+          minItems: 1,
+          description: "Glob patterns relative to appPath for files to compile to Bytenode."
+        }
+      },
+      allOf: [
+        {
+          if: {
+            properties: { enabled: { const: true } },
+            required: ["enabled"]
+          },
+          then: { required: ["files"] }
+        }
+      ]
+    },
     appFilesProperty: {
       type: "array",
       description: "This option allows you to decide which files get uploaded to be built on the ToDesktop servers. By default, all files in your app path are included in your app, except for `node_modules` and `.git`. Dependencies are installed on our build servers as there could be platform-specific postinstall steps.",
@@ -2434,7 +2473,7 @@ var schema_default = {
           description: "The path to your application's Windows desktop icon. It must be an ICO, ICNS, or PNG.",
           examples: ["./icon.ico"],
           file: {
-            extensions: ["icns", "png", "icon"],
+            extensions: ["icns", "png", "ico"],
             mustBeFile: true
           },
           minLength: 3
@@ -2499,6 +2538,7 @@ var schema_default = {
           $ref: "#/definitions/appProtocolSchemeProperty"
         },
         appPath: { $ref: "#/definitions/appPathProperty" },
+        bytenode: { $ref: "#/definitions/bytenodeConfigProperty" },
         asar: { $ref: "#/definitions/asarProperty" },
         asarUnpack: { $ref: "#/definitions/asarUnpackProperty" },
         buildVersion: { $ref: "#/definitions/buildVersionProperty" },
@@ -2651,6 +2691,9 @@ function getProjectConfig(configPath, flags) {
   const config2 = computeFullProjectConfig(partialConfig, projectRoot, flags);
   validateConfig({ config: config2, projectRoot });
   const result = resolveConfigPaths({ config: config2, projectRoot });
+  if (process.env.TODESKTOP_CLI_APP_ID) {
+    result.id = process.env.TODESKTOP_CLI_APP_ID;
+  }
   return { config: result, unprocessedConfig: config2, projectRoot };
 }
 
@@ -2793,8 +2836,8 @@ function spyBuild() {
 function buildHasSettled(build) {
   return ["linux", "mac", "windows"].every(
     (platform) => {
-      var _a, _b, _c, _d, _e;
-      return ((_a = build[platform]) == null ? void 0 : _a.shouldSkip) || "succeeded" === ((_b = build[platform]) == null ? void 0 : _b.status) || "cancelled" === ((_c = build[platform]) == null ? void 0 : _c.status) || "failed" === ((_d = build[platform]) == null ? void 0 : _d.status) && ((_e = build[platform]) == null ? void 0 : _e.numberOfAttemptedBuilds) === 2;
+      var _a2, _b, _c, _d, _e;
+      return ((_a2 = build[platform]) == null ? void 0 : _a2.shouldSkip) || "succeeded" === ((_b = build[platform]) == null ? void 0 : _b.status) || "cancelled" === ((_c = build[platform]) == null ? void 0 : _c.status) || "failed" === ((_d = build[platform]) == null ? void 0 : _d.status) && ((_e = build[platform]) == null ? void 0 : _e.numberOfAttemptedBuilds) === 2;
     }
   );
 }
@@ -2938,7 +2981,7 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
     if (virtual) {
       stream.append(contentBuffer, {
         name: to,
-        mode: mode != null ? mode : 420
+        mode: mode ?? 420
       });
     } else if (isDirectory) {
       stream.directory(from, to);
@@ -2947,7 +2990,7 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
         name: to
       });
     } else {
-      stream.file(from, { name: to, mode: mode != null ? mode : stats.mode });
+      stream.file(from, { name: to, mode: mode ?? stats.mode });
     }
   });
   stream.finalize();
@@ -2977,9 +3020,9 @@ var DEFAULT_IGNORE_GLOBS = [
   "**/yarn-error.log"
 ];
 async function prepareWorkspaceBundle(input) {
-  var _a;
+  var _a2;
   const { config: config2, appPkgJson, appPath } = input;
-  if (!((_a = config2.bundleWorkspacePackages) == null ? void 0 : _a.enabled)) {
+  if (!((_a2 = config2.bundleWorkspacePackages) == null ? void 0 : _a2.enabled)) {
     return {
       appPackageJson: appPkgJson,
       entries: [],
@@ -3292,11 +3335,9 @@ function collectDependencyReferences({
   ];
   for (const section of sections) {
     const deps = manifest[section];
-    if (!deps)
-      continue;
+    if (!deps) continue;
     for (const [depName, spec] of Object.entries(deps)) {
-      if (typeof spec !== "string")
-        continue;
+      if (typeof spec !== "string") continue;
       const target = resolveWorkspaceTarget({
         depName,
         packageDir,
@@ -3364,8 +3405,7 @@ function applyRewriteMap(manifest, rewriteMap) {
   ];
   for (const section of sections) {
     const sectionDeps = clone[section];
-    if (!sectionDeps)
-      continue;
+    if (!sectionDeps) continue;
     for (const [depName, rewrite] of Object.entries(rewriteMap)) {
       if (sectionDeps[depName]) {
         sectionDeps[depName] = rewrite;
@@ -3459,7 +3499,7 @@ function buildRewriteMapForPackage({
   bundledNames,
   contexts
 }) {
-  var _a, _b;
+  var _a2;
   const rewriteMap = {};
   const sections = [
     "dependencies",
@@ -3468,13 +3508,11 @@ function buildRewriteMapForPackage({
   ];
   for (const section of sections) {
     const deps = manifest[section];
-    if (!deps)
-      continue;
+    if (!deps) continue;
     for (const [depName, spec] of Object.entries(deps)) {
-      if (typeof spec !== "string")
-        continue;
+      if (typeof spec !== "string") continue;
       if (bundledNames.has(depName)) {
-        const targetBundlePath = (_b = (_a = contexts.get(depName)) == null ? void 0 : _a.bundlePath) != null ? _b : getBundlePath(depName);
+        const targetBundlePath = ((_a2 = contexts.get(depName)) == null ? void 0 : _a2.bundlePath) ?? getBundlePath(depName);
         const fromPath = import_path8.default.posix.join(BUNDLED_ROOT, bundlePath);
         const toPath = import_path8.default.posix.join(BUNDLED_ROOT, targetBundlePath);
         const relative3 = import_path8.default.posix.relative(fromPath, toPath) || ".";
@@ -3574,7 +3612,7 @@ async function uploadApplicationSource({
   config: config2,
   onProgress
 }) {
-  var _a;
+  var _a2;
   logger_default.debug(
     {
       scrub: {
@@ -3765,7 +3803,7 @@ async function uploadApplicationSource({
     key: generateS3Key_default({
       appId,
       buildId,
-      filenameSuffix: `${(_a = effectiveAppPkgJson.name) == null ? void 0 : _a.replaceAll("/", "")}.zip`
+      filenameSuffix: `${(_a2 = effectiveAppPkgJson.name) == null ? void 0 : _a2.replaceAll("/", "")}.zip`
     }),
     onProgress({ loaded, total }) {
       onProgress(loaded / total * 100, loaded);
@@ -3787,9 +3825,9 @@ async function runBuild({
   updateState,
   flags
 }) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c, _d;
   logForCI_default("Getting application information...");
-  const primaryUserId = (_a = currentUser()) == null ? void 0 : _a.uid;
+  const primaryUserId = (_a2 = currentUser()) == null ? void 0 : _a2.uid;
   const { config: config2, unprocessedConfig } = getProjectConfig(configPath, {
     build: flags
   });
@@ -3884,9 +3922,9 @@ async function runBuild({
   }
 }
 function addErrorMessage(e, message2) {
-  var _a, _b;
+  var _a2, _b;
   let originalMessage = "";
-  if (import_axios2.default.isAxiosError(e) && ((_b = (_a = e.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message)) {
+  if (import_axios2.default.isAxiosError(e) && ((_b = (_a2 = e.response) == null ? void 0 : _a2.data) == null ? void 0 : _b.message)) {
     originalMessage = e.response.data.message;
   } else if (e instanceof Error) {
     originalMessage = e.message;
@@ -3909,7 +3947,7 @@ function Build({
   configPath,
   flags
 }) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a2, _b, _c, _d, _e, _f;
   const exit = useExit_default();
   const [state, setState] = (0, import_react6.useState)({ state: "initializing" });
   (0, import_react6.useEffect)(() => {
@@ -3919,8 +3957,8 @@ function Build({
       updateState({ state: "error", error });
     });
     return () => {
-      var _a2;
-      return (_a2 = state.onUnmount) == null ? void 0 : _a2.call(state);
+      var _a3;
+      return (_a3 = state.onUnmount) == null ? void 0 : _a3.call(state);
     };
   }, []);
   function updateState(changes) {
@@ -3943,7 +3981,7 @@ function Build({
       return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
         MainLayout_default,
         {
-          appName: state.build.appName || ((_a = state.appPkg) == null ? void 0 : _a.name) || "",
+          appName: state.build.appName || ((_a2 = state.appPkg) == null ? void 0 : _a2.name) || "",
           appVersion: state.build.appVersion || ((_b = state.appPkg) == null ? void 0 : _b.version) || "",
           build: state.build,
           commandUsed,
@@ -4023,8 +4061,7 @@ var loginFields = [
     placeholder: "name@email.com",
     Input: TextInput_default,
     validate: (value) => {
-      if (!value)
-        return "Required";
+      if (!value) return "Required";
     }
   },
   {
@@ -4033,8 +4070,7 @@ var loginFields = [
     placeholder: "********",
     Input: TextInput_default,
     validate: (value) => {
-      if (!value)
-        return "Required";
+      if (!value) return "Required";
     },
     mask: "*"
   }
@@ -4050,7 +4086,7 @@ var Login = ({ setIsLoggedIn }) => {
     setActiveField(0);
   };
   const onSubmitLogin = async ({ email, accessToken }) => {
-    var _a, _b;
+    var _a2, _b;
     setFailureMessage(null);
     setIsSubmittingForm(true);
     try {
@@ -4070,13 +4106,12 @@ var Login = ({ setIsLoggedIn }) => {
         setError(err);
       } else {
         onFailure(
-          `Login unsuccessful: ${((_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message) || err.message}`
+          `Login unsuccessful: ${((_b = (_a2 = err == null ? void 0 : err.response) == null ? void 0 : _a2.data) == null ? void 0 : _b.message) || err.message}`
         );
       }
     }
   };
-  if (error)
-    return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ErrorDisplay, { error });
+  if (error) return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(ErrorDisplay, { error });
   return /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(import_jsx_runtime14.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { children: "You are not currently logged in." }),
     /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { children: "Log in below:" }),
@@ -4162,8 +4197,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
           );
           if (newJwtToken) {
             userCreds = await signInWithCustomToken(newJwtToken);
-            if (userCreds.user)
-              setIsLoggedIn(true);
+            if (userCreds.user) setIsLoggedIn(true);
           }
         } else if (!isRawModeSupported || import_is_ci4.default) {
           setError(
@@ -4181,8 +4215,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
       try {
         if (!userCreds && jwtToken) {
           userCreds = await signInWithCustomToken(jwtToken);
-          if (userCreds.user)
-            setIsLoggedIn(true);
+          if (userCreds.user) setIsLoggedIn(true);
         }
       } catch (err) {
       }
@@ -4195,8 +4228,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
           if (newJwtToken) {
             userCreds = await signInWithCustomToken(newJwtToken);
             setAuthConfig(email, accessToken, newJwtToken);
-            if (userCreds.user)
-              setIsLoggedIn(true);
+            if (userCreds.user) setIsLoggedIn(true);
           }
         }
       } catch (err) {
@@ -4347,7 +4379,6 @@ var getCollection = async (collectionRef) => {
 };
 var acceptedUsersCollection = (id) => (0, import_firestore12.collection)(firestore_default, `users/${id}/acceptedUsers`);
 var findAppUserId = async (appId) => {
-  var _a;
   const authUser = currentUser();
   if (!(authUser == null ? void 0 : authUser.uid)) {
     throw new Error("A signed-in Firebase user is required");
@@ -4357,7 +4388,7 @@ var findAppUserId = async (appId) => {
   );
   const primaryUser = {
     id: authUser.uid,
-    label: (_a = authUser.email) != null ? _a : authUser.uid
+    label: authUser.email ?? authUser.uid
   };
   const users = [
     primaryUser,
@@ -4367,8 +4398,7 @@ var findAppUserId = async (appId) => {
     try {
       const docRef = (0, import_firestore12.doc)(firestore_default, `users/${user.id}/applications/${appId}`);
       const docSnap = await (0, import_firestore12.getDoc)(docRef);
-      if (docSnap.exists())
-        return user;
+      if (docSnap.exists()) return user;
     } catch (err) {
       console.error(err);
     }
@@ -4564,7 +4594,7 @@ var OngoingBuildGuard = ({
       try {
         const applicationId = getProjectConfig(configPath).config.id;
         const { id } = await findAppUserId_default(applicationId);
-        const now = new Date();
+        const now = /* @__PURE__ */ new Date();
         const twentyFourHoursAgo = new Date(
           now.getTime() - 24 * 60 * 60 * 1e3
         );
@@ -4983,7 +5013,7 @@ async function getBuilds({
 
 // src/utilities/getRelativeDateFromDateString.ts
 var dateFns = __toESM(require("date-fns"));
-var getRelativeDateFromDateString_default = (input) => dateFns.formatDistance(new Date(input), new Date()) + " ago";
+var getRelativeDateFromDateString_default = (input) => dateFns.formatDistance(new Date(input), /* @__PURE__ */ new Date()) + " ago";
 
 // src/components/SyntaxHighlight.tsx
 var import_chalk2 = __toESM(require("chalk"));
@@ -5358,7 +5388,6 @@ async function getBuildById({
   buildId,
   userId
 }) {
-  var _a;
   logger_default.debug({ appId, buildId }, "getBuildById");
   const snapshot = await (0, import_firestore19.getDoc)(
     (0, import_firestore19.doc)(firestore_default, `users/${userId}/applications/${appId}/builds/${buildId}`)
@@ -5366,7 +5395,7 @@ async function getBuildById({
   if (!snapshot.exists()) {
     return null;
   }
-  return (_a = readDocumentSnapshot(snapshot)) != null ? _a : null;
+  return readDocumentSnapshot(snapshot) ?? null;
 }
 
 // src/utilities/getLatestReleasedBuild.ts
@@ -5374,14 +5403,14 @@ async function getLatestReleasedBuild({
   appId,
   userId
 }) {
-  var _a, _b;
+  var _a2, _b;
   const appRef = (0, import_firestore21.doc)(firestore_default, `users/${userId}/applications/${appId}`);
   const appSnapshot = await (0, import_firestore21.getDoc)(appRef);
   const app2 = readDocumentSnapshot(appSnapshot);
   if (!app2) {
     throw new Error(`Application with ID of ${appId} doesn't exist.`);
   }
-  if ((_a = app2.meta) == null ? void 0 : _a.latestReleaseBuildId) {
+  if ((_a2 = app2.meta) == null ? void 0 : _a2.latestReleaseBuildId) {
     return await getBuildById({
       buildId: (_b = app2.meta) == null ? void 0 : _b.latestReleaseBuildId,
       appId,
@@ -5538,7 +5567,7 @@ async function getBuildAttributes({
   buildId,
   configPath
 }) {
-  var _a;
+  var _a2;
   const {
     id: appId,
     nodeVersion,
@@ -5546,7 +5575,7 @@ async function getBuildAttributes({
     pnpmVersion
   } = getProjectConfig(configPath).config;
   const { id: userId } = await findAppUserId_default(appId);
-  const contextUserId = (_a = currentUser()) == null ? void 0 : _a.uid;
+  const contextUserId = (_a2 = currentUser()) == null ? void 0 : _a2.uid;
   const build = await fetchBuild({ appId, buildId, userId });
   return {
     appId,
@@ -5625,7 +5654,7 @@ function ReleaseBuildView({
   commandUsed,
   state
 }) {
-  var _a, _b;
+  var _a2, _b;
   switch (state.state) {
     case "build-error": {
       return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
@@ -5633,7 +5662,7 @@ function ReleaseBuildView({
         {
           build: state.build,
           description: "Can't release build",
-          message: ((_a = state.error) == null ? void 0 : _a.message) || "Internal build error"
+          message: ((_a2 = state.error) == null ? void 0 : _a2.message) || "Internal build error"
         }
       );
     }
@@ -5736,7 +5765,7 @@ var defaultVM = {
   imageVersion: ""
 };
 function makeProgress(build) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a2, _b, _c, _d, _e, _f, _g;
   const defaultProgress = {
     message: "Starting",
     progress: 0,
@@ -5746,7 +5775,7 @@ function makeProgress(build) {
   };
   const linux = {
     ...defaultProgress,
-    ...(_a = build.smokeTest) == null ? void 0 : _a.linux,
+    ...(_a2 = build.smokeTest) == null ? void 0 : _a2.linux,
     shouldSkip: ((_b = build.linux) == null ? void 0 : _b.shouldSkip) || false
   };
   const mac = {
@@ -5960,7 +5989,7 @@ function ReleaseConfirmation({
   disabled = false,
   loadData = loadBuildsData
 }) {
-  var _a;
+  var _a2;
   const [state, setState] = (0, import_react20.useState)({
     state: disabled ? "bypass" : "loading"
   });
@@ -5985,7 +6014,7 @@ function ReleaseConfirmation({
         {
           build: state.build,
           description: "Can't release build",
-          message: ((_a = state.error) == null ? void 0 : _a.message) || "Internal build error"
+          message: ((_a2 = state.error) == null ? void 0 : _a2.message) || "Internal build error"
         }
       );
     }
@@ -6322,7 +6351,7 @@ function SmokeTestView({
   commandUsed = "",
   state
 }) {
-  var _a, _b, _c, _d;
+  var _a2, _b, _c, _d;
   switch (state.state) {
     case "build-error": {
       return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(
@@ -6330,7 +6359,7 @@ function SmokeTestView({
         {
           build: state.build,
           description: "Can't finish smoke test",
-          message: (_a = state.error) == null ? void 0 : _a.message
+          message: (_a2 = state.error) == null ? void 0 : _a2.message
         }
       );
     }
@@ -6379,12 +6408,12 @@ async function cancelSmokeTest({
   buildId,
   userId
 }) {
-  var _a;
+  var _a2;
   await postToFirebaseFunction_default("cancelSmokeTest_HTTP", {
     appId,
     buildId,
     userId,
-    idToken: await ((_a = currentUser()) == null ? void 0 : _a.getIdToken())
+    idToken: await ((_a2 = currentUser()) == null ? void 0 : _a2.getIdToken())
   });
 }
 
@@ -6398,7 +6427,7 @@ async function queueSmokeTest({
   pnpmVersion,
   userId
 }) {
-  var _a;
+  var _a2;
   try {
     await postToFirebaseFunction_default("queueSmokeTest_HTTP", {
       appId,
@@ -6408,7 +6437,7 @@ async function queueSmokeTest({
       pnpmVersion,
       userId,
       contextUserId,
-      idToken: await ((_a = currentUser()) == null ? void 0 : _a.getIdToken())
+      idToken: await ((_a2 = currentUser()) == null ? void 0 : _a2.getIdToken())
     });
   } catch (e) {
     logger_default.error({ error: e });
@@ -6567,8 +6596,8 @@ async function smokeTestWorkflow({
   }
 }
 function buildCanBeCanceled(build) {
-  var _a, _b;
-  if ((_a = build == null ? void 0 : build.smokeTest) == null ? void 0 : _a.isCanceled) {
+  var _a2, _b;
+  if ((_a2 = build == null ? void 0 : build.smokeTest) == null ? void 0 : _a2.isCanceled) {
     return false;
   }
   return Boolean((_b = build == null ? void 0 : build.smokeTest) == null ? void 0 : _b.buildServerExecutionId);
@@ -6637,7 +6666,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.15.2",
+  version: "1.18.0",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -6652,23 +6681,23 @@ var package_default = {
     node: ">=16"
   },
   scripts: {
-    dev: "cp-cli dev.env .env && npm run build:dev && npm link",
-    "dev:prod": "cp-cli prod.env .env && npm run build && npm link",
-    "dev:local:prod": "cp-cli prod-local.env .env && npm run build && npm link && cp-cli prod-local.env .env",
-    build: "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
-    "build:dev": "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli dev.env .env",
+    build: "scripts/esbuild.js",
+    dev: "scripts/esbuild.js --link --watch --stage dev",
+    "dev:local:prod": "scripts/esbuild.js --link --watch --stage prod-local",
+    "dev:prod": "scripts/esbuild.js --link --watch",
+    "docs:generate": "node scripts/generate-readme.js",
+    format: "prettier --write .",
     lint: "npm run lint:types && npm run lint:styles",
+    "lint--fix": "eslint src test --fix",
     "lint:styles": "eslint src test .eslintrc.js && prettier --check .",
-    format: "prettier --write .",
     "lint:types": "tsc && tsc-strict",
-    "lint--fix": "eslint src test --fix",
-    "docs:generate": "node scripts/generate-readme.js",
     "types:generate": "node scripts/generate-types.js",
-    release: "npm run docs:generate && npm run build && npx np --tag=latest",
+    release: "npm run docs:generate && npm run build && pnpx np --tag=latest",
     "release-beta": "npm run docs:generate && npm run build && npx np --any-branch --no-tests --tag=beta",
     test: "ava",
+    "test:e2e": "node test/output-snapshots/output.test.js",
     "test--watch": "npm test -- --watch",
-    postinstall: "node scripts/postinstall.js"
+    typecheck: "tsc --noEmit"
   },
   files: [
     "scripts/postinstall.js",
@@ -6723,6 +6752,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
+    "@todesktop/dev-config": "workspace:*",
     "@todesktop/shared": "^7.189.6",
     "@types/bunyan": "^1.8.6",
     "@types/is-ci": "^3.0.4",
@@ -6732,7 +6762,7 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^4.3.1",
     "cp-cli": "^2.0.0",
-    esbuild: "^0.16.5",
+    esbuild: "^0.25.10",
     "esbuild-register": "^3.4.1",
     eslint: "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
@@ -6754,7 +6784,7 @@ var package_default = {
     prettier: "^2.8.1",
     proxyquire: "^2.1.3",
     sinon: "^9.0.3",
-    typescript: "^4.9.4",
+    typescript: "catalog:",
     "typescript-strict-plugin": "^2.2.1"
   },
   ava: {
@@ -6788,18 +6818,6 @@ var package_default = {
       "pre-commit": "lint-staged"
     }
   },
-  overrides: {
-    pastel: {
-      "parcel-bundler": {
-        deasync: "0.1.27"
-      }
-    }
-  },
-  resolutions: {
-    "pastel/parcel-bundler/deasync": "0.1.24",
-    ink: "3.2.0",
-    react: "17.0.2"
-  },
   packageExtensions: {
     "ink-progress-bar@*": {
       dependencies: {