@todesktop/cli 1.7.3 → 1.7.5

package/README.md

@@ -548,12 +548,25 @@ 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.requirements` - (optional) string
+
+Example: `./requirements.txt`.
+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.
+
 ### `nodeVersion` - string
 
 Example: `18.12.1`.
 
 The version of Node.js that ToDesktop should use to build your app.
 
+### `npmVersion` - string
+
+Example: `9.8.1`.
+
+The version of NPM that ToDesktop should use for installation.
+
 ### `packageJson` - (optional) object
 
 Default: `{}`
@@ -590,7 +603,7 @@ Default: If `yarn.lock` exists, `yarn` is used. If `pnpm-lock.yaml` or `shrinkwr
 
 Example: `yarn`
 
-The package manager to use when installing dependencies. Valid values are `npm`, `yarn` or `npm`.
+The package manager to use when installing dependencies. Valid values are `npm`, `yarn` or `pnpm`.
 
 ### `schemaVersion` - number
 
@@ -849,10 +862,10 @@ const { writeFile } = require("fs/promises");
 module.exports = async ({ appOutDir, packager }) => {
   if (os.platform() === "darwin") {
     const appName = packager.appInfo.productFilename;
-    const appPath = path.join(`${appOutDir}`, `${APP_NAME}.app`);
+    const appPath = path.join(`${appOutDir}`, `${appName}.app`);
     await writeFile(
       path.join(appPath, "copyright.txt"),
-      `Copyright © ${new Date().getFullYear()} ${APP_NAME}`
+      `Copyright © ${new Date().getFullYear()} ${appName}`
     );
   }
 };
@@ -976,10 +989,28 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+### v1.7.5
+
+- Add support for specifying custom `npmVersion` in config
+- Add support for bundling a requirements file for Mac
+
+### v1.7.4
+
+- Fix: Linux/Windows platform links no longer have mac/zip/{arch} added to the end of the download URL
+
 ### v1.7.3
 
 - Add asar configuration support
 
+### v1.7.1
+
+- Add support for specifying custom `appBuilderLibVersion` in config
+- Show suggestion to run a Smoke Test when releasing an untested build
+
+### v1.7.0
+
+- Add `todesktop smoke-test` command
+
 ### v1.6.3
 
 - Add support for specifying custom `windows.nsisCustomBinary` in config

package/dist/cli.js

@@ -393,7 +393,7 @@ var PlatformProgress = ({
 }) => {
   let progressIndicator;
   if (activityType === "done") {
-    if (process.platform === "darwin") {
+    if (platform === "mac") {
       downloadUrl = import_path3.default.posix.join(downloadUrl, "mac", "zip", process.arch);
     }
     progressIndicator = /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink3.Box, { flexDirection: "column", marginBottom: 1, children: [
@@ -1012,6 +1012,9 @@ function resolveConfigPaths({
     if (config2.mac.entitlements) {
       result.mac.entitlements = resolvePath(config2.mac.entitlements);
     }
+    if (config2.mac.requirements) {
+      result.mac.requirements = resolvePath(config2.mac.requirements);
+    }
     if (config2.mac.icon) {
       result.mac.icon = resolvePath(config2.mac.icon);
     }
@@ -1591,7 +1594,16 @@ var full_default = (context) => {
           extendInfo: {
             type: "object"
           },
-          icon: getIconSchema()
+          icon: getIconSchema(),
+          requirements: {
+            type: "string",
+            file: {
+              from: context.projectRoot,
+              extensions: ["txt"],
+              mustBeFile: true
+            },
+            minLength: 1
+          }
         }
       },
       dmg: {
@@ -1637,6 +1649,11 @@ var full_default = (context) => {
         validSemver: {},
         minLength: 1
       },
+      npmVersion: {
+        type: "string",
+        validSemver: {},
+        minLength: 1
+      },
       appBuilderLibVersion: {
         type: "string",
         validSemver: {},
@@ -2135,6 +2152,12 @@ var uploadApplicationSource_default = async ({ appId, appPkgJson, buildId, confi
         to: path8.join("icons", "appIcon-mac" + path8.extname(config2.mac.icon))
       });
     }
+    if (config2.mac.requirements) {
+      files.push({
+        from: config2.mac.requirements,
+        to: path8.join("other", "mac", "requirements.txt")
+      });
+    }
   }
   if (config2.dmg) {
     if (config2.dmg.background) {
@@ -2293,6 +2316,7 @@ var runBuild_default = async ({ onEvent, shouldCodeSign = true, configPath }) =>
       userId: primaryUserId,
       sourceArchiveDetails,
       nodeVersion: config2.nodeVersion,
+      npmVersion: config2.npmVersion,
       appBuilderLibVersion: config2.appBuilderLibVersion
     });
   } catch (e) {
@@ -2759,6 +2783,7 @@ var findAppUserId = async (appId) => {
       if (doc.exists)
         return user;
     } catch (err) {
+      console.error(err);
     }
   }
   return primaryUser;
@@ -3882,10 +3907,23 @@ async function getBuildAttributes({
   buildId,
   configPath
 }) {
-  const { id: appId, nodeVersion } = getProjectConfig(configPath).config;
-  const userId = await fetchUserIdByAppId(appId);
+  const {
+    id: appId,
+    nodeVersion,
+    npmVersion
+  } = getProjectConfig(configPath).config;
+  const { id: userId } = await findAppUserId_default(appId);
+  const { uid: contextUserId } = currentUser();
   const build = await fetchBuild({ appId, buildId, userId });
-  return { appId, build, buildId, nodeVersion, userId };
+  return {
+    appId,
+    build,
+    buildId,
+    contextUserId,
+    nodeVersion,
+    npmVersion,
+    userId
+  };
 }
 async function fetchBuild({
   appId,
@@ -3898,14 +3936,6 @@ async function fetchBuild({
   }
   return build;
 }
-async function fetchUserIdByAppId(appId) {
-  try {
-    const { id: userId } = await findAppUserId_default(appId);
-    return userId;
-  } catch (e) {
-    throw new Error(`Can't fetch user for app ${appId}, ${e.message}`);
-  }
-}
 
 // src/commands/release/components/ReleaseBuild.tsx
 var import_jsx_runtime35 = require("react/jsx-runtime");
@@ -4534,7 +4564,9 @@ async function cancelSmokeTest({
 async function queueSmokeTest({
   appId,
   buildId,
+  contextUserId,
   nodeVersion,
+  npmVersion,
   userId
 }) {
   try {
@@ -4542,7 +4574,9 @@ async function queueSmokeTest({
       appId,
       buildId,
       nodeVersion,
-      userId
+      npmVersion,
+      userId,
+      contextUserId
     });
   } catch (e) {
     if (["failed-precondition", "not-found"].includes(e.code)) {
@@ -4651,14 +4685,21 @@ async function smokeTestWorkflow({
   updateState
 }) {
   try {
-    const { appId, build, nodeVersion, userId } = await getBuildAttributes({
+    const { appId, build, contextUserId, nodeVersion, npmVersion, userId } = await getBuildAttributes({
       buildId,
       configPath
     });
     updateState({ appId, build, userId });
     validateBuild(build);
     if (!abortSignal.aborted && !isTestRunning(build)) {
-      await queueSmokeTest({ appId, buildId, nodeVersion, userId });
+      await queueSmokeTest({
+        appId,
+        buildId,
+        nodeVersion,
+        npmVersion,
+        userId,
+        contextUserId
+      });
     }
     updateState({ state: "progress" });
     const { total } = await waitUntilFinished({
@@ -4750,7 +4791,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.7.2",
+  version: "1.7.4",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -4830,7 +4871,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.180.0",
+    "@todesktop/shared": "^7.186.3",
     "@types/bunyan": "^1.8.6",
     "@types/react": "^18.0.26",
     "@typescript-eslint/eslint-plugin": "^5.46.1",