@todesktop/cli 1.13.0-0 → 1.14.0

package/dist/cli.js

@@ -158,8 +158,9 @@ var init = () => {
   if (hasInitialized) {
     return;
   }
+  const envFile = process.env.NODE_ENV === "test" ? "../.env.test" : "../.env";
   import_dotenv.default.config({
-    path: import_path.default.resolve(__dirname, "../.env")
+    path: import_path.default.resolve(__dirname, envFile)
   });
   hasInitialized = true;
 };
@@ -169,11 +170,11 @@ var getEnvironmentVariables_default = () => {
 };
 
 // src/utilities/firestore.ts
-var import_app = __toESM(require("firebase/app"));
+var import_app = require("firebase/app");
 var import_firestore = require("firebase/firestore");
 var import_auth = require("firebase/auth");
 var environmentVariables = getEnvironmentVariables_default();
-var firebaseDB = import_app.default.initializeApp({
+var firebaseApp = (0, import_app.initializeApp)({
   apiKey: environmentVariables.TODESKTOP_CLI_FIREBASE_API_KEY,
   authDomain: environmentVariables.TODESKTOP_CLI_FIREBASE_AUTH_DOMAIN,
   databaseURL: environmentVariables.TODESKTOP_CLI_FIREBASE_DATABASE_URL,
@@ -182,14 +183,16 @@ var firebaseDB = import_app.default.initializeApp({
   messagingSenderId: environmentVariables.TODESKTOP_CLI_FIREBASE_MESSAGING_SENDER_ID,
   appId: environmentVariables.TODESKTOP_CLI_FIREBASE_ID
 });
-var currentUser = () => import_app.default.auth().currentUser;
+var auth = (0, import_auth.getAuth)(firebaseApp);
+var db = (0, import_firestore.getFirestore)(firebaseApp);
+var currentUser = () => auth.currentUser;
 var signInWithCustomToken = async (token) => {
-  return import_app.default.auth().signInWithCustomToken(token);
+  return (0, import_auth.signInWithCustomToken)(auth, token);
 };
-var onUserAuth = (handler) => import_app.default.auth().onAuthStateChanged((user) => {
+var onUserAuth = (handler) => (0, import_auth.onAuthStateChanged)(auth, (user) => {
   handler(user || {});
 });
-var firestore_default = firebaseDB.firestore();
+var firestore_default = db;
 
 // src/utilities/configStore.ts
 var fs2 = __toESM(require("fs"));
@@ -339,9 +342,6 @@ var useExit_default = () => {
   const { exit } = (0, import_ink.useApp)();
   return (error) => {
     logger_default.debug({ error }, "Exit called");
-    firestore_default.terminate().catch(
-      (e) => logger_default.error(e)
-    );
     let timeoutId;
     Promise.race([
       new Promise((resolve4) => flush(() => resolve4())),
@@ -624,14 +624,28 @@ var import_ink6 = require("ink");
 var import_react4 = require("react");
 
 // src/utilities/getCallableFirebaseFunction.ts
-var import_firebase = __toESM(require("firebase"));
 var import_functions = require("firebase/functions");
+var import_app2 = require("firebase/app");
 var env = getEnvironmentVariables_default();
+var app = (0, import_app2.initializeApp)({
+  apiKey: env.TODESKTOP_CLI_FIREBASE_API_KEY,
+  authDomain: env.TODESKTOP_CLI_FIREBASE_AUTH_DOMAIN,
+  databaseURL: env.TODESKTOP_CLI_FIREBASE_DATABASE_URL,
+  projectId: env.TODESKTOP_CLI_FIREBASE_PROJECT_ID,
+  storageBucket: env.TODESKTOP_CLI_FIREBASE_STORAGE_BUCKET,
+  messagingSenderId: env.TODESKTOP_CLI_FIREBASE_MESSAGING_SENDER_ID,
+  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);
-  import_firebase.default.functions().useFunctionsEmulator(firebaseUrl.origin);
+  (0, import_functions.connectFunctionsEmulator)(
+    functions,
+    firebaseUrl.hostname,
+    parseInt(firebaseUrl.port)
+  );
 }
-var getCallableFirebaseFunction_default = (functionName) => import_firebase.default.functions().httpsCallable(functionName);
+var getCallableFirebaseFunction_default = (functionName) => (0, import_functions.httpsCallable)(functions, functionName);
 
 // src/components/CancelBuild.tsx
 var import_jsx_runtime5 = require("react/jsx-runtime");
@@ -1535,8 +1549,8 @@ var schema_default = {
     extends: {
       type: "string",
       minLength: 1,
-      description: "This is the path to a base configuration file. This is especially useful for configuration sharing between staging and production builds. The base configuration file can be a relative path from the project root or an absolute path.",
-      examples: ["./todesktop.staging.json"],
+      description: "This is the path to a base configuration file (`.json` or `.js`). This is especially useful for configuration sharing between different environments (e.g., staging and production). The base configuration file can be a relative path from the project root or an absolute path.",
+      examples: ["./todesktop.base.json", "./todesktop.base.js"],
       default: null
     },
     extraContentFiles: { $ref: "#/definitions/extraContentFilesProperty" },
@@ -2496,10 +2510,10 @@ You can disable this error by running todesktop build with the --ignore-extends-
 function getProjectConfig(configPath, flags) {
   if (!configPath) {
     logger_default.debug("No config path provided, searching for one");
-    configPath = import_find_up.default.sync("todesktop.json");
+    configPath = import_find_up.default.sync(["todesktop.json", "todesktop.js"]);
     if (!configPath) {
       throw new Error(
-        "Can not find todesktop.json in this folder or any parent folders"
+        "Can not find todesktop.json or todesktop.js in this folder or any parent folders"
       );
     }
   } else {
@@ -2583,6 +2597,7 @@ var getVersionControlInfo_default = async (directory) => {
 
 // src/commands/build/utilities/spyBuild.ts
 var import_events = __toESM(require("events"));
+var import_firestore3 = require("firebase/firestore");
 function spyBuild() {
   const emitter = new import_events.default();
   let unsubscribeSnapshot;
@@ -2609,9 +2624,10 @@ function spyBuild() {
       userId
     }) {
       const buildPath = `users/${userId}/applications/${appId}/builds/${buildId}`;
-      unsubscribeSnapshot = firestore_default.doc(buildPath).onSnapshot(
+      unsubscribeSnapshot = (0, import_firestore3.onSnapshot)(
+        (0, import_firestore3.doc)(firestore_default, buildPath),
         (snapshot) => {
-          latestBuildDoc = snapshot.exists ? snapshot.data() : void 0;
+          latestBuildDoc = snapshot.exists() ? snapshot.data() : void 0;
           emitter.emit("update", {
             build: latestBuildDoc,
             snapshot
@@ -2686,9 +2702,10 @@ var uploadToS3 = async ({
   }
 }) => {
   const getSignedURL = getCallableFirebaseFunction_default("getSignedURL");
-  const { data } = await getSignedURL({
+  const result = await getSignedURL({
     key
   });
+  const data = result.data;
   const parts = await (0, import_stream_to_array.default)(inputStream);
   const buffers = parts.map(
     (part) => Buffer.isBuffer(part) ? part : Buffer.from(part)
@@ -3543,29 +3560,37 @@ var import_prop_types10 = __toESM(require("prop-types"));
 var import_react11 = require("react");
 
 // src/utilities/getLatestBuildId.ts
+var import_firestore8 = require("firebase/firestore");
 async function getLatestBuildId({
   appId,
   userId
 }) {
   logger_default.debug({ appId }, "getLatestBuildId");
-  const appRef = firestore_default.doc(`users/${userId}/applications/${appId}`);
-  const appSnapshot = await appRef.get();
-  if (!appSnapshot.exists) {
+  const appRef = (0, import_firestore8.doc)(firestore_default, `users/${userId}/applications/${appId}`);
+  const appSnapshot = await (0, import_firestore8.getDoc)(appRef);
+  if (!appSnapshot.exists()) {
     throw new Error(`Application with ID of ${appId} doesn't exist.`);
   }
-  const buildsResult = await appRef.collection("builds").orderBy("createdAt", "desc").limit(1).get();
+  const buildsQuery = (0, import_firestore8.query)(
+    (0, import_firestore8.collection)(firestore_default, `users/${userId}/applications/${appId}/builds`),
+    (0, import_firestore8.orderBy)("createdAt", "desc"),
+    (0, import_firestore8.limit)(1)
+  );
+  const buildsResult = await (0, import_firestore8.getDocs)(buildsQuery);
   return buildsResult.empty ? void 0 : buildsResult.docs[0].id;
 }
 
 // src/utilities/subscribeToFirebaseDoc.ts
+var import_firestore10 = require("firebase/firestore");
 async function subscribeToFirebaseDoc(key, receiver) {
   return new Promise((resolve4, reject) => {
     logger_default.debug({ key }, "subscribeToFirebaseDoc");
-    const unsubscribe = firestore_default.doc(key).onSnapshot(
+    const unsubscribe = (0, import_firestore10.onSnapshot)(
+      (0, import_firestore10.doc)(firestore_default, key),
       (snapshot) => {
         receiver({
           snapshot,
-          data: snapshot.exists ? snapshot.data() : void 0
+          data: snapshot.exists() ? snapshot.data() : void 0
         });
         resolve4(unsubscribe);
       },
@@ -3592,14 +3617,14 @@ var subscribeToBuild_default = async ({ appId, buildId, onDataReceived, userId }
 };
 
 // src/utilities/findAppUserId.ts
-var getCollection = (collectionRef) => {
-  return collectionRef.get().then((resp) => {
-    const result = [];
-    resp.forEach((doc) => result.push(doc.data()));
-    return result;
-  });
+var import_firestore12 = require("firebase/firestore");
+var getCollection = async (collectionRef) => {
+  const resp = await (0, import_firestore12.getDocs)(collectionRef);
+  const result = [];
+  resp.forEach((doc9) => result.push(doc9.data()));
+  return result;
 };
-var acceptedUsersCollection = (id) => firestore_default.collection(`users/${id}/acceptedUsers`);
+var acceptedUsersCollection = (id) => (0, import_firestore12.collection)(firestore_default, `users/${id}/acceptedUsers`);
 var findAppUserId = async (appId) => {
   const { uid, email } = currentUser();
   const acceptedUsers = await getCollection(acceptedUsersCollection(uid));
@@ -3610,8 +3635,9 @@ var findAppUserId = async (appId) => {
   ];
   for (const user of users) {
     try {
-      const doc = await firestore_default.doc(`users/${user.id}/applications/${appId}`).get();
-      if (doc.exists)
+      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;
     } catch (err) {
       console.error(err);
@@ -3782,6 +3808,7 @@ ViewBuild.propTypes = {
 var ViewBuild_default = ViewBuild;
 
 // src/commands/build/components/OngoingBuildGuard.tsx
+var import_firestore14 = require("firebase/firestore");
 var import_is_ci5 = __toESM(require("is-ci"));
 var import_jsx_runtime20 = require("react/jsx-runtime");
 var OngoingBuildGuard = ({
@@ -3811,7 +3838,16 @@ var OngoingBuildGuard = ({
         const twentyFourHoursAgo = new Date(
           now.getTime() - 24 * 60 * 60 * 1e3
         );
-        const buildsResult = await firestore_default.doc(`users/${id}/applications/${applicationId}`).collection("builds").where("createdAt", ">=", twentyFourHoursAgo).orderBy("createdAt", "desc").limit(10).get();
+        const buildsQuery = (0, import_firestore14.query)(
+          (0, import_firestore14.collection)(
+            firestore_default,
+            `users/${id}/applications/${applicationId}/builds`
+          ),
+          (0, import_firestore14.where)("createdAt", ">=", twentyFourHoursAgo),
+          (0, import_firestore14.orderBy)("createdAt", "desc"),
+          (0, import_firestore14.limit)(10)
+        );
+        const buildsResult = await (0, import_firestore14.getDocs)(buildsQuery);
         const stateUpdates = {
           appId: applicationId,
           isLoading: false,
@@ -3824,7 +3860,7 @@ var OngoingBuildGuard = ({
             { isRunning },
             "OngoingBuildGuard component: got latest build"
           );
-          stateUpdates.builds = buildsResult.docs.map((doc) => doc.data()).filter((build) => {
+          stateUpdates.builds = buildsResult.docs.map((doc9) => doc9.data()).filter((build) => {
             if (isBuildRunning(build) && build.status !== "preparation") {
               return true;
             }
@@ -4184,31 +4220,35 @@ var capitalize_default = (input) => {
 };
 
 // src/utilities/getBuilds.ts
+var import_firestore17 = require("firebase/firestore");
 async function getBuilds({
-  addWhereClauses = (collection) => collection,
+  addWhereClauses = () => [],
   userId,
   appId,
-  limit = 5,
+  limit: limit4 = 5,
   startAfter = null
 }) {
-  logger_default.debug({ appId, limit, startAfter }, "getBuilds");
-  const appRef = firestore_default.doc(`users/${userId}/applications/${appId}`);
-  const appSnapshot = await appRef.get();
-  if (!appSnapshot.exists) {
+  logger_default.debug({ appId, limit: limit4, startAfter }, "getBuilds");
+  const appRef = (0, import_firestore17.doc)(firestore_default, `users/${userId}/applications/${appId}`);
+  const appSnapshot = await (0, import_firestore17.getDoc)(appRef);
+  if (!appSnapshot.exists()) {
     throw new Error(`Application with ID of ${appId} doesn't exist.`);
   }
-  let query = addWhereClauses(appRef.collection("builds")).orderBy(
-    "createdAt",
-    "desc"
+  const buildsCollection = (0, import_firestore17.collection)(
+    firestore_default,
+    `users/${userId}/applications/${appId}/builds`
   );
+  const constraints = [...addWhereClauses(), (0, import_firestore17.orderBy)("createdAt", "desc")];
   if (startAfter) {
-    query = query.startAfter(startAfter);
+    constraints.push((0, import_firestore17.startAfter)(startAfter));
   }
-  const buildsResult = await query.limit(limit).get();
+  constraints.push((0, import_firestore17.limit)(limit4));
+  const query4 = (0, import_firestore17.query)(buildsCollection, ...constraints);
+  const buildsResult = await (0, import_firestore17.getDocs)(query4);
   if (buildsResult.empty) {
     return [];
   }
-  return buildsResult.docs.map((doc) => doc.data());
+  return buildsResult.docs.map((doc9) => doc9.data());
 }
 
 // src/utilities/getRelativeDateFromDateString.ts
@@ -4510,6 +4550,7 @@ var LogoutCommand_default = LogoutWrapper;
 // src/components/BuildPicker.tsx
 var import_ink29 = require("ink");
 var import_react17 = require("react");
+var import_firestore23 = require("firebase/firestore");
 
 // src/components/SelectTable.tsx
 var import_ink28 = require("ink");
@@ -4575,15 +4616,21 @@ SelectTable.propTypes = {
 };
 var SelectTable_default = SelectTable;
 
+// src/utilities/getLatestReleasedBuild.ts
+var import_firestore21 = require("firebase/firestore");
+
 // src/utilities/getBuildById.ts
+var import_firestore19 = require("firebase/firestore");
 async function getBuildById({
   appId,
   buildId,
   userId
 }) {
   logger_default.debug({ appId, buildId }, "getBuildById");
-  const snapshot = await firestore_default.doc(`users/${userId}/applications/${appId}/builds/${buildId}`).get();
-  if (!snapshot.exists) {
+  const snapshot = await (0, import_firestore19.getDoc)(
+    (0, import_firestore19.doc)(firestore_default, `users/${userId}/applications/${appId}/builds/${buildId}`)
+  );
+  if (!snapshot.exists()) {
     return null;
   }
   return snapshot.data();
@@ -4595,21 +4642,26 @@ async function getLatestReleasedBuild({
   userId
 }) {
   var _a, _b;
-  const appRef = firestore_default.doc(`users/${userId}/applications/${appId}`);
-  const appSnapshot = await appRef.get();
-  const app = appSnapshot.exists ? appSnapshot.data() : void 0;
-  if (!app) {
+  const appRef = (0, import_firestore21.doc)(firestore_default, `users/${userId}/applications/${appId}`);
+  const appSnapshot = await (0, import_firestore21.getDoc)(appRef);
+  const app2 = appSnapshot.exists() ? appSnapshot.data() : void 0;
+  if (!app2) {
     throw new Error(`Application with ID of ${appId} doesn't exist.`);
   }
-  if ((_a = app.meta) == null ? void 0 : _a.latestReleaseBuildId) {
+  if ((_a = app2.meta) == null ? void 0 : _a.latestReleaseBuildId) {
     return await getBuildById({
-      buildId: (_b = app.meta) == null ? void 0 : _b.latestReleaseBuildId,
+      buildId: (_b = app2.meta) == null ? void 0 : _b.latestReleaseBuildId,
       appId,
       userId
     }) || void 0;
   }
-  const buildsResult = await appRef.collection("builds").orderBy("releasedAt", "desc").limit(1).get();
-  return buildsResult.empty ? void 0 : buildsResult.docs[0];
+  const buildsQuery = (0, import_firestore21.query)(
+    (0, import_firestore21.collection)(firestore_default, `users/${userId}/applications/${appId}/builds`),
+    (0, import_firestore21.orderBy)("releasedAt", "desc"),
+    (0, import_firestore21.limit)(1)
+  );
+  const buildsResult = await (0, import_firestore21.getDocs)(buildsQuery);
+  return buildsResult.empty ? void 0 : buildsResult.docs[0].data();
 }
 
 // src/components/BuildPicker.tsx
@@ -4732,7 +4784,7 @@ async function getBuildItems({
   const { id: userId, label: userName } = await findAppUserId_default(appId);
   const latestReleasedBuild = await getLatestReleasedBuild({ appId, userId });
   const rawBuilds = await getBuilds({
-    addWhereClauses: (query) => query.where("status", "==", "succeeded"),
+    addWhereClauses: () => [(0, import_firestore23.where)("status", "==", "succeeded")],
     appId,
     limit: 50,
     userId
@@ -4802,7 +4854,7 @@ async function releaseBuild({
 }
 function isFirebaseFunctionError(error) {
   return Boolean(
-    typeof error === "object" && error && "code" in error && error.code === "string"
+    typeof error === "object" && error && "code" in error && typeof error.code === "string"
   );
 }
 
@@ -5629,6 +5681,7 @@ async function queueSmokeTest({
 }
 
 // src/commands/smoke-test/utilities/waitUntilFinished.ts
+var import_firestore27 = require("firebase/firestore");
 async function waitUntilFinished({
   appId,
   buildId,
@@ -5637,9 +5690,10 @@ async function waitUntilFinished({
 }) {
   const docPath = `users/${userId}/applications/${appId}/builds/${buildId}`;
   return new Promise((resolve4, reject) => {
-    const unsubscribe = firestore_default.doc(docPath).onSnapshot(
+    const unsubscribe = (0, import_firestore27.onSnapshot)(
+      (0, import_firestore27.doc)(firestore_default, docPath),
       (snapshot) => {
-        const data = snapshot.exists ? snapshot.data() : void 0;
+        const data = snapshot.exists() ? snapshot.data() : void 0;
         const progress = makeProgress(data);
         onProgress(progress);
         if (progress.isFinished) {
@@ -5790,17 +5844,17 @@ var import_ink38 = require("ink");
 var import_jsx_runtime45 = require("react/jsx-runtime");
 var WhoAmI = () => {
   const exit = useExit_default();
-  const auth = getAuthConfig();
+  const auth2 = getAuthConfig();
   const { hasAttemptedTracking } = useAnalyticsCommand("whoami", {}, {});
   (0, import_react23.useEffect)(() => {
     if (hasAttemptedTracking) {
       exit();
     }
   }, [exit, hasAttemptedTracking]);
-  if (!auth || !auth.email) {
+  if (!auth2 || !auth2.email) {
     return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_ink38.Text, { children: "You're not signed in" });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_ink38.Text, { children: auth.email });
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(import_ink38.Text, { children: auth2.email });
 };
 var WhoAmIWrapper = () => /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(ErrorBoundary_default, { children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(LoginHOC_default, { isInteractive: false, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(WhoAmI, {}) }) });
 var WhoamiCommand_default = WhoAmIWrapper;
@@ -5843,7 +5897,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.12.5",
+  version: "1.13.0",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5854,7 +5908,7 @@ var package_default = {
     todesktop: "./dist/cli.js"
   },
   engines: {
-    node: ">=12"
+    node: ">=16"
   },
   scripts: {
     dev: "cp-cli dev.env .env && npm run build:dev && npm link",
@@ -5900,7 +5954,7 @@ var package_default = {
     "fast-glob": "^3.2.4",
     "final-form": "^4.20.1",
     "find-up": "^5.0.0",
-    firebase: "^7.24.0",
+    firebase: "^11.9.1",
     "git-rev-sync": "^3.0.2",
     ink: "^3.2.0",
     "ink-gradient": "^2.0.0",