@todesktop/cli 1.10.0 → 1.10.2

package/dist/cli.js

@@ -1445,452 +1445,563 @@ var addCustomKeywords_default = (ajv, context) => {
   });
 };
 
-// src/utilities/projectConfig/schema/full.ts
-var getItemOrArrayOfItemsSchema = (itemSchema) => {
-  return {
-    oneOf: [
-      itemSchema,
-      {
-        type: "array",
-        items: itemSchema
-      }
-    ]
-  };
-};
-var full_default = (context) => {
-  const getIconSchema = (additionalAllowedExtensions = []) => {
-    return {
+// schemas/schema.json
+var schema_default = {
+  type: "object",
+  required: ["id", "icon", "schemaVersion"],
+  additionalProperties: false,
+  properties: {
+    appBuilderLibVersion: {
       type: "string",
-      file: {
-        from: context.projectRoot,
-        extensions: ["icns", "png", ...additionalAllowedExtensions],
-        mustBeFile: true
-      },
-      minLength: 3
-    };
-  };
-  return {
-    type: "object",
-    required: ["id", "icon", "schemaVersion"],
-    additionalProperties: false,
-    properties: {
-      appBuilderLibVersion: {
+      validSemver: {},
+      minLength: 1
+    },
+    appId: {
+      type: "string",
+      minLength: 1
+    },
+    appFiles: {
+      type: "array",
+      items: {
         type: "string",
-        validSemver: {},
         minLength: 1
       },
-      appId: { type: "string", minLength: 1 },
-      appFiles: {
-        type: "array",
-        items: {
+      minItems: 1
+    },
+    appProtocolScheme: {
+      oneOf: [
+        {
           type: "string",
           minLength: 1
         },
-        minItems: 1
-      },
-      appProtocolScheme: {
-        oneOf: [
-          { type: "string", minLength: 1 },
-          {
-            type: "array",
-            items: { type: "string", minLength: 1 },
-            minItems: 1
-          }
-        ]
-      },
-      appPath: {
-        type: "string",
-        file: {
-          from: context.projectRoot,
-          isOptional: true,
-          mustBeElectronApp: true
-        }
-      },
-      asar: {
-        type: "boolean",
-        default: true
-      },
-      asarUnpack: {
-        oneOf: [
-          { type: "boolean" },
-          {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            },
-            minItems: 1
-          }
-        ]
-      },
-      buildVersion: { type: "string", minLength: 1 },
-      copyright: { type: "string", minLength: 1 },
-      electronMirror: {
-        type: "string",
-        format: "uri"
-      },
-      electronVersion: {
-        type: "string",
-        minLength: 1
-      },
-      extraContentFiles: {
-        type: "array",
-        items: {
-          type: "object",
-          required: ["from"],
-          additionalProperties: false,
-          properties: {
-            from: {
-              type: "string",
-              file: { from: context.projectRoot }
-            },
-            to: { type: "string" }
-          }
-        }
-      },
-      extraResources: {
-        type: "array",
-        items: {
-          type: "object",
-          required: ["from"],
-          additionalProperties: false,
-          properties: {
-            from: {
-              type: "string",
-              file: { from: context.projectRoot }
-            },
-            to: { type: "string" }
-          }
+        {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          },
+          minItems: 1
         }
-      },
-      fileAssociations: {
-        type: "array",
-        items: {
-          type: "object",
-          required: ["ext"],
-          additionalProperties: false,
-          properties: {
-            ext: getItemOrArrayOfItemsSchema({
-              type: "string",
-              minLength: 1
-            }),
-            description: {
-              type: "string",
-              minLength: 1
-            },
-            name: {
-              type: "string",
-              minLength: 1
-            },
-            mimeType: {
-              type: "string",
-              minLength: 1
-            },
-            icon: {
-              type: "string",
-              minLength: 1
-            },
-            role: {
-              type: "string",
-              minLength: 1
-            },
-            isPackage: {
-              type: "boolean"
-            },
-            rank: {
-              type: "string",
-              minLength: 1
-            }
-          }
-        },
-        minItems: 1
-      },
-      filesForDistribution: {
-        type: "array",
-        items: {
-          type: "string",
-          minLength: 1
+      ]
+    },
+    appPath: {
+      type: "string",
+      file: {
+        isOptional: true,
+        mustBeElectronApp: true
+      }
+    },
+    asar: {
+      type: "boolean",
+      default: true
+    },
+    asarUnpack: {
+      oneOf: [
+        {
+          type: "boolean"
         },
-        minItems: 1
-      },
-      icon: getIconSchema(),
-      linux: {
+        {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          },
+          minItems: 1
+        }
+      ]
+    },
+    buildVersion: {
+      type: "string",
+      minLength: 1
+    },
+    copyright: {
+      type: "string",
+      minLength: 1
+    },
+    electronMirror: {
+      type: "string",
+      format: "uri"
+    },
+    electronVersion: {
+      type: "string",
+      minLength: 1
+    },
+    extends: {
+      type: "string",
+      minLength: 1
+    },
+    extraContentFiles: {
+      type: "array",
+      items: {
         type: "object",
+        required: ["from"],
         additionalProperties: false,
         properties: {
-          category: { type: "string", minLength: 1 },
-          icon: getIconSchema(),
-          noSandbox: { type: "boolean" }
+          from: {
+            type: "string",
+            file: {}
+          },
+          to: {
+            type: "string"
+          }
         }
-      },
-      id: { type: "string", minLength: 1 },
-      includeSubNodeModules: {
-        type: "boolean",
-        default: false
-      },
-      mac: {
+      }
+    },
+    extraResources: {
+      type: "array",
+      items: {
         type: "object",
+        required: ["from"],
         additionalProperties: false,
         properties: {
-          category: { type: "string", minLength: 1 },
-          additionalBinariesToSign: {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            }
-          },
-          entitlements: {
+          from: {
             type: "string",
             file: {
-              from: context.projectRoot,
-              extensions: ["plist"],
-              mustBeFile: true
-            },
-            minLength: 1
-          },
-          entitlementsInherit: {
-            type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["plist"],
-              mustBeFile: true
-            },
-            minLength: 1
-          },
-          extendInfo: {
-            type: "object"
+              from: "context.projectRoot"
+            }
           },
-          icon: getIconSchema(),
-          requirements: {
-            type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["txt"],
-              mustBeFile: true
-            },
-            minLength: 1
+          to: {
+            type: "string"
           }
         }
-      },
-      mas: {
+      }
+    },
+    fileAssociations: {
+      type: "array",
+      items: {
         type: "object",
+        required: ["ext"],
         additionalProperties: false,
         properties: {
-          entitlements: {
+          ext: {
+            oneOf: [
+              {
+                type: "string",
+                minLength: 1
+              },
+              {
+                type: "array",
+                items: {
+                  type: "string",
+                  minLength: 1
+                }
+              }
+            ]
+          },
+          description: {
             type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["plist"],
-              mustBeFile: true
-            },
             minLength: 1
           },
-          entitlementsInherit: {
+          name: {
             type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["plist"],
-              mustBeFile: true
-            },
             minLength: 1
           },
-          provisioningProfile: {
+          mimeType: {
             type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["provisionprofile"],
-              mustBeFile: true
-            },
             minLength: 1
           },
-          type: {
+          icon: {
             type: "string",
-            enum: ["development", "distribution"]
+            minLength: 1
           },
-          x64ArchFiles: {
-            type: "string"
-          }
-        }
-      },
-      dmg: {
-        type: "object",
-        additionalProperties: false,
-        properties: {
-          background: {
+          role: {
             type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["tiff"],
-              mustBeFile: true
-            },
             minLength: 1
           },
-          artifactName: { type: "string", minLength: 1 },
-          backgroundColor: { type: "string", minLength: 1 },
-          iconSize: { type: "number" },
-          iconTextSize: { type: "number" },
-          title: { type: "string", minLength: 1 },
-          contents: {
-            type: "array",
-            items: {
-              type: "object",
-              additionalProperties: false,
-              properties: {
-                x: { type: "number" },
-                y: { type: "number" }
-              }
-            }
+          isPackage: {
+            type: "boolean"
           },
-          window: {
-            type: "object",
-            additionalProperties: false,
-            properties: {
-              x: { type: "number" },
-              y: { type: "number" },
-              width: { type: "number" },
-              height: { type: "number" }
-            }
+          rank: {
+            type: "string",
+            enum: ["Owner", "Default", "Alternate", "None"]
           }
         }
       },
-      nodeVersion: {
-        type: "string",
-        validSemver: {},
-        minLength: 1
-      },
-      npmVersion: {
-        type: "string",
-        validSemver: {},
-        minLength: 1
-      },
-      pnpmVersion: {
+      minItems: 1
+    },
+    filesForDistribution: {
+      type: "array",
+      items: {
         type: "string",
-        validSemver: {},
         minLength: 1
       },
-      packageManager: {
-        type: "string",
-        enum: ["npm", "yarn", "pnpm"]
-      },
-      rebuildLibrary: {
-        type: "string",
-        enum: ["app-builder", "@electron/rebuild"]
+      minItems: 1
+    },
+    icon: {
+      type: "string",
+      file: {
+        extensions: ["icns", "png"],
+        mustBeFile: true
       },
-      schemaVersion: { type: "number", minimum: 1, maximum: 1 },
-      snap: {
-        type: "object",
-        additionalProperties: false,
-        properties: {
-          after: {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            }
-          },
-          appPartStage: {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            }
+      minLength: 3
+    },
+    linux: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        category: {
+          type: "string",
+          minLength: 1
+        },
+        icon: {
+          type: "string",
+          file: {
+            extensions: ["icns", "png"],
+            mustBeFile: true
           },
-          assumes: getItemOrArrayOfItemsSchema({
+          minLength: 3
+        },
+        noSandbox: {
+          type: "boolean"
+        }
+      }
+    },
+    id: {
+      type: "string",
+      minLength: 1
+    },
+    includeSubNodeModules: {
+      type: "boolean",
+      default: false
+    },
+    mac: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        category: {
+          type: "string",
+          minLength: 1
+        },
+        additionalBinariesToSign: {
+          type: "array",
+          items: {
             type: "string",
             minLength: 1
-          }),
-          autoStart: {
-            type: "boolean"
-          },
-          buildPackages: {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            }
-          },
-          confinement: {
-            type: "string",
-            enum: ["classic", "devmode", "strict"]
+          }
+        },
+        entitlements: {
+          type: "string",
+          file: {
+            extensions: ["plist"],
+            mustBeFile: true
           },
-          environment: {
-            type: "object"
+          minLength: 1
+        },
+        entitlementsInherit: {
+          type: "string",
+          file: {
+            extensions: ["plist"],
+            mustBeFile: true
           },
-          grade: {
-            type: "string",
-            enum: ["devel", "stable"]
+          minLength: 1
+        },
+        extendInfo: {
+          type: "object"
+        },
+        icon: {
+          type: "string",
+          file: {
+            extensions: ["icns", "png"],
+            mustBeFile: true
           },
-          layout: {
-            type: "object"
+          minLength: 3
+        },
+        requirements: {
+          type: "string",
+          file: {
+            extensions: ["txt"],
+            mustBeFile: true
           },
-          plugs: {
-            type: "array",
-            items: {
-              anyOf: [
-                {
-                  type: "string",
-                  minLength: 1
-                },
-                {
-                  type: "object"
-                }
-              ]
-            }
+          minLength: 1
+        }
+      }
+    },
+    mas: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        entitlements: {
+          type: "string",
+          file: {
+            extensions: ["plist"],
+            mustBeFile: true
           },
-          stagePackages: {
-            type: "array",
-            items: {
-              type: "string",
-              minLength: 1
-            }
+          minLength: 1
+        },
+        entitlementsInherit: {
+          type: "string",
+          file: {
+            extensions: ["plist"],
+            mustBeFile: true
           },
-          summary: {
-            type: "string",
-            maxLength: 78
+          minLength: 1
+        },
+        provisioningProfile: {
+          type: "string",
+          file: {
+            extensions: ["provisionprofile"],
+            mustBeFile: true
           },
-          useTemplateApp: {
-            type: "boolean"
-          }
+          minLength: 1
+        },
+        type: {
+          type: "string",
+          enum: ["development", "distribution"]
+        },
+        x64ArchFiles: {
+          type: "string"
         }
-      },
-      uploadSizeLimit: {
-        type: "number"
-      },
-      windows: {
-        type: "object",
-        additionalProperties: false,
-        properties: {
-          icon: getIconSchema(["ico"]),
-          nsisCustomBinary: {
+      }
+    },
+    dmg: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        background: {
+          type: "string",
+          file: {
+            extensions: ["tiff"],
+            mustBeFile: true
+          },
+          minLength: 1
+        },
+        artifactName: {
+          type: "string",
+          minLength: 1
+        },
+        backgroundColor: {
+          type: "string",
+          minLength: 1
+        },
+        iconSize: {
+          type: "number"
+        },
+        iconTextSize: {
+          type: "number"
+        },
+        title: {
+          type: "string",
+          minLength: 1
+        },
+        contents: {
+          type: "array",
+          items: {
             type: "object",
             additionalProperties: false,
             properties: {
-              checksum: { type: "string" },
-              debugLogging: { type: "boolean" },
-              url: { type: "string" },
-              version: { type: "string" }
+              x: {
+                type: "number"
+              },
+              y: {
+                type: "number"
+              }
             }
-          },
-          nsisInclude: {
-            type: "string",
-            file: {
-              from: context.projectRoot,
-              extensions: ["nsh"],
-              mustBeFile: true
+          }
+        },
+        window: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            x: {
+              type: "number"
+            },
+            y: {
+              type: "number"
+            },
+            width: {
+              type: "number"
+            },
+            height: {
+              type: "number"
             }
-          },
-          publisherName: {
-            type: "array",
-            items: {
+          }
+        }
+      }
+    },
+    nodeVersion: {
+      type: "string",
+      validSemver: {},
+      minLength: 1
+    },
+    npmVersion: {
+      type: "string",
+      validSemver: {},
+      minLength: 1
+    },
+    pnpmVersion: {
+      type: "string",
+      validSemver: {},
+      minLength: 1
+    },
+    packageJson: {
+      type: "object"
+    },
+    packageManager: {
+      type: "string",
+      enum: ["npm", "yarn", "pnpm"]
+    },
+    rebuildLibrary: {
+      type: "string",
+      enum: ["app-builder", "@electron/rebuild"]
+    },
+    schemaVersion: {
+      type: "number",
+      minimum: 1,
+      maximum: 1
+    },
+    snap: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        after: {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          }
+        },
+        appPartStage: {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          }
+        },
+        assumes: {
+          oneOf: [
+            {
               type: "string",
               minLength: 1
+            },
+            {
+              type: "array",
+              items: {
+                type: "string",
+                minLength: 1
+              }
+            }
+          ]
+        },
+        autoStart: {
+          type: "boolean"
+        },
+        buildPackages: {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          }
+        },
+        confinement: {
+          type: "string",
+          enum: ["classic", "devmode", "strict"]
+        },
+        environment: {
+          type: "object"
+        },
+        grade: {
+          type: "string",
+          enum: ["devel", "stable"]
+        },
+        layout: {
+          type: "object"
+        },
+        plugs: {
+          type: "array",
+          items: {
+            anyOf: [
+              {
+                type: "string",
+                minLength: 1
+              },
+              {
+                type: "object"
+              }
+            ]
+          }
+        },
+        stagePackages: {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          }
+        },
+        summary: {
+          type: "string",
+          maxLength: 78
+        },
+        useTemplateApp: {
+          type: "boolean"
+        }
+      }
+    },
+    uploadSizeLimit: {
+      type: "number"
+    },
+    windows: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        icon: {
+          type: "string",
+          file: {
+            extensions: ["icns", "png", "icon"],
+            mustBeFile: true
+          },
+          minLength: 3
+        },
+        nsisCustomBinary: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            checksum: {
+              type: "string"
+            },
+            debugLogging: {
+              type: "boolean"
+            },
+            url: {
+              type: "string"
+            },
+            version: {
+              type: "string"
             }
           }
+        },
+        nsisInclude: {
+          type: "string",
+          file: {
+            extensions: ["nsh"],
+            mustBeFile: true
+          }
+        },
+        publisherName: {
+          type: "array",
+          items: {
+            type: "string",
+            minLength: 1
+          }
         }
       }
     }
-  };
+  }
+};
+
+// src/utilities/projectConfig/schema/full.ts
+var full_default = (context) => {
+  function updateFileProperty(record) {
+    for (const key in record) {
+      const value = record[key];
+      if (key === "file" && typeof value === "object") {
+        value["from"] = context.projectRoot;
+      } else if (typeof value === "object" && value !== null) {
+        updateFileProperty(value);
+      }
+    }
+  }
+  updateFileProperty(schema_default);
+  return schema_default;
 };
 
 // src/utilities/projectConfig/validateConfig.ts
@@ -2864,12 +2975,6 @@ var LoginHOC = ({ children, isInteractive = true }) => {
   const [isEffectDone, setEffectDone] = (0, import_react10.useState)(false);
   const [error, setError] = (0, import_react10.useState)(null);
   const { isRawModeSupported } = (0, import_ink16.useStdin)();
-  const onFailure = (message2, err = {}) => {
-    setError({
-      ...err,
-      message: message2
-    });
-  };
   (0, import_react10.useEffect)(() => {
     async function isAccessTokenValid() {
       const { accessToken, email, jwtToken } = getAuthConfig();
@@ -2890,12 +2995,17 @@ var LoginHOC = ({ children, isInteractive = true }) => {
               setIsLoggedIn(true);
           }
         } else if (!isRawModeSupported || import_is_ci4.default) {
-          onFailure(
-            "ToDesktop environment variables not found. When automating builds with your CI provider, you need to specify environment variables for TODESKTOP_EMAIL and TODESKTOP_ACCESS_TOKEN."
+          setError(
+            new Error(
+              "ToDesktop environment variables not found. When automating builds with your CI provider, you need to specify environment variables for TODESKTOP_EMAIL and TODESKTOP_ACCESS_TOKEN."
+            )
           );
         }
       } catch (err) {
-        onFailure("Log in with environment variables failed.", err);
+        if (typeof err === "object") {
+          err.message = "Log in with environment variables failed.";
+        }
+        setError(err);
       }
       try {
         if (!userCreds && jwtToken) {
@@ -5310,7 +5420,7 @@ var package_default = {
     access: "public"
   },
   name: "@todesktop/cli",
-  version: "1.9.8",
+  version: "1.10.1",
   license: "MIT",
   author: "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   homepage: "https://todesktop.com/cli",
@@ -5337,9 +5447,12 @@ var package_default = {
     release: "npm run build && npx np --tag=latest",
     "release-beta": "npm run build && npx np --any-branch --no-tests --tag=beta",
     test: "ava",
-    "test--watch": "npm test -- --watch"
+    "test--watch": "npm test -- --watch",
+    postinstall: "node scripts/postinstall.js"
   },
   files: [
+    "scripts",
+    "schemas",
     "dist",
     "docs",
     ".env",