@todesktop/cli 1.11.0 → 1.11.2

package/README.md

@@ -550,6 +550,19 @@ The path to your application's Linux desktop icon. It must be an ICNS or PNG.
 
 Note: to ensure the icon is never missing (e.g. this happens sometimes in Ubuntu), set the [`icon` option](https://www.electronjs.org/docs/api/browser-window#new-browserwindowoptions) when creating your `BrowserWindow`s.
 
+#### `linux.imageVersion` - (optional) string
+
+Example: `0.1.0`
+
+Default: `0.0.11`
+
+The version of the Linux image that ToDesktop should use to build your app.
+
+Linux Changelog:
+
+- `0.1.0`: Updated g++ → g++10, gcc → gcc10. WARNING: This compiler has been updated to a newer version that is not compatible with older versions of Linux like Ubuntu 20.04. You should probably only use this version if you know what you're doing.
+- `0.0.11`: Updated git 2.25.1 → 2.47.1 node 18.18.2 → 18.20.5
+
 ### `linux.noSandbox` - (optional) boolean
 
 Default: `true`
@@ -1147,6 +1160,14 @@ Now, when we build your app on ToDesktop servers, it will also run your custom `
 
 ## Changelog
 
+### v1.11.2
+
+- Stop erroring in cases where `appId` is not defined in an extended `todesktop.json`.
+
+### v1.11.1
+
+- You can now specify `linux.imageVersion` to explicitly set the version of the Linux image that ToDesktop should use to build your app.
+
 ### v1.11.0
 
 - Add additional `id` and `appId` validation when extending another `todesktop.json` file. Can be disabled with the `--ignore-extends-errors` flag.

package/dist/cli.js

@@ -1659,6 +1659,11 @@ var schema_default = {
           },
           minLength: 3
         },
+        imageVersion: {
+          type: "string",
+          minLength: 1,
+          validSemver: {}
+        },
         noSandbox: {
           type: "boolean"
         }
@@ -2067,11 +2072,17 @@ function computeFullProjectConfig(partialConfig, projectRoot, flags) {
     );
     if ((flags == null ? void 0 : flags.build) && !flags.build.ignoreExtendsErrors) {
       const hasSameId = partialConfig.id === parentFullConfig.id;
-      const hasSameAppId = partialConfig.appId === parentFullConfig.appId;
+      const hasSameAppId = partialConfig.appId && parentFullConfig.appId && 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.`);
+      }
+      if (parentFullConfig.appId && !partialConfig.appId) {
+        throw new Error(`
+todesktop.json invalid. Please add "appId" to your todesktop.json or remove "appId" from the extended todesktop.json.
+
 You can disable this error by running todesktop build with the --ignore-extends-errors flag.`);
       }
     }
@@ -2377,7 +2388,14 @@ Your app is larger than ${fileSizeLimit}MB. Your app is ${import_chalk.default.b
 
 // src/commands/build/utilities/uploadApplicationSource.ts
 var getAppFiles = async (globsInput, appPath, appPkgJson) => {
-  const globs = ["!node_modules", "!**/node_modules", "!.git", "!**/.git"];
+  const globs = [
+    "!node_modules",
+    "!**/node_modules",
+    "!.git",
+    "!**/.git",
+    "!.gitignore",
+    "!**/.gitignore"
+  ];
   if (globsInput && globsInput.length) {
     globs.push(
       ...globsInput,
@@ -2621,7 +2639,7 @@ async function runBuild({
   updateState,
   flags
 }) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   logForCI_default("Getting application information...");
   const primaryUserId = (_a = currentUser()) == null ? void 0 : _a.uid;
   const { config: config2, unprocessedConfig } = getProjectConfig(configPath, {
@@ -2691,17 +2709,18 @@ async function runBuild({
   logForCI_default("Kicking off build...");
   try {
     await postToFirebaseFunction_default("kickOffBuild", {
+      appBuilderLibVersion: config2.appBuilderLibVersion,
       appId,
       appPkgName: appPkgJson.name,
       appVersion: appPkgJson.version,
       buildId,
-      userId: primaryUserId,
-      sourceArchiveDetails,
+      idToken: await ((_c = currentUser()) == null ? void 0 : _c.getIdToken()),
+      linuxImageVersion: (_d = config2.linux) == null ? void 0 : _d.imageVersion,
       nodeVersion: config2.nodeVersion,
       npmVersion: config2.npmVersion,
       pnpmVersion: config2.pnpmVersion,
-      appBuilderLibVersion: config2.appBuilderLibVersion,
-      idToken: await ((_c = currentUser()) == null ? void 0 : _c.getIdToken())
+      sourceArchiveDetails,
+      userId: primaryUserId
     });
   } catch (e) {
     throw addErrorMessage(e, "Failed while kicking off build");
@@ -5432,7 +5451,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.10.5",
+  version: "1.11.1",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5517,7 +5536,7 @@ var package_default = {
     "xdg-basedir": "^4.0.0"
   },
   devDependencies: {
-    "@todesktop/shared": "^7.188.80",
+    "@todesktop/shared": "^7.189.6",
     "@types/bunyan": "^1.8.6",
     "@types/is-ci": "^3.0.4",
     "@types/node": "^20.8.4",
@@ -5671,7 +5690,7 @@ var configOption = new import_commander.Option(
   }
   return value;
 });
-import_commander.program.name("todekstop").version(getCliVersion_default());
+import_commander.program.name("todesktop").version(getCliVersion_default());
 import_commander.program.command("build").description(
   "Build an Electron app with native installers, code signing baked-in, etc. but without releasing it (existing users won't get an auto-update). For quicker builds, you can append `--code-sign=false` to disable code-signing and notarization."
 ).option(