@todesktop/cli 1.9.1 → 1.9.3-0

package/.env

@@ -1,7 +1,5 @@
 TODESKTOP_CLI_ENV=production
 TODESKTOP_CLI_S3_BUCKET=todesktop-builds-prod
-TODESKTOP_CLI_AWS_ACCESS_ID=AKIAS5AB4EBXRGDWLNWA
-TODESKTOP_CLI_AWS_ACCESS_SECRET=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
 TODESKTOP_CLI_FIREBASE_FUNCTIONS_BASE=https://us-central1-todesktop-prod1.cloudfunctions.net/
 TODESKTOP_CLI_FIREBASE_API_KEY=AIzaSyB3bfv74OgIezU160UPDVXDP6c1ApNfc6M
 TODESKTOP_CLI_FIREBASE_AUTH_DOMAIN=todesktop-prod1.firebaseapp.com

package/README.md

@@ -297,6 +297,12 @@ If you want to unpack only files that are required to be unpacked, you can set t
 
 You can also specify a list of glob patterns to unpack.
 
+### `buildVersion` - (optional) string
+
+Default: auto-generated from build id
+
+The build version. Maps to the CFBundleVersion on macOS, and FileVersion metadata property on Windows.
+
 ### `copyright` - (optional) string
 
 Default: The `package.json` [productName](#recommendations-for-app-packagejson) / `name`.
@@ -598,6 +604,41 @@ Default: No requirements file is used by default.
 
 The path to the [requirements file](https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/RequirementLang/RequirementLang.html) used when signing your application.
 
+### `mas` - (optional) object
+
+Default: We use default development settings for Mac App Store.
+Example: `{ "type": "development" }`.
+
+This object contains options that only apply to building the application for Mac App Store.
+
+#### `mas.entitlements` - (optional) string
+
+Default: No entitlements file is provided by default.
+Example: `./entitlements.mas.plist`.
+
+The path to an entitlements file for signing your application. It must be a plist file.
+
+#### `mas.entitlementsInherit` - (optional) string
+
+Default: No entitlements file is provided by default.
+Example: `./entitlementsInherit.mas.plist`.
+
+The path to a child entitlements file for signing your application. It must be a plist file.
+
+#### `mas.provisioningProfile` - (optional) string
+
+Default: No provisioning profile is used by default.
+Example: `./mas.provisionprofile`.
+
+The path to a provisioning profile for authorizing your application.
+
+#### `mas.type` - (optional) string
+
+Default: `"development"`
+Example: `"distribution"`.
+
+Whether to sign app for development or for distribution.
+
 ### `nodeVersion` - string
 
 Example: `18.12.1`.
@@ -1062,9 +1103,21 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+## 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
+
+- Add support for `mas.type` in config.
+- Add support for `mac.provisioningProfile` in config.
+- Add support for specifying `buildVersion` in config.
+
 ## v1.9.1
 
-- Add support for `includeSubNodeModules` in config
+- Add support for `includeSubNodeModules` in config.
 
 ## v1.9.0
 

package/dist/cli.js

@@ -946,6 +946,7 @@ Preparation.propTypes = {
 var Preparation_default = Preparation;
 
 // src/commands/build/utilities/runBuild.ts
+var import_axios2 = __toESM(require("axios"));
 var import_pretty_bytes = __toESM(require("pretty-bytes"));
 
 // src/utilities/postToFirebaseFunction.ts
@@ -1030,6 +1031,22 @@ function resolveConfigPaths({
       result.mac.icon = resolvePath(config2.mac.icon);
     }
   }
+  if (config2.mas) {
+    result.mas = { ...config2.mas };
+    if (config2.mas.entitlements) {
+      result.mas.entitlements = resolvePath(config2.mas.entitlements);
+    }
+    if (config2.mas.entitlementsInherit) {
+      result.mas.entitlementsInherit = resolvePath(
+        config2.mas.entitlementsInherit
+      );
+    }
+    if (config2.mas.provisioningProfile) {
+      result.mas.provisioningProfile = resolvePath(
+        config2.mas.provisioningProfile
+      );
+    }
+  }
   if (config2.dmg) {
     if (config2.dmg.background) {
       result.dmg.background = resolvePath(config2.dmg.background);
@@ -1500,6 +1517,7 @@ var full_default = (context) => {
           }
         ]
       },
+      buildVersion: { type: "string", minLength: 1 },
       copyright: { type: "string", minLength: 1 },
       electronMirror: {
         type: "string",
@@ -1635,6 +1653,42 @@ var full_default = (context) => {
           }
         }
       },
+      mas: {
+        type: "object",
+        properties: {
+          entitlements: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["plist"],
+              mustBeFile: true
+            },
+            minLength: 1
+          },
+          entitlementsInherit: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["plist"],
+              mustBeFile: true
+            },
+            minLength: 1
+          },
+          provisioningProfile: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["provisionprofile"],
+              mustBeFile: true
+            },
+            minLength: 1
+          },
+          type: {
+            type: "string",
+            enum: ["development", "distribution"]
+          }
+        }
+      },
       dmg: {
         type: "object",
         properties: {
@@ -2307,6 +2361,26 @@ async function uploadApplicationSource({
       });
     }
   }
+  if (config2.mas) {
+    if (config2.mas.entitlements) {
+      files.push({
+        from: config2.mas.entitlements,
+        to: path9.join("other", "mac", "entitlements.mas.plist")
+      });
+    }
+    if (config2.mas.entitlementsInherit) {
+      files.push({
+        from: config2.mas.entitlementsInherit,
+        to: path9.join("other", "mac", "entitlementsInherit.mas.plist")
+      });
+    }
+    if (config2.mas.provisioningProfile) {
+      files.push({
+        from: config2.mas.provisioningProfile,
+        to: path9.join("other", "mac", "mas.provisionprofile")
+      });
+    }
+  }
   if (config2.dmg) {
     if (config2.dmg.background) {
       files.push({
@@ -2463,8 +2537,11 @@ async function runBuild({
   }
 }
 function addErrorMessage(e, message2) {
+  var _a, _b;
   let originalMessage = "";
-  if (e instanceof Error) {
+  if (import_axios2.default.isAxiosError(e) && ((_b = (_a = e.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message)) {
+    originalMessage = e.response.data.message;
+  } else if (e instanceof Error) {
     originalMessage = e.message;
   } else if (e && typeof e === "object") {
     originalMessage = JSON.stringify(e);
@@ -2645,6 +2722,7 @@ var Login = ({ setIsLoggedIn }) => {
     setActiveField(0);
   };
   const onSubmitLogin = async ({ email, accessToken }) => {
+    var _a, _b;
     setFailureMessage(null);
     setIsSubmittingForm(true);
     try {
@@ -2663,7 +2741,9 @@ var Login = ({ setIsLoggedIn }) => {
       if (err.code === 500) {
         setError(err);
       } else {
-        onFailure(`Login unsuccessful: ${err.message}`);
+        onFailure(
+          `Login unsuccessful: ${((_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.message) || err.message}`
+        );
       }
     }
   };
@@ -2738,8 +2818,6 @@ var LoginHOC = ({ children, isInteractive = true }) => {
   const [isEffectDone, setEffectDone] = (0, import_react10.useState)(false);
   const [error, setError] = (0, import_react10.useState)(null);
   const { isRawModeSupported } = (0, import_ink16.useStdin)();
-  const { stdout } = (0, import_ink16.useStdout)();
-  const stdOutRedirected = !stdout.isTTY;
   const onFailure = (message2, err = {}) => {
     setError({
       ...err,
@@ -4273,13 +4351,20 @@ function isTestRunning(build) {
   const { isFinished } = makeProgress(build);
   return !isFinished;
 }
+var defaultVM = {
+  cpu: "",
+  agentVersion: "",
+  image: "",
+  imageVersion: ""
+};
 function makeProgress(build) {
   var _a, _b, _c, _d, _e, _f, _g;
   const defaultProgress = {
     message: "Starting",
     progress: 0,
     state: "progress",
-    shouldSkip: false
+    shouldSkip: false,
+    vm: defaultVM
   };
   const linux = {
     ...defaultProgress,
@@ -5166,7 +5251,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.9.0",
+  version: "1.9.2",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5182,6 +5267,7 @@ var package_default = {
   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: "esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
     "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",
@@ -5246,7 +5332,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.186.18",
+    "@todesktop/shared": "^7.188.30",
     "@types/bunyan": "^1.8.6",
     "@types/node": "^20.8.4",
     "@types/react": "^18.0.26",