@todesktop/cli 1.15.2 → 1.18.0

package/dist/types.d.ts

@@ -26,6 +26,23 @@ export type AppProtocolSchemeProperty = string | [string, ...string[]];
  * This is the path to your Electron application directory. Omit this unless your project setup is complicated. This is the directory that the CLI uploads.
  */
 export type AppPathProperty = string;
+/**
+ * Compile selected source files to .jsc using Bytenode during the build. Provide glob patterns relative to your appPath.
+ */
+export type BytenodeConfigProperty = {
+  [k: string]: unknown;
+} & {
+  /**
+   * Enable Bytenode compilation.
+   */
+  enabled?: boolean;
+  /**
+   * Glob patterns relative to appPath for files to compile to Bytenode.
+   *
+   * @minItems 1
+   */
+  files?: [string, ...string[]];
+};
 /**
  * Whether to package your application's source code within an asar archive. You should only turn this off if you have a good reason to.
  */
@@ -188,6 +205,16 @@ export interface Schema {
   appFiles?: AppFilesProperty;
   appProtocolScheme?: AppProtocolSchemeProperty;
   appPath?: AppPathProperty;
+  /**
+   * Useful when your application is a monorepo (e.g. pnpm workspaces). You can configure whether the CLI bundles workspace packages alongside the app upload. When enabled, workspace dependencies referenced via `workspace:` or local `file:` specifiers are bundled with your application upload and dependency ranges are rewritten to `file:` paths so they install deterministically on the build servers.
+   */
+  bundleWorkspacePackages?: {
+    /**
+     * Enable automatic bundling of workspace packages for this project.
+     */
+    enabled?: boolean;
+  };
+  bytenode?: BytenodeConfigProperty;
   asar?: AsarProperty;
   asarUnpack?: AsarUnpackProperty;
   buildVersion?: BuildVersionProperty;
@@ -475,6 +502,7 @@ export interface PlatformOverridableProperties {
   appFiles?: AppFilesProperty;
   appProtocolScheme?: AppProtocolSchemeProperty;
   appPath?: AppPathProperty;
+  bytenode?: BytenodeConfigProperty;
   asar?: AsarProperty;
   asarUnpack?: AsarUnpackProperty;
   buildVersion?: BuildVersionProperty;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "name": "@todesktop/cli",
-  "version": "1.15.2",
+  "version": "1.18.0",
   "license": "MIT",
   "author": "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   "homepage": "https://todesktop.com/cli",
@@ -19,23 +19,23 @@
     "node": ">=16"
   },
   "scripts": {
-    "dev": "cp-cli dev.env .env && npm run build:dev && npm link",
-    "dev:prod": "cp-cli prod.env .env && npm run build && npm link",
-    "dev:local:prod": "cp-cli prod-local.env .env && npm run build && npm link && cp-cli prod-local.env .env",
-    "build": "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
-    "build:dev": "npm run types:generate && esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli dev.env .env",
+    "build": "scripts/esbuild.js",
+    "dev": "scripts/esbuild.js --link --watch --stage dev",
+    "dev:local:prod": "scripts/esbuild.js --link --watch --stage prod-local",
+    "dev:prod": "scripts/esbuild.js --link --watch",
+    "docs:generate": "node scripts/generate-readme.js",
+    "format": "prettier --write .",
     "lint": "npm run lint:types && npm run lint:styles",
+    "lint--fix": "eslint src test --fix",
     "lint:styles": "eslint src test .eslintrc.js && prettier --check .",
-    "format": "prettier --write .",
     "lint:types": "tsc && tsc-strict",
-    "lint--fix": "eslint src test --fix",
-    "docs:generate": "node scripts/generate-readme.js",
     "types:generate": "node scripts/generate-types.js",
-    "release": "npm run docs:generate && npm run build && npx np --tag=latest",
+    "release": "npm run docs:generate && npm run build && pnpx np --tag=latest",
     "release-beta": "npm run docs:generate && npm run build && npx np --any-branch --no-tests --tag=beta",
     "test": "ava",
+    "test:e2e": "node test/output-snapshots/output.test.js",
     "test--watch": "npm test -- --watch",
-    "postinstall": "node scripts/postinstall.js"
+    "typecheck": "tsc --noEmit"
   },
   "files": [
     "scripts/postinstall.js",
@@ -72,6 +72,7 @@
     "ink-text-input": "^4.0.1",
     "is-ci": "^3.0.1",
     "is-installed-globally": "^0.3.2",
+    "js-yaml": "^4.1.0",
     "latest-version": "^5.1.0",
     "lodash.merge": "^4.6.2",
     "lodash.throttle": "^4.1.1",
@@ -89,6 +90,7 @@
     "xdg-basedir": "^4.0.0"
   },
   "devDependencies": {
+    "@todesktop/dev-config": "workspace:*",
     "@todesktop/shared": "^7.189.6",
     "@types/bunyan": "^1.8.6",
     "@types/is-ci": "^3.0.4",
@@ -98,7 +100,7 @@
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^4.3.1",
     "cp-cli": "^2.0.0",
-    "esbuild": "^0.16.5",
+    "esbuild": "^0.25.10",
     "esbuild-register": "^3.4.1",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
@@ -120,7 +122,7 @@
     "prettier": "^2.8.1",
     "proxyquire": "^2.1.3",
     "sinon": "^9.0.3",
-    "typescript": "^4.9.4",
+    "typescript": "catalog:",
     "typescript-strict-plugin": "^2.2.1"
   },
   "ava": {
@@ -154,18 +156,6 @@
       "pre-commit": "lint-staged"
     }
   },
-  "overrides": {
-    "pastel": {
-      "parcel-bundler": {
-        "deasync": "0.1.27"
-      }
-    }
-  },
-  "resolutions": {
-    "pastel/parcel-bundler/deasync": "0.1.24",
-    "ink": "3.2.0",
-    "react": "17.0.2"
-  },
   "packageExtensions": {
     "ink-progress-bar@*": {
       "dependencies": {

package/schemas/schema.json

@@ -26,6 +26,21 @@
     "appFiles": { "$ref": "#/definitions/appFilesProperty" },
     "appProtocolScheme": { "$ref": "#/definitions/appProtocolSchemeProperty" },
     "appPath": { "$ref": "#/definitions/appPathProperty" },
+    "bundleWorkspacePackages": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Useful when your application is a monorepo (e.g. pnpm workspaces). You can configure whether the CLI bundles workspace packages alongside the app upload. When enabled, workspace dependencies referenced via `workspace:` or local `file:` specifiers are bundled with your application upload and dependency ranges are rewritten to `file:` paths so they install deterministically on the build servers.",
+      "examples": ["{\"enabled\":true}"],
+      "default": { "enabled": false },
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "Enable automatic bundling of workspace packages for this project."
+        }
+      }
+    },
+    "bytenode": { "$ref": "#/definitions/bytenodeConfigProperty" },
     "asar": { "$ref": "#/definitions/asarProperty" },
     "asarUnpack": { "$ref": "#/definitions/asarUnpackProperty" },
     "buildVersion": { "$ref": "#/definitions/buildVersionProperty" },
@@ -118,6 +133,34 @@
       "examples": ["com.microsoft.word"],
       "default": "auto-generated"
     },
+    "bytenodeConfigProperty": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Compile selected source files to .jsc using Bytenode during the build. Provide glob patterns relative to your appPath.",
+      "default": { "enabled": false },
+      "properties": {
+        "enabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "Enable Bytenode compilation."
+        },
+        "files": {
+          "type": "array",
+          "items": { "type": "string", "minLength": 1 },
+          "minItems": 1,
+          "description": "Glob patterns relative to appPath for files to compile to Bytenode."
+        }
+      },
+      "allOf": [
+        {
+          "if": {
+            "properties": { "enabled": { "const": true } },
+            "required": ["enabled"]
+          },
+          "then": { "required": ["files"] }
+        }
+      ]
+    },
     "appFilesProperty": {
       "type": "array",
       "description": "This option allows you to decide which files get uploaded to be built on the ToDesktop servers. By default, all files in your app path are included in your app, except for `node_modules` and `.git`. Dependencies are installed on our build servers as there could be platform-specific postinstall steps.",
@@ -801,7 +844,7 @@
           "description": "The path to your application's Windows desktop icon. It must be an ICO, ICNS, or PNG.",
           "examples": ["./icon.ico"],
           "file": {
-            "extensions": ["icns", "png", "icon"],
+            "extensions": ["icns", "png", "ico"],
             "mustBeFile": true
           },
           "minLength": 3
@@ -866,6 +909,7 @@
           "$ref": "#/definitions/appProtocolSchemeProperty"
         },
         "appPath": { "$ref": "#/definitions/appPathProperty" },
+        "bytenode": { "$ref": "#/definitions/bytenodeConfigProperty" },
         "asar": { "$ref": "#/definitions/asarProperty" },
         "asarUnpack": { "$ref": "#/definitions/asarUnpackProperty" },
         "buildVersion": { "$ref": "#/definitions/buildVersionProperty" },

package/scripts/postinstall.js

@@ -1,19 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const path = require("path");
-
-console.log(`
-Thank you for installing @todesktop/cli!
-
-To enable JSON validation and IntelliSense for your configuration files, please add the following to your VSCode/Cursor settings:
-
-{
-  "json.schemas": [
-    {
-      "fileMatch": ["todesktop.json", "todesktop.*.json"],
-      "url": "${path
-        .resolve(__dirname, "../", "schemas", "schema.json")
-        .substring(1)}"
-    }
-  ]
-}
-`);