@todesktop/cli 1.9.3 → 1.9.4

package/README.md

@@ -639,6 +639,13 @@ Example: `"distribution"`.
 
 Whether to sign app for development or for distribution.
 
+### `mas.x64ArchFiles` - (optional) string
+
+Default: not defined
+Example: `"Contents/Resources/foobar/**"`
+
+Minimatch pattern of paths that are allowed to be x64 binaries in both ASAR files.
+
 ### `nodeVersion` - string
 
 Example: `18.12.1`.
@@ -1103,6 +1110,14 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+## v1.9.5
+
+- Add support for `mas.x64ArchFiles` in config.
+
+## v1.9.4
+
+- Fix: Mac URL download links are now formatted correctly.
+
 ## v1.9.3
 
 - Add support for `mas.entitlements` in config.

package/dist/cli.js

@@ -325,20 +325,21 @@ var useExit_default = () => {
   };
 };
 
+// src/utilities/fixMacUrl.ts
+function fixMacUrl(url) {
+  const baseUrl = new URL(url);
+  baseUrl.pathname = `${baseUrl.pathname}/zip/${process.arch}`;
+  return baseUrl.href;
+}
+
 // src/components/BuildCompleteMessage.tsx
-var import_path2 = __toESM(require("path"));
 var import_jsx_runtime = require("react/jsx-runtime");
-var addTrailingSlash = (url) => {
-  return url.endsWith("/") ? url : `${url}/`;
-};
 var BuildCompleteMessage = ({ build }) => {
+  var _a;
   const exit = useExit_default();
   let url = build.standardUniversalDownloadUrl;
-  if (process.platform === "darwin") {
-    url = new URL(
-      import_path2.default.posix.join("mac", "zip", process.arch),
-      addTrailingSlash(url)
-    ).href;
+  if (process.platform === "darwin" && ((_a = build.mac) == null ? void 0 : _a.standardDownloadUrl)) {
+    url = fixMacUrl(build.mac.standardDownloadUrl);
   }
   logForCI_default(`Build complete! ${url}`);
   (0, import_react.useEffect)(() => {
@@ -361,7 +362,6 @@ var BuildCompleteMessage_default = BuildCompleteMessage;
 var import_prop_types2 = __toESM(require("prop-types"));
 var import_ink3 = require("ink");
 var import_ink_link2 = __toESM(require("ink-link"));
-var import_path3 = __toESM(require("path"));
 var import_jsx_runtime2 = require("react/jsx-runtime");
 var preLabelMaxWidth = "More info: ".length;
 var getProgressPercentageLabel = (percentage, activityType) => {
@@ -394,7 +394,7 @@ var PlatformProgress = ({
   let progressIndicator;
   if (activityType === "done") {
     if (platform === "mac") {
-      downloadUrl = import_path3.default.posix.join(downloadUrl, "mac", "zip", process.arch);
+      downloadUrl = fixMacUrl(downloadUrl);
     }
     progressIndicator = /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink3.Box, { flexDirection: "column", marginBottom: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_ink3.Text, { children: [
@@ -972,7 +972,7 @@ async function postToFirebaseFunction_default(functionName, body = {}, config2 =
 }
 
 // src/utilities/projectConfig/getProjectConfig.ts
-var import_path5 = require("path");
+var import_path3 = require("path");
 var import_fs = require("fs");
 var import_find_up = __toESM(require("find-up"));
 
@@ -982,14 +982,14 @@ function loadConfig(configPath) {
 }
 
 // src/utilities/projectConfig/resolveConfigPaths.ts
-var path5 = __toESM(require("path"));
+var path3 = __toESM(require("path"));
 function resolveConfigPaths({
   config: config2,
   projectRoot
 }) {
-  const appRoot = config2.appPath ? path5.isAbsolute(config2.appPath) ? config2.appPath : path5.join(projectRoot, config2.appPath) : projectRoot;
+  const appRoot = config2.appPath ? path3.isAbsolute(config2.appPath) ? config2.appPath : path3.join(projectRoot, config2.appPath) : projectRoot;
   const transformIfExists = (value, transformer) => value ? transformer(value) : void 0;
-  const resolvePath = (filePath) => path5.isAbsolute(filePath) ? filePath : path5.join(projectRoot, filePath);
+  const resolvePath = (filePath) => path3.isAbsolute(filePath) ? filePath : path3.join(projectRoot, filePath);
   const result = {
     ...config2,
     appPath: appRoot,
@@ -1070,7 +1070,7 @@ var import_better_ajv_errors2 = __toESM(require("better-ajv-errors"));
 var import_ajv2 = require("ajv");
 var import_email_regex = __toESM(require("email-regex"));
 var fs3 = __toESM(require("fs"));
-var path6 = __toESM(require("path"));
+var path4 = __toESM(require("path"));
 var import_parse_author = __toESM(require("parse-author"));
 var semver = __toESM(require("semver"));
 
@@ -1251,8 +1251,8 @@ var addCustomKeywords_default = (ajv, context) => {
           }
         ]);
       }
-      const filePath = path6.isAbsolute(data) ? data : path6.join(schema.from, data);
-      if (path6.relative(schema.from, filePath).startsWith("..")) {
+      const filePath = path4.isAbsolute(data) ? data : path4.join(schema.from, data);
+      if (path4.relative(schema.from, filePath).startsWith("..")) {
         throw new import_ajv2.ValidationError([
           {
             keyword: mustBeDirectory ? "Directory" : "File",
@@ -1260,11 +1260,11 @@ var addCustomKeywords_default = (ajv, context) => {
           }
         ]);
       }
-      if (schema.extensions && !schema.extensions.includes(path6.extname(filePath).substr(1))) {
+      if (schema.extensions && !schema.extensions.includes(path4.extname(filePath).substr(1))) {
         throw new import_ajv2.ValidationError([
           {
             keyword: "File extension",
-            message: `invalid. ${path6.extname(data)} Must be${schema.extensions > 1 ? "one of the following:" : ""} "${schema.extensions.join('", "')}"`
+            message: `invalid. ${path4.extname(data)} Must be${schema.extensions > 1 ? "one of the following:" : ""} "${schema.extensions.join('", "')}"`
           }
         ]);
       }
@@ -1293,8 +1293,8 @@ var addCustomKeywords_default = (ajv, context) => {
         ]);
       }
       if (schema.mustBeElectronApp) {
-        const appRoot = path6.resolve(filePath);
-        const pkgPath = path6.join(appRoot, "package.json");
+        const appRoot = path4.resolve(filePath);
+        const pkgPath = path4.join(appRoot, "package.json");
         if (!fs3.existsSync(pkgPath)) {
           throw new import_ajv2.ValidationError([
             {
@@ -1318,7 +1318,7 @@ var addCustomKeywords_default = (ajv, context) => {
         validatePackageJSON_default(pkg, pkgPath, context);
         const mainFilePath = pkg.main;
         if (mainFilePath) {
-          const resolvedMainFilePath = path6.join(appRoot, mainFilePath);
+          const resolvedMainFilePath = path4.join(appRoot, mainFilePath);
           if (!fs3.existsSync(resolvedMainFilePath)) {
             throw new import_ajv2.ValidationError([
               {
@@ -1328,7 +1328,7 @@ var addCustomKeywords_default = (ajv, context) => {
             ]);
           }
         } else {
-          if (!fs3.existsSync(path6.join(appRoot, "index.js"))) {
+          if (!fs3.existsSync(path4.join(appRoot, "index.js"))) {
             throw new import_ajv2.ValidationError([
               {
                 keyword: "App",
@@ -1686,6 +1686,9 @@ var full_default = (context) => {
           type: {
             type: "string",
             enum: ["development", "distribution"]
+          },
+          x64ArchFiles: {
+            type: "string"
           }
         }
       },
@@ -1890,7 +1893,7 @@ We made this change because Electron also uses the "productName" if it exists in
 }
 
 // src/utilities/projectConfig/computeFullProjectConfig.ts
-var import_path4 = require("path");
+var import_path2 = require("path");
 var import_lodash2 = __toESM(require("lodash.merge"));
 function computeFullProjectConfig(partialConfig, projectRoot) {
   if (!partialConfig.extends) {
@@ -1898,7 +1901,7 @@ function computeFullProjectConfig(partialConfig, projectRoot) {
     return partialConfig;
   } else {
     logger_default.debug("Extends field found, resolving");
-    const parentConfigPath = (0, import_path4.resolve)(projectRoot, partialConfig.extends);
+    const parentConfigPath = (0, import_path2.resolve)(projectRoot, partialConfig.extends);
     const parentConfig = loadConfig(parentConfigPath);
     parentConfig.appPath = parentConfig.appPath || ".";
     const parentFullConfig = computeFullProjectConfig(
@@ -1922,13 +1925,13 @@ function getProjectConfig(configPath) {
       );
     }
   } else {
-    configPath = (0, import_path5.resolve)(process.cwd(), configPath);
+    configPath = (0, import_path3.resolve)(process.cwd(), configPath);
     if (!(0, import_fs.existsSync)(configPath)) {
       logger_default.error("Provided config path does not exist");
       throw new Error(`Config file not found at ${configPath}`);
     }
   }
-  const projectRoot = (0, import_path5.dirname)(configPath);
+  const projectRoot = (0, import_path3.dirname)(configPath);
   const partialConfig = loadConfig(configPath);
   const config2 = computeFullProjectConfig(partialConfig, projectRoot);
   validateConfig({ config: config2, projectRoot });
@@ -1949,7 +1952,7 @@ var shouldExitOnBuildFailure_default = (build) => {
 
 // src/commands/build/utilities/getPackageJson.ts
 var import_lodash3 = __toESM(require("lodash.merge"));
-var import_path6 = __toESM(require("path"));
+var import_path4 = __toESM(require("path"));
 function deleteNullDeps(dep) {
   Object.keys(dep).forEach((key) => {
     if (dep[key] === null) {
@@ -1971,7 +1974,7 @@ function removeNullDependencies(pkgJson) {
 function getAppPkgJson({ config: config2 }) {
   const packageJsonFromConfig = config2.packageJson || {};
   const extendsFrom = packageJsonFromConfig.extends || "package.json";
-  const packageJsonFromFile = readJson(import_path6.default.join(config2.appPath, extendsFrom));
+  const packageJsonFromFile = readJson(import_path4.default.join(config2.appPath, extendsFrom));
   return removeNullDependencies(
     (0, import_lodash3.default)({}, packageJsonFromFile, packageJsonFromConfig)
   );
@@ -2069,7 +2072,7 @@ function buildHasSettled(build) {
 // src/commands/build/utilities/uploadApplicationSource.ts
 var import_fast_glob = __toESM(require("fast-glob"));
 var fs5 = __toESM(require("fs"));
-var path9 = __toESM(require("path"));
+var path7 = __toESM(require("path"));
 
 // src/commands/build/utilities/generateS3Key.ts
 var generateS3Key_default = ({ appId, buildId, filenameSuffix }) => `${appId}/sourceArchives/${buildId}--${filenameSuffix}`;
@@ -2131,7 +2134,7 @@ var import_archiver = __toESM(require("archiver"));
 var import_du = __toESM(require("du"));
 var import_fs2 = __toESM(require("fs"));
 var import_chalk = __toESM(require("chalk"));
-var import_path7 = __toESM(require("path"));
+var import_path5 = __toESM(require("path"));
 async function zip_default({
   files,
   fileSizeLimit = 20,
@@ -2186,7 +2189,7 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
   processedFiles.forEach(({ from, isDirectory, stats, to }) => {
     if (isDirectory) {
       stream.directory(from, to);
-    } else if (appPkgJson && to === import_path7.default.join("app", "package.json")) {
+    } else if (appPkgJson && to === import_path5.default.join("app", "package.json")) {
       stream.append(JSON.stringify(appPkgJson), {
         name: to
       });
@@ -2211,22 +2214,22 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   if (globsInput && globsInput.length) {
     globs.push(
       ...globsInput,
-      path9.join(appPath, "package.json"),
-      path9.join(appPath, "package-lock.json"),
-      path9.join(appPath, "yarn.lock"),
-      path9.join(appPath, "pnpm-lock.yaml"),
-      path9.join(appPath, "shrinkwrap.yaml")
+      path7.join(appPath, "package.json"),
+      path7.join(appPath, "package-lock.json"),
+      path7.join(appPath, "yarn.lock"),
+      path7.join(appPath, "pnpm-lock.yaml"),
+      path7.join(appPath, "shrinkwrap.yaml")
     );
   } else {
     globs.push("**");
   }
   for (const hookName of ["todesktop:beforeInstall", "todesktop:afterPack"]) {
     if (appPkgJson.scripts && appPkgJson.scripts[hookName]) {
-      globs.push(path9.join(appPath, appPkgJson.scripts[hookName]));
+      globs.push(path7.join(appPath, appPkgJson.scripts[hookName]));
     }
   }
   const normalizedGlobs = globs.map((glob) => {
-    const globToUse = path9.isAbsolute(glob) ? path9.relative(appPath, glob) : glob;
+    const globToUse = path7.isAbsolute(glob) ? path7.relative(appPath, glob) : glob;
     return globToUse.replace(/\\/g, "/").replace(/\/+$/, "");
   }).filter((glob) => !glob.startsWith("..") && !glob.startsWith("!.."));
   let absolutePaths = await (0, import_fast_glob.default)(normalizedGlobs, {
@@ -2241,7 +2244,7 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   });
   if (process.platform === "win32") {
     absolutePaths = absolutePaths.map(
-      (absolutePath) => absolutePath.replace(/\//g, path9.sep)
+      (absolutePath) => absolutePath.replace(/\//g, path7.sep)
     );
   }
   if (!absolutePaths || !absolutePaths.length) {
@@ -2253,21 +2256,21 @@ var getAppFiles = async (globsInput, appPath, appPkgJson) => {
   } else {
     let mainFilePath = appPath;
     if (appPkgJson.main) {
-      mainFilePath = path9.join(mainFilePath, appPkgJson.main);
+      mainFilePath = path7.join(mainFilePath, appPkgJson.main);
     }
     if (fs5.statSync(mainFilePath).isDirectory()) {
-      mainFilePath = path9.join(mainFilePath, "index.js");
+      mainFilePath = path7.join(mainFilePath, "index.js");
     }
     if (!absolutePaths.includes(mainFilePath)) {
       throw new Error(
-        `The "main" file specified in your package.json (${appPkgJson.main ? path9.relative(appPath, mainFilePath) : "defaults to index.js"}) is not set to be uploaded to our servers. This is likely due to how you have configured the \`appFiles\` option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
+        `The "main" file specified in your package.json (${appPkgJson.main ? path7.relative(appPath, mainFilePath) : "defaults to index.js"}) is not set to be uploaded to our servers. This is likely due to how you have configured the \`appFiles\` option. Learn more at https://www.npmjs.com/package/@todesktop/cli#appfiles----optional-array-of-glob-patterns. If this is not the case, please contact us.`
       );
     }
   }
   return absolutePaths.map((absolutePath) => {
     return {
       from: absolutePath,
-      to: path9.join("app", path9.relative(appPath, absolutePath))
+      to: path7.join("app", path7.relative(appPath, absolutePath))
     };
   });
 };
@@ -2294,27 +2297,27 @@ async function uploadApplicationSource({
     ...(config2.extraContentFiles || []).map(({ from, to = "." }) => {
       return {
         from,
-        to: path9.join("extraContentFiles", to, path9.basename(from))
+        to: path7.join("extraContentFiles", to, path7.basename(from))
       };
     }),
     ...(config2.extraResources || []).map(({ from, to = "." }) => {
       return {
         from,
-        to: path9.join("extraResources", to, path9.basename(from))
+        to: path7.join("extraResources", to, path7.basename(from))
       };
     }),
     {
       from: config2.icon,
-      to: path9.join("icons", "appIcon" + path9.extname(config2.icon))
+      to: path7.join("icons", "appIcon" + path7.extname(config2.icon))
     }
   ];
   if (config2.linux) {
     if (config2.linux.icon) {
       files.push({
         from: config2.linux.icon,
-        to: path9.join(
+        to: path7.join(
           "icons",
-          "appIcon-linux" + path9.extname(config2.linux.icon)
+          "appIcon-linux" + path7.extname(config2.linux.icon)
         )
       });
     }
@@ -2323,10 +2326,10 @@ async function uploadApplicationSource({
     const possibleIcons = [];
     for (const fa of config2.fileAssociations) {
       if (fa.icon) {
-        const icon = path9.parse(fa.icon);
+        const icon = path7.parse(fa.icon);
         possibleIcons.push(
-          { ext: fa.ext, icon: path9.join(icon.dir, icon.name) + ".ico" },
-          { ext: fa.ext, icon: path9.join(icon.dir, icon.name) + ".icns" }
+          { ext: fa.ext, icon: path7.join(icon.dir, icon.name) + ".ico" },
+          { ext: fa.ext, icon: path7.join(icon.dir, icon.name) + ".icns" }
         );
       }
     }
@@ -2335,7 +2338,7 @@ async function uploadApplicationSource({
         if (await exists(icon)) {
           files.push({
             from: icon,
-            to: path9.join("icons", "association-" + ext + path9.extname(icon))
+            to: path7.join("icons", "association-" + ext + path7.extname(icon))
           });
         }
       })
@@ -2345,19 +2348,19 @@ async function uploadApplicationSource({
     if (config2.mac.entitlements) {
       files.push({
         from: config2.mac.entitlements,
-        to: path9.join("other", "mac", "entitlements.mac.plist")
+        to: path7.join("other", "mac", "entitlements.mac.plist")
       });
     }
     if (config2.mac.icon) {
       files.push({
         from: config2.mac.icon,
-        to: path9.join("icons", "appIcon-mac" + path9.extname(config2.mac.icon))
+        to: path7.join("icons", "appIcon-mac" + path7.extname(config2.mac.icon))
       });
     }
     if (config2.mac.requirements) {
       files.push({
         from: config2.mac.requirements,
-        to: path9.join("other", "mac", "requirements.txt")
+        to: path7.join("other", "mac", "requirements.txt")
       });
     }
   }
@@ -2365,19 +2368,19 @@ async function uploadApplicationSource({
     if (config2.mas.entitlements) {
       files.push({
         from: config2.mas.entitlements,
-        to: path9.join("other", "mac", "entitlements.mas.plist")
+        to: path7.join("other", "mac", "entitlements.mas.plist")
       });
     }
     if (config2.mas.entitlementsInherit) {
       files.push({
         from: config2.mas.entitlementsInherit,
-        to: path9.join("other", "mac", "entitlementsInherit.mas.plist")
+        to: path7.join("other", "mac", "entitlementsInherit.mas.plist")
       });
     }
     if (config2.mas.provisioningProfile) {
       files.push({
         from: config2.mas.provisioningProfile,
-        to: path9.join("other", "mac", "mas.provisionprofile")
+        to: path7.join("other", "mac", "mas.provisionprofile")
       });
     }
   }
@@ -2385,7 +2388,7 @@ async function uploadApplicationSource({
     if (config2.dmg.background) {
       files.push({
         from: config2.dmg.background,
-        to: path9.join("other", "mac", "dmg-background.tiff")
+        to: path7.join("other", "mac", "dmg-background.tiff")
       });
     }
   }
@@ -2393,16 +2396,16 @@ async function uploadApplicationSource({
     if (config2.windows.icon) {
       files.push({
         from: config2.windows.icon,
-        to: path9.join(
+        to: path7.join(
           "icons",
-          "appIcon-windows" + path9.extname(config2.windows.icon)
+          "appIcon-windows" + path7.extname(config2.windows.icon)
         )
       });
     }
     if (config2.windows.nsisInclude) {
       files.push({
         from: config2.windows.nsisInclude,
-        to: path9.join("other", "installer.nsh")
+        to: path7.join("other", "installer.nsh")
       });
     }
   }
@@ -5251,7 +5254,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.9.3-0",
+  version: "1.9.3",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",