@todesktop/cli 1.18.1 → 1.18.3

package/README.md

@@ -11,6 +11,7 @@ For more information, visit the project
 - [Installation](#installation)
 - [Get started](#get-started)
 - [CLI commands](#cli-commands)
+- [Release Webhooks](#release-webhooks)
 - [Automating your builds (CI)](#automating-your-builds-ci)
 - [Project configuration (todesktop.json, todesktop.js, or todesktop.ts)](#project-configuration-todesktopjson-todesktopjs-or-todesktops)
 - [Build lifecycle hooks (package.json scripts)](#build-lifecycle-hooks-packagejson-scripts)
@@ -46,7 +47,7 @@ Create a `todesktop.json` file in the root of your Electron project.
 
 ```json
 {
-  "$schema": "https://unpkg.com/@todesktop/cli@1.18.0/schemas/schema.json",
+  "$schema": "https://unpkg.com/@todesktop/cli@1.18.3/schemas/schema.json",
   "schemaVersion": 1
   "id": "your-todesktop-id",
   "icon": "./desktop-icon.png",
@@ -201,6 +202,10 @@ We also support:
   - Append `--force` to skip the interactive confirmation step.
   - Append `--config=<path.to.config.file>` to use a different configuration
     file.
+  - **Note:** By default, apps can not be released via the CLI. For security
+    reasons, you can only release apps through the
+    [web UI](https://app.todesktop.com) with security token authentication. If
+    you wish to enable CLI releases, please contact support with your app ID.
 - `todesktop builds`. View your recent builds.
   - Use `todesktop builds <id>` to view a specific build and its progress.
   - `todesktop builds --latest` will show the latest build and it's progress.
@@ -232,12 +237,6 @@ TODESKTOP_ACCESS_TOKEN=accessToken
 TODESKTOP_EMAIL=email
 ```
 
-To build and release in one step, you can execute:
-
-```sh
-todesktop build && todesktop release --latest --force
-```
-
 If you need to run a build in the background, you can use the `--async` flag. To
 get notified when the build is finished you can optionally specify a webhook URL
 which will receive a POST request with the build data:
@@ -270,6 +269,15 @@ The webhook receives a POST request with the following JSON body:
 }
 ```
 
+## Release Webhooks
+
+You can configure a webhook URL to receive notifications when a release is
+published. This is useful for triggering downstream processes like deployment
+pipelines or notifications.
+
+You can read about how to do this in
+[our release webhooks guide](https://www.todesktop.com/electron/docs/guides/release-webhooks).
+
 ## Project configuration (todesktop.json, todesktop.js, or todesktop.ts)
 
 This describes all of the possible configuration options in your
@@ -311,7 +319,7 @@ To enable JSON validation and IntelliSense for your `todesktop.json` file in com
 - For example, if using a hosted version of the schema:
   ```json
   {
-    "$schema": "https://unpkg.com/@todesktop/cli@1.18.0/schemas/schema.json",
+    "$schema": "https://unpkg.com/@todesktop/cli@1.18.3/schemas/schema.json",
     "id": "your-todesktop-id"
   }
   ```
@@ -877,6 +885,12 @@ Example: `distribution`
 
 Whether to sign app for development or for distribution.
 
+#### `mas.minimumSystemVersion` - (optional) string
+
+Example: `12.0`, `11.0`, `10.15`
+
+The minimum macOS version required to run the app. Set to '12.0' or higher for arm64-only Mac App Store submissions.
+
 ### `mas.x64ArchFiles` - (optional) string
 
 Default: not defined
@@ -1517,6 +1531,18 @@ Now, when we build your app on ToDesktop servers, it will also run your custom
 
 ## Changelog
 
+### 1.18.3
+
+#### Patch Changes
+
+- 51821cc: Add support for pnpm workspace catalogs in workspace bundling
+
+### 1.18.2
+
+#### Patch Changes
+
+- 797f9cc: feat(mas): add `mas.minimumSystemVersion` config option
+
 ### 1.18.0
 
 #### Minor Changes

package/dist/cli.js

@@ -2158,6 +2158,12 @@ var schema_default = {
           examples: ["distribution"],
           default: "development"
         },
+        minimumSystemVersion: {
+          type: "string",
+          description: "The minimum macOS version required to run the app. Set to '12.0' or higher for arm64-only Mac App Store submissions.",
+          examples: ["12.0", "11.0", "10.15"],
+          pattern: "^[0-9]+\\.[0-9]+(\\.[0-9]+)?$"
+        },
         x64ArchFiles: {
           type: "string",
           description: "Minimatch pattern of paths that are allowed to be x64 binaries in both ASAR files.",
@@ -3069,12 +3075,17 @@ async function prepareWorkspaceBundle(input) {
       bundlePath,
       workspacePackage: pkg,
       bundledNames: bundledPackageNames,
-      contexts: bundledPackageContexts
+      contexts: bundledPackageContexts,
+      workspace
     });
     bundleEntries.push(...packageEntries.files);
     bundleEntries.push(packageEntries.packageJsonEntry);
   }
-  const rewrittenAppPkgJson = applyRewriteMap(appPkgJson, appRewriteMap);
+  const rewrittenAppPkgJson = applyRewriteMap(
+    appPkgJson,
+    appRewriteMap,
+    workspace.catalog
+  );
   logger_default.info(
     `Bundling ${sortedPackageNames.length} workspace package(s) from ${workspace.type} workspace at ${workspace.rootDir}`
   );
@@ -3161,7 +3172,7 @@ function createPnpmDefinition({
   pnpmFile,
   rootDir
 }) {
-  const packages = parsePnpmWorkspaceFile(pnpmFile);
+  const { packages, catalog } = parsePnpmWorkspaceFile(pnpmFile);
   if (!packages.length) {
     throw new Error(
       `pnpm workspace file at ${pnpmFile} does not define any packages.`
@@ -3171,7 +3182,8 @@ function createPnpmDefinition({
     globs: packages,
     rootDir,
     realRootDir: import_fs3.default.realpathSync(rootDir),
-    type: "pnpm"
+    type: "pnpm",
+    catalog
   };
 }
 function createNpmDefinition({
@@ -3203,8 +3215,13 @@ function parsePnpmWorkspaceFile(filePath) {
   const content = import_fs3.default.readFileSync(filePath, "utf8");
   const parsed = import_js_yaml.default.load(content);
   let packagesField;
+  let catalogField;
+  let catalogsField;
   if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-    packagesField = parsed.packages;
+    const parsedObj = parsed;
+    packagesField = parsedObj.packages;
+    catalogField = parsedObj.catalog;
+    catalogsField = parsedObj.catalogs;
   } else {
     packagesField = parsed;
   }
@@ -3219,7 +3236,26 @@ function parsePnpmWorkspaceFile(filePath) {
       `pnpm workspace file at ${filePath} does not define any packages.`
     );
   }
-  return packages;
+  const catalog = {};
+  if (catalogField && typeof catalogField === "object" && !Array.isArray(catalogField)) {
+    for (const [key, value] of Object.entries(catalogField)) {
+      if (typeof value === "string") {
+        catalog[key] = value;
+      }
+    }
+  }
+  if (catalogsField && typeof catalogsField === "object" && !Array.isArray(catalogsField)) {
+    for (const [catalogName, catalogContent] of Object.entries(catalogsField)) {
+      if (catalogContent && typeof catalogContent === "object" && !Array.isArray(catalogContent)) {
+        for (const [packageName, version] of Object.entries(catalogContent)) {
+          if (typeof version === "string") {
+            catalog[`${catalogName}:${packageName}`] = version;
+          }
+        }
+      }
+    }
+  }
+  return { packages, catalog };
 }
 function workspaceIncludesPath({
   appDir,
@@ -3391,7 +3427,7 @@ function getBundlePath(packageName) {
   }
   return packageName;
 }
-function applyRewriteMap(manifest, rewriteMap) {
+function applyRewriteMap(manifest, rewriteMap, catalog) {
   const clone = JSON.parse(JSON.stringify(manifest));
   const sections = [
     "dependencies",
@@ -3406,6 +3442,34 @@ function applyRewriteMap(manifest, rewriteMap) {
         sectionDeps[depName] = rewrite;
       }
     }
+    if (catalog) {
+      for (const [depName, spec] of Object.entries(sectionDeps)) {
+        if (typeof spec === "string" && spec.startsWith("catalog:")) {
+          let catalogKey;
+          if (spec === "catalog:") {
+            catalogKey = depName;
+          } else {
+            const catalogRef = spec.slice("catalog:".length);
+            const namedCatalogKey = `${catalogRef}:${depName}`;
+            if (catalog[namedCatalogKey]) {
+              catalogKey = namedCatalogKey;
+            } else {
+              catalogKey = catalogRef;
+            }
+          }
+          const resolvedVersion = catalog[catalogKey];
+          if (resolvedVersion) {
+            sectionDeps[depName] = resolvedVersion;
+          } else {
+            throw new Error(
+              `Catalog reference "${spec}" for dependency "${depName}" not found in pnpm catalog. Available catalog entries: ${Object.keys(
+                catalog
+              ).join(", ")}`
+            );
+          }
+        }
+      }
+    }
   }
   return clone;
 }
@@ -3413,7 +3477,8 @@ async function buildPackageEntries({
   bundlePath,
   workspacePackage,
   bundledNames,
-  contexts
+  contexts,
+  workspace
 }) {
   const packageDir = workspacePackage.dir;
   const { manifest } = workspacePackage;
@@ -3434,7 +3499,11 @@ async function buildPackageEntries({
   });
   const packageJsonEntry = {
     content: Buffer.from(
-      `${JSON.stringify(applyRewriteMap(manifest, rewrites), null, 2)}
+      `${JSON.stringify(
+        applyRewriteMap(manifest, rewrites, workspace.catalog),
+        null,
+        2
+      )}
 `
     ),
     to: import_path8.default.posix.join(BUNDLED_ROOT, bundlePath, "package.json")
@@ -3457,7 +3526,7 @@ async function gatherPackageFiles({
         const posixPattern = pattern.replace(/\\/g, "/");
         return [pattern, `${posixPattern}/**/*`];
       }
-    } catch {
+    } catch (_error) {
     }
     return [pattern];
   });
@@ -4143,7 +4212,10 @@ var Login = ({ setIsLoggedIn }) => {
     failureMessage && /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Error2, { errorMessage: failureMessage, marginTop: true })
   ] });
 };
-var Error2 = ({ errorMessage, marginTop }) => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Box, { marginTop: marginTop ? 1 : 0, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { color: "red", children: errorMessage }) });
+var Error2 = ({
+  errorMessage,
+  marginTop
+}) => /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Box, { marginTop: marginTop ? 1 : 0, children: /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(import_ink14.Text, { color: "red", children: errorMessage }) });
 Error2.propTypes = {
   errorMessage: import_prop_types8.default.string.isRequired,
   marginTop: import_prop_types8.default.bool
@@ -5444,7 +5516,10 @@ function BuildPicker({
   });
   function updateState(changes) {
     setState(
-      (previousState) => ({ ...previousState, ...changes })
+      (previousState) => ({
+        ...previousState,
+        ...changes
+      })
     );
     if (changes.state && ["error", "no-builds"].includes(changes.state)) {
       setTimeout(() => exit(), 10);
@@ -5987,7 +6062,10 @@ function ReleaseConfirmation({
   }, []);
   function updateState(changes) {
     setState(
-      (previousState) => ({ ...previousState, ...changes })
+      (previousState) => ({
+        ...previousState,
+        ...changes
+      })
     );
   }
   switch (state.state) {
@@ -6649,7 +6727,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.18.1",
+  version: "1.18.3",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",