@todesktop/cli 1.10.4 → 1.11.0

package/README.md

@@ -150,6 +150,7 @@ We also support:
 - `todesktop build --config=<path.to.another.todesktop.json>`. Run a build with a different configuration file.
 - `todesktop build --async`. Run a build in the background. This is handy for CI environments.
 - `todesktop build --webhook URL`. Send a POST request to the webhook URL when the build is finished. It's especially useful together with the `--async` flag.
+- `todesktop build --ignore-extends-errors`. Ignore `id` and `appId` validation errors when extending another todesktop.json file.
 - `todesktop release`. Release a build. This will publish a new download and an auto-update for existing users. By default it shows a list of builds for you to choose from.
   - Use `todesktop release <id>` to release a specific build by ID.
   - `todesktop release --latest` will release the latest build.
@@ -772,6 +773,14 @@ Example: `true`.
 
 Whether or not the snap should automatically start on login.
 
+#### `snap.base` - (optional) string
+
+Default: `core18`.
+
+Example: `core20`.
+
+The base snap to use for building this snap.
+
 #### `snap.buildPackages` - (optional) array of strings
 
 Default: `[]`.
@@ -1138,6 +1147,15 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+### v1.11.0
+
+- Add additional `id` and `appId` validation when extending another `todesktop.json` file. Can be disabled with the `--ignore-extends-errors` flag.
+
+### v1.10.5
+
+- Add support for `snap.base` in snap configuration
+- Fix required JSON validation when extending another json file
+
 ### v1.10.4
 
 - Add support for additional token verification when cancelling smoke test

package/dist/cli.js

@@ -972,9 +972,9 @@ async function postToFirebaseFunction_default(functionName, body = {}, config2 =
 }
 
 // src/utilities/projectConfig/getProjectConfig.ts
-var import_path3 = require("path");
-var import_fs = require("fs");
 var import_find_up = __toESM(require("find-up"));
+var import_fs = require("fs");
+var import_path3 = require("path");
 
 // src/utilities/projectConfig/loadConfig.ts
 function loadConfig(configPath) {
@@ -1448,8 +1448,16 @@ var addCustomKeywords_default = (ajv, context) => {
 // schemas/schema.json
 var schema_default = {
   type: "object",
-  required: ["id", "icon", "schemaVersion"],
   additionalProperties: false,
+  if: {
+    required: ["extends"]
+  },
+  then: {
+    required: ["id"]
+  },
+  else: {
+    required: ["id", "icon", "schemaVersion"]
+  },
   properties: {
     appBuilderLibVersion: {
       type: "string",
@@ -1885,6 +1893,9 @@ var schema_default = {
         autoStart: {
           type: "boolean"
         },
+        base: {
+          type: "string"
+        },
         buildPackages: {
           type: "array",
           items: {
@@ -2038,9 +2049,9 @@ ${output}`
 }
 
 // src/utilities/projectConfig/computeFullProjectConfig.ts
-var import_path2 = require("path");
 var import_lodash2 = __toESM(require("lodash.merge"));
-function computeFullProjectConfig(partialConfig, projectRoot) {
+var import_path2 = require("path");
+function computeFullProjectConfig(partialConfig, projectRoot, flags) {
   if (!partialConfig.extends) {
     logger_default.debug("No extends field, returning partial config");
     return partialConfig;
@@ -2051,8 +2062,19 @@ function computeFullProjectConfig(partialConfig, projectRoot) {
     parentConfig.appPath = parentConfig.appPath || ".";
     const parentFullConfig = computeFullProjectConfig(
       parentConfig,
-      projectRoot
+      projectRoot,
+      flags
     );
+    if ((flags == null ? void 0 : flags.build) && !flags.build.ignoreExtendsErrors) {
+      const hasSameId = partialConfig.id === parentFullConfig.id;
+      const hasSameAppId = partialConfig.appId === parentFullConfig.appId;
+      if (hasSameId || hasSameAppId) {
+        throw new Error(`
+todesktop.json invalid. Cannot have the same "id" or "appId" as an extended todesktop.json file.
+
+You can disable this error by running todesktop build with the --ignore-extends-errors flag.`);
+      }
+    }
     const result = (0, import_lodash2.default)({}, parentFullConfig, partialConfig);
     delete result.extends;
     return result;
@@ -2060,7 +2082,7 @@ function computeFullProjectConfig(partialConfig, projectRoot) {
 }
 
 // src/utilities/projectConfig/getProjectConfig.ts
-function getProjectConfig(configPath) {
+function getProjectConfig(configPath, flags) {
   if (!configPath) {
     logger_default.debug("No config path provided, searching for one");
     configPath = import_find_up.default.sync("todesktop.json");
@@ -2078,7 +2100,7 @@ function getProjectConfig(configPath) {
   }
   const projectRoot = (0, import_path3.dirname)(configPath);
   const partialConfig = loadConfig(configPath);
-  const config2 = computeFullProjectConfig(partialConfig, projectRoot);
+  const config2 = computeFullProjectConfig(partialConfig, projectRoot, flags);
   validateConfig({ config: config2, projectRoot });
   const result = resolveConfigPaths({ config: config2, projectRoot });
   return { config: result, unprocessedConfig: config2, projectRoot };
@@ -2596,15 +2618,15 @@ async function exists(filePath) {
 // src/commands/build/utilities/runBuild.ts
 async function runBuild({
   configPath,
-  exitAfterUploading,
-  shouldCodeSign = true,
-  onBuildFinishedWebhook,
-  updateState
+  updateState,
+  flags
 }) {
   var _a, _b, _c;
   logForCI_default("Getting application information...");
   const primaryUserId = (_a = currentUser()) == null ? void 0 : _a.uid;
-  const { config: config2, unprocessedConfig } = getProjectConfig(configPath);
+  const { config: config2, unprocessedConfig } = getProjectConfig(configPath, {
+    build: flags
+  });
   const appId = config2.id;
   const appPkgJson = getPackageJson_default({ config: config2 });
   const buildObserver = spyBuild();
@@ -2625,9 +2647,9 @@ async function runBuild({
       appPkgProductName: appPkgJson.productName,
       appVersion: appPkgJson.version,
       id: config2.id,
-      onBuildFinishedWebhook,
+      onBuildFinishedWebhook: flags.onBuildFinishedWebhook,
       projectConfig: unprocessedConfig,
-      shouldCodeSign: shouldCodeSign !== false,
+      shouldCodeSign: flags.shouldCodeSign !== false,
       shouldRelease: false,
       userId: primaryUserId,
       versionControlInfo: await getVersionControlInfo_default(config2.appPath),
@@ -2684,7 +2706,7 @@ async function runBuild({
   } catch (e) {
     throw addErrorMessage(e, "Failed while kicking off build");
   }
-  if (exitAfterUploading) {
+  if (flags.exitAfterUploading) {
     updateState({ state: "exit-after-uploading" });
     return;
   }
@@ -2717,21 +2739,13 @@ var import_jsx_runtime12 = require("react/jsx-runtime");
 function Build({
   commandUsed,
   configPath,
-  exitAfterUploading,
-  onBuildFinishedWebhook,
-  shouldCodeSign
+  flags
 }) {
   var _a, _b, _c, _d, _e, _f;
   const exit = useExit_default();
   const [state, setState] = (0, import_react6.useState)({ state: "initializing" });
   (0, import_react6.useEffect)(() => {
-    runBuild({
-      configPath,
-      exitAfterUploading,
-      onBuildFinishedWebhook,
-      shouldCodeSign,
-      updateState
-    }).catch((e) => {
+    runBuild({ configPath, flags, updateState }).catch((e) => {
       const error = e.response ? e.response.data : e;
       logForCI_default(error);
       updateState({ state: "error", error });
@@ -3537,16 +3551,14 @@ var useAnalyticsCommand = (command, flags = {}, properties = {}) => {
 var import_jsx_runtime21 = require("react/jsx-runtime");
 function BuildCommand({
   configPath,
-  exitAfterUploading,
-  onBuildFinishedWebhook,
-  shouldCodeSign
+  flags
 }) {
   checkIfReactIsUsable_default();
   useAnalyticsCommand("build", {
-    async: exitAfterUploading,
-    codeSign: shouldCodeSign,
+    async: flags.exitAfterUploading,
+    codeSign: flags.shouldCodeSign,
     config: configPath,
-    webhook: onBuildFinishedWebhook
+    webhook: flags.onBuildFinishedWebhook
   });
   const commandUsed = "todesktop build";
   return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ErrorBoundary_default, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(LoginHOC_default, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(OngoingBuildGuard_default, { configPath, commandUsed, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
@@ -3554,9 +3566,7 @@ function BuildCommand({
     {
       commandUsed,
       configPath,
-      exitAfterUploading,
-      onBuildFinishedWebhook,
-      shouldCodeSign
+      flags
     }
   ) }) }) });
 }
@@ -5422,7 +5432,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.10.3",
+  version: "1.10.5",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5673,12 +5683,18 @@ import_commander.program.command("build").description(
 ).option(
   "--webhook [string]",
   "Send POST request to the webhook URL after building is finished"
-).addOption(configOption).action(({ async, codeSign, config: config2, webhook }) => {
+).option(
+  "--ignore-extends-errors [bool]",
+  "Ignore `id` and `appId` validation errors when extending another todesktop.json file"
+).addOption(configOption).action(({ async, codeSign, config: config2, webhook, ignoreExtendsErrors }) => {
   runCommand(BuildCommand, {
     configPath: config2,
-    exitAfterUploading: async === true,
-    onBuildFinishedWebhook: webhook,
-    shouldCodeSign: codeSign !== "false"
+    flags: {
+      exitAfterUploading: async === true,
+      shouldCodeSign: codeSign !== "false",
+      ignoreExtendsErrors: ignoreExtendsErrors === true,
+      onBuildFinishedWebhook: webhook
+    }
   });
 });
 import_commander.program.command("builds").description("View your builds").argument("[id]", "View a specific build by ID").option("--latest", "View the latest build").addOption(configOption).option("--count [number]", "Number of builds to show per page", parseCount).addOption(