@todesktop/cli 1.6.1 → 1.6.2-1

package/README.md

@@ -320,8 +320,8 @@ The DMG windows position and size. In most cases, you will only want to specify
 
 ```
 {
-  "width": "400",
-  "height": "300"
+  "width": 400,
+  "height": 300
 }
 ```
 
@@ -530,6 +530,12 @@ Default: The root [`icon`](#icon---string) is used.
 
 The path to your application's Mac desktop icon. It must be an ICNS or PNG.
 
+### `nodeVersion` - string
+
+Example: `18.12.1`.
+
+The version of Node.js that ToDesktop should use to build your app.
+
 ### `packageJson` - (optional) object
 
 Default: `{}`
@@ -560,6 +566,14 @@ You can also set the version of a `dependency` (or `devDependency`), such as Ele
 }
 ```
 
+### `packageManager` - (optional) string
+
+Default: If `yarn.lock` exists, `yarn` is used. If `pnpm-lock.yaml` or `shrinkwrap.yaml` exists, `pnpm` is used. Otherwise, `npm` is used.
+
+Example: `yarn`
+
+The package manager to use when installing dependencies. Valid values are `npm`, `yarn` or `npm`.
+
 ### `schemaVersion` - number
 
 Example: `1`.
@@ -713,6 +727,14 @@ Default: The root [`icon`](#icon---string) is used.
 
 The path to your application's Windows desktop icon. It must be an ICO, ICNS, or PNG.
 
+#### `windows.nsisInclude` - (optional) string
+
+Example: `build/installer.nsh`.
+
+Default: `undefined`.
+
+The path to NSIS script to customize installer.
+
 ## Build lifecycle hooks (package.json scripts)
 
 Sometimes you want to do something before or during the build process. For example, you might want to run a script before the build starts, or you might want to run a script after the files have been packaged. Our lifecycle hooks provide a way to do this.

package/dist/cli.js

@@ -1034,6 +1034,7 @@ function resolveConfigPaths({
 var import_ajv3 = __toESM(require("ajv"));
 var import_ajv_formats2 = __toESM(require("ajv-formats"));
 var import_better_ajv_errors2 = __toESM(require("better-ajv-errors"));
+var import_ajv_semver = __toESM(require("ajv-semver"));
 
 // src/utilities/projectConfig/addCustomKeywords.ts
 var import_ajv2 = require("ajv");
@@ -1612,6 +1613,15 @@ var full_default = (context) => {
           }
         }
       },
+      nodeVersion: {
+        type: "string",
+        semver: { validRange: true },
+        minLength: 1
+      },
+      packageManager: {
+        type: "string",
+        enum: ["npm", "yarn", "pnpm"]
+      },
       schemaVersion: { type: "number", minimum: 1, maximum: 1 },
       snap: {
         type: "object",
@@ -1694,7 +1704,15 @@ var full_default = (context) => {
       windows: {
         type: "object",
         properties: {
-          icon: getIconSchema(["ico"])
+          icon: getIconSchema(["ico"]),
+          nsisInclude: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["nsh"],
+              mustBeFile: true
+            }
+          }
         }
       }
     }
@@ -1709,6 +1727,7 @@ function validateConfig({
   const context = { projectRoot };
   const schema = full_default(context);
   const ajv = new import_ajv3.default({ allErrors: true });
+  (0, import_ajv_semver.default)(ajv);
   (0, import_ajv_formats2.default)(ajv);
   addCustomKeywords_default(ajv, context);
   const validate = ajv.compile(schema);
@@ -2103,6 +2122,12 @@ var uploadApplicationSource_default = async ({ appId, appPkgJson, buildId, confi
         )
       });
     }
+    if (config2.windows.nsisInclude) {
+      files.push({
+        from: config2.windows.nsisInclude,
+        to: path8.join("other", "installer.nsh")
+      });
+    }
   }
   return uploadToS3_default({
     bucket: config2.bucket || void 0,
@@ -2234,7 +2259,8 @@ var runBuild_default = async ({ onEvent, shouldCodeSign = true, configPath }) =>
       appVersion: appPkgJson.version,
       buildId,
       userId: primaryUserId,
-      sourceArchiveDetails
+      sourceArchiveDetails,
+      nodeVersion: config2.nodeVersion
     });
   } catch (e) {
     e.message = `Failed while kicking off build; ${e.message}`;
@@ -4152,7 +4178,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.6.0",
+  version: "1.6.2-0",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -4190,6 +4216,7 @@ var package_default = {
     "@sentry/node": "^5.27.2",
     ajv: "^8.11.2",
     "ajv-formats": "^2.1.1",
+    "ajv-semver": "^1.0.5",
     "analytics-node": "^4.0.1",
     archiver: "^5.2.0",
     axios: "^0.21.1",
@@ -4232,7 +4259,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.147.0",
+    "@todesktop/shared": "^7.152.0",
     "@types/bunyan": "^1.8.6",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.1",