@todesktop/cli 1.9.4 → 1.9.5

package/README.md

@@ -90,9 +90,9 @@ To build your app, run the following command inside the root of your Electron pr
 todesktop build
 ```
 
-When prompted to login, use the email address and accessToken we would have provided you with. As this is in active beta, [contact us](mailto:hi@todesktop.com) if you do not yet have these credentials.
+When prompted to login, use your email address and the accessToken from our dashboard. You can retrieve your access token by clicking on your name in the top right corner of the dashboard and selecting "Manage Access Token".
 
-You app can then be downloaded and tested.
+Once built, your app can then be downloaded and tested.
 
 ### Step 5: Release your app
 
@@ -183,8 +183,8 @@ todesktop build --async --webhook https://example.com/build-finished-webhook
 
 The webhook receives a POST request with the following JSON body:
 
-```
-POST https://example.com/build-finished-webhook
+```js
+// POST https://example.com/build-finished-webhook
 {
   appId: string;
   accountUserEmail: string;
@@ -462,7 +462,7 @@ Example:
 ]
 ```
 
-- `ext` String | Array<String> - The extension (minus the leading period). e.g. png.
+- `ext` String | String[] - The extension (minus the leading period). e.g. png.
 - `name` String - The name. e.g. PNG. Defaults to value of `ext`.
 - `description` String - windows-only. The description.
 - `icon` String - macOS and windows. Icon file name without extension. It points
@@ -553,7 +553,7 @@ Whether to include **all** of the submodules node_modules directories
 ### `mac` - (optional) object
 
 Default: We have good default settings for Mac.
-Example: `{ "entitlements": "./entitlements.mac.plist"`.
+Example: `{ "entitlements": "./entitlements.mac.plist" }`.
 
 This object contains some options that only apply to the building & releasing for MacOS.
 
@@ -582,9 +582,16 @@ Example: `./entitlements.mac.plist`.
 
 The path to an entitlements file for signing your application. It must be a plist file.
 
+#### `mac.entitlementsInherit` - (optional) string
+
+Default: No entitlements file is provided by default.
+Example: `./entitlementsInherit.mac.plist`.
+
+The path to a child entitlements file for signing your application. It must be a plist file.
+
 #### `mac.extendInfo` - (optional) object
 
-Default: {}.
+Default: `{}`.
 Example: `{ "NSUserNotificationAlertStyle": "alert" }`.
 
 Extra entries for `Info.plist`.
@@ -1110,31 +1117,33 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
-## v1.9.5
+### v1.9.5
 
 - Add support for `mas.x64ArchFiles` in config.
+- Fix: Build is only recognised as ongoing if it was created in the last 24 hours.
+- Add support for `mac.entitlementsInherit` in config.
 
-## v1.9.4
+### v1.9.4
 
 - Fix: Mac URL download links are now formatted correctly.
 
-## v1.9.3
+### v1.9.3
 
 - Add support for `mas.entitlements` in config.
 - Add support for `mas.entitlementsInherit` in config.
 - Add support for `mas.provisioningProfile` in config. Removed `mac.provisioningProfile` as a result.
 
-## v1.9.2
+### v1.9.2
 
 - Add support for `mas.type` in config.
 - Add support for `mac.provisioningProfile` in config.
 - Add support for specifying `buildVersion` in config.
 
-## v1.9.1
+### v1.9.1
 
 - Add support for `includeSubNodeModules` in config.
 
-## v1.9.0
+### v1.9.0
 
 - You can now specify `@electron/rebuild` as a custom `rebuildLibrary` in your `todesktop.json` file.
 
@@ -1164,7 +1173,7 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ### v1.7.4
 
-- Fix: Linux/Windows platform links no longer have mac/zip/{arch} added to the end of the download URL
+- Fix: Linux/Windows platform links no longer have mac/zip/\[arch\] added to the end of the download URL
 
 ### v1.7.3
 

package/dist/cli.js

@@ -837,7 +837,7 @@ var MainLayout = ({
       ...previousState,
       canCancelBuild: !import_is_ci3.default && isRawModeSupported && !isCancellingBuild && isBuildCancellable(build)
     }));
-  }, [build, isCancellingBuild]);
+  }, [build, isCancellingBuild, isRawModeSupported]);
   onInput(
     async (input, key) => {
       if (key.escape && canCancelBuild) {
@@ -1024,6 +1024,11 @@ function resolveConfigPaths({
     if (config2.mac.entitlements) {
       result.mac.entitlements = resolvePath(config2.mac.entitlements);
     }
+    if (config2.mac.entitlementsInherit) {
+      result.mac.entitlementsInherit = resolvePath(
+        config2.mac.entitlementsInherit
+      );
+    }
     if (config2.mac.requirements) {
       result.mac.requirements = resolvePath(config2.mac.requirements);
     }
@@ -1638,6 +1643,15 @@ var full_default = (context) => {
             },
             minLength: 1
           },
+          entitlementsInherit: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["plist"],
+              mustBeFile: true
+            },
+            minLength: 1
+          },
           extendInfo: {
             type: "object"
           },
@@ -2351,6 +2365,12 @@ async function uploadApplicationSource({
         to: path7.join("other", "mac", "entitlements.mac.plist")
       });
     }
+    if (config2.mac.entitlementsInherit) {
+      files.push({
+        from: config2.mac.entitlementsInherit,
+        to: path7.join("other", "mac", "entitlementsInherit.mac.plist")
+      });
+    }
     if (config2.mac.icon) {
       files.push({
         from: config2.mac.icon,
@@ -2880,7 +2900,7 @@ var LoginHOC = ({ children, isInteractive = true }) => {
       setEffectDone(true);
     }
     isAccessTokenValid();
-  }, []);
+  }, [isRawModeSupported]);
   if (error && isInteractive) {
     return /* @__PURE__ */ (0, import_jsx_runtime16.jsx)(ErrorDisplay, { error });
   }
@@ -3123,7 +3143,7 @@ var ViewBuild = ({ commandUsed, id, configPath }) => {
         firebaseUnsubscribe();
       }
     };
-  }, [id]);
+  }, [id, configPath]);
   (0, import_react12.useEffect)(() => {
     if (hasBuildEverFailed && shouldExitOnBuildFailure_default(build)) {
       setTimeout(() => exit(new Error("Build has failed")), 10);
@@ -3200,7 +3220,11 @@ var ViewBuild_default = ViewBuild;
 // src/commands/build/components/OngoingBuildGuard.tsx
 var import_is_ci5 = __toESM(require("is-ci"));
 var import_jsx_runtime20 = require("react/jsx-runtime");
-var OngoingBuildGuard = ({ children, commandUsed, configPath }) => {
+var OngoingBuildGuard = ({
+  children,
+  commandUsed,
+  configPath
+}) => {
   const { isRawModeSupported } = (0, import_ink20.useStdin)();
   const onInput = useInput_default();
   const exit = useExit_default();
@@ -3219,7 +3243,11 @@ var OngoingBuildGuard = ({ children, commandUsed, configPath }) => {
       try {
         const applicationId = getProjectConfig(configPath).config.id;
         const { id } = await findAppUserId_default(applicationId);
-        const buildsResult = await firestore_default.doc(`users/${id}/applications/${applicationId}`).collection("builds").orderBy("createdAt", "desc").limit(10).get();
+        const now = new Date();
+        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 stateUpdates = {
           appId: applicationId,
           isLoading: false,
@@ -3250,7 +3278,7 @@ var OngoingBuildGuard = ({ children, commandUsed, configPath }) => {
         }));
       }
     })();
-  }, [builds, itemChosen, isLoading, isRawModeSupported]);
+  }, [builds, itemChosen, isLoading, isRawModeSupported, configPath]);
   if (isRawModeSupported) {
     onInput(() => {
     });
@@ -3264,9 +3292,9 @@ var OngoingBuildGuard = ({ children, commandUsed, configPath }) => {
   if (itemChosen) {
     logger_default.debug({ itemChosen }, "OngoingBuildGuard component: item chosen");
     const build = builds.find(Boolean);
-    if (itemChosen.value === "view") {
+    if (itemChosen.value === "view" && build) {
       return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ViewBuild_default, { commandUsed, id: build.id });
-    } else if (itemChosen.value === "cancel") {
+    } else if (itemChosen.value === "cancel" && build && appId) {
       return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(CancelBuild_default, { appId, commandUsed, id: build.id, children });
     } else if (itemChosen.value === "concurrent") {
       return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_jsx_runtime20.Fragment, { children });
@@ -3303,8 +3331,8 @@ var OngoingBuildGuard = ({ children, commandUsed, configPath }) => {
         /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(import_ink20.Text, { bold: true, children: multiple ? "There are ongoing builds " : "There is an ongoing build " }),
         /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_ink20.Text, { children: [
           "(",
-          latestBuild.appName,
-          latestBuild.appVersion ? ` v${latestBuild.appVersion}` : "",
+          latestBuild == null ? void 0 : latestBuild.appName,
+          (latestBuild == null ? void 0 : latestBuild.appVersion) ? ` v${latestBuild.appVersion}` : "",
           ")"
         ] })
       ] }),
@@ -3764,7 +3792,10 @@ var ViewBuilds = ({
     isInitialLoadComplete,
     isLoading,
     projectConfig,
-    startAfter
+    startAfter,
+    configPath,
+    format,
+    count
   ]);
   (0, import_react16.useEffect)(() => {
     if (!hasMoreToLoad) {
@@ -5254,7 +5285,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.9.3",
+  version: "1.9.4",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5275,6 +5306,7 @@ var package_default = {
     "build:dev": "esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli dev.env .env",
     lint: "npm run lint:types && npm run lint:styles",
     "lint:styles": "eslint src test .eslintrc.js && prettier --check .",
+    format: "prettier --write .",
     "lint:types": "tsc && tsc-strict",
     "lint--fix": "eslint src test --fix",
     release: "npm run build && npx np --tag=latest",
@@ -5335,8 +5367,9 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.188.30",
+    "@todesktop/shared": "^7.188.64",
     "@types/bunyan": "^1.8.6",
+    "@types/is-ci": "^3.0.4",
     "@types/node": "^20.8.4",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.1",