@todesktop/cli 1.6.2-0 → 1.6.2-2

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: `{}`
@@ -721,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

@@ -1140,6 +1140,7 @@ ${output}`);
 };
 
 // src/utilities/projectConfig/addCustomKeywords.ts
+var import_valid = __toESM(require("semver/ranges/valid"));
 var addCustomKeywords_default = (ajv, context) => {
   const addKeyword = (def) => {
     const validate = (schema, data) => {
@@ -1155,6 +1156,21 @@ var addCustomKeywords_default = (ajv, context) => {
     };
     ajv.addKeyword({ ...def, validate });
   };
+  addKeyword({
+    keyword: "validSemver",
+    type: "string",
+    validate: (schema, data) => {
+      if (!(0, import_valid.default)(data)) {
+        throw new import_ajv2.ValidationError([
+          {
+            keyword: "validSemver",
+            message: `${data} must be a valid semantic version or version range`
+          }
+        ]);
+      }
+      return true;
+    }
+  });
   addKeyword({
     keyword: "excludedDependencies",
     validate: (schema, data) => {
@@ -1612,6 +1628,11 @@ var full_default = (context) => {
           }
         }
       },
+      nodeVersion: {
+        type: "string",
+        validSemver: {},
+        minLength: 1
+      },
       packageManager: {
         type: "string",
         enum: ["npm", "yarn", "pnpm"]
@@ -1698,7 +1719,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
+            }
+          }
         }
       }
     }
@@ -2107,6 +2136,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,
@@ -2238,7 +2273,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}`;
@@ -4156,7 +4192,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.6.1",
+  version: "1.6.2-1",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -4228,7 +4264,7 @@ var package_default = {
     "prop-types": "^15.7.2",
     react: "^17.0.2",
     "react-final-form": "^6.5.1",
-    semver: "^7.3.2",
+    semver: "^7.3.8",
     "source-map-support": "^0.5.21",
     "stream-to-array": "^2.3.0",
     superagent: "^7.1.3",
@@ -4236,7 +4272,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",