@todesktop/cli 1.9.2 → 1.9.3-0

package/README.md

@@ -597,13 +597,6 @@ Default: The root [`icon`](#icon---string) is used.
 
 The path to your application's Mac desktop icon. It must be an ICNS or PNG.
 
-#### `mac.provisioningProfile` - (optional) string
-
-Default: No provisioning profile is used by default.
-Example: `./mas.provisionprofile`.
-
-The path to a provisioning profile for authorizing your application. This is required for Mac App Store.
-
 #### `mac.requirements` - (optional) string
 
 Example: `./requirements.txt`.
@@ -618,6 +611,27 @@ 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"`
@@ -1089,6 +1103,12 @@ 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.

package/dist/cli.js

@@ -1024,11 +1024,6 @@ function resolveConfigPaths({
     if (config2.mac.entitlements) {
       result.mac.entitlements = resolvePath(config2.mac.entitlements);
     }
-    if (config2.mac.provisioningProfile) {
-      result.mac.provisioningProfile = resolvePath(
-        config2.mac.provisioningProfile
-      );
-    }
     if (config2.mac.requirements) {
       result.mac.requirements = resolvePath(config2.mac.requirements);
     }
@@ -1036,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);
@@ -1627,15 +1638,6 @@ var full_default = (context) => {
             },
             minLength: 1
           },
-          provisioningProfile: {
-            type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["provisionprofile"],
-              mustBeFile: true
-            },
-            minLength: 1
-          },
           extendInfo: {
             type: "object"
           },
@@ -1654,6 +1656,33 @@ 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"]
@@ -2319,12 +2348,6 @@ async function uploadApplicationSource({
         to: path9.join("other", "mac", "entitlements.mac.plist")
       });
     }
-    if (config2.mac.provisioningProfile) {
-      files.push({
-        from: config2.mac.provisioningProfile,
-        to: path9.join("other", "mac", "mas.provisionprofile")
-      });
-    }
     if (config2.mac.icon) {
       files.push({
         from: config2.mac.icon,
@@ -2338,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({
@@ -4308,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,
@@ -5201,7 +5251,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.9.1",
+  version: "1.9.2",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5282,7 +5332,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.188.18",
+    "@todesktop/shared": "^7.188.30",
     "@types/bunyan": "^1.8.6",
     "@types/node": "^20.8.4",
     "@types/react": "^18.0.26",