@todesktop/cli 1.5.1 → 1.6.1

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "name": "@todesktop/cli",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "license": "MIT",
   "author": "Dave Jeffery <dave@todesktop.com> (http://www.todesktop.com/)",
   "homepage": "https://todesktop.com/cli",
@@ -12,46 +12,45 @@
     "email": "dave@todesktop.com"
   },
   "bin": {
-    "todesktop": "./build/cli.js"
+    "todesktop": "./dist/cli.js"
   },
   "engines": {
     "node": ">=12"
   },
   "scripts": {
-    "dev": "cp-cli dev.env .env && pastel dev",
-    "dev:prod": "cp-cli prod.env .env && pastel dev",
-    "build": "cross-env NODE_ENV=production pastel build && cp-cli prod.env .env && cp node_modules/pastel/boot.js build/boot.js && sed -i'.bak' 's@pastel\\/boot@.\\/boot@g' build/cli.js",
-    "build:dev": "cross-env NODE_ENV=development pastel build && cp-cli prod.env .env && cp node_modules/pastel/boot.js build/boot.js && sed -i'.bak' 's@pastel\\/boot@.\\/boot@g' build/cli.js",
-    "lint": "eslint .",
-    "lint--fix": "eslint . --fix",
+    "dev": "cp-cli dev.env .env && npm run build:dev && npm link",
+    "dev:prod": "cp-cli prod.env .env && npm run build && npm link",
+    "build": "esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
+    "build:dev": "esbuild src/index.ts --packages=external --bundle --sourcemap --platform=node --outfile=dist/cli.js && cp-cli prod.env .env",
+    "lint": "npm run lint:types && npm run lint:styles",
+    "lint:styles": "eslint src test .eslintrc.js",
+    "lint:types": "tsc",
+    "lint--fix": "eslint src test --fix",
     "release": "npm run build && npx np --tag=latest",
     "release-beta": "npm run build && npx np --any-branch --no-tests --tag=beta",
-    "test": "npm run build && ava",
+    "test": "ava",
     "test--watch": "npm test -- --watch"
   },
   "files": [
-    "build",
+    "dist",
     "docs",
     ".env",
     "LICENSE",
     "README.md"
   ],
   "dependencies": {
-    "@babel/runtime": "^7.18.9",
     "@sentry/node": "^5.27.2",
-    "ajv": "^6.12.6",
+    "ajv": "^8.11.2",
+    "ajv-formats": "^2.1.1",
     "analytics-node": "^4.0.1",
     "archiver": "^5.2.0",
     "axios": "^0.21.1",
     "better-ajv-errors": "^1.2.0",
-    "blacklist": "^1.1.4",
     "bunyan": "^1.8.14",
-    "camelcase-keys": "^5.2.0",
     "chalk": "^4.1.0",
-    "cli-highlight": "^2.1.11",
+    "commander": "^9.4.1",
     "conf": "^7.1.2",
     "date-fns": "^2.28.0",
-    "decamelize": "^1.2.0",
     "del": "^6.0.0",
     "dotenv": "^8.2.0",
     "du": "^1.0.0",
@@ -78,57 +77,58 @@
     "react": "^17.0.2",
     "react-final-form": "^6.5.1",
     "semver": "^7.3.2",
+    "source-map-support": "^0.5.21",
     "stream-to-array": "^2.3.0",
     "superagent": "^7.1.3",
     "uuid": "^8.3.1",
-    "xdg-basedir": "^4.0.0",
-    "yargs": "^15.4.1"
+    "xdg-basedir": "^4.0.0"
   },
   "devDependencies": {
-    "@ava/babel": "^1.0.1",
-    "@babel/core": "^7.12.3",
-    "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/register": "^7.12.1",
+    "@todesktop/shared": "^7.147.0",
     "@types/bunyan": "^1.8.6",
+    "@types/react": "^18.0.26",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
     "ava": "^4.3.1",
-    "babel-preset-es2015": "^6.24.1",
     "cp-cli": "^2.0.0",
-    "cross-env": "^7.0.2",
-    "eslint": "^7.6.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.1",
+    "esbuild": "^0.16.5",
+    "esbuild-register": "^3.4.1",
+    "eslint": "^8.29.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.21.4",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "eslint-plugin-standard": "^4.0.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-standard": "^4.1.0",
     "execa": "^4.0.3",
     "extract-zip": "^2.0.1",
     "fs-extra": "^9.0.1",
     "husky": "^4.3.0",
     "lint-staged": "^10.2.11",
-    "pastel": "^1.1.1",
-    "prettier": "^2.1.2",
+    "prettier": "^2.8.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^9.0.3"
+    "sinon": "^9.0.3",
+    "typescript": "^4.9.4"
   },
   "ava": {
+    "extensions": [
+      "ts"
+    ],
     "files": [
-      "test/**/*.js",
+      "test/**/*.ts",
       "!test/fixtures/**/*",
       "!test/utilities/**/*"
     ],
     "require": [
-      "@babel/register"
+      "esbuild-register"
     ],
     "timeout": "10m"
   },
   "lint-staged": {
-    "**/*.js": [
-      "eslint . --fix",
+    "**/*.{js,ts,tsx}": [
+      "eslint src --fix",
       "git add"
     ]
   },

package/build/boot.js

@@ -1,126 +0,0 @@
-'use strict';
-const path = require('path');
-const camelcaseKeys = require('camelcase-keys');
-const decamelize = require('decamelize');
-const yargs = require('yargs');
-
-const getCommandsMessage = command => {
-	const usageString = [...command.usage, command.name].join(' ');
-	return `Commands:\n${command.subCommands.map(subCommand => `  ${usageString} ${subCommand.name}`).join('\n')}\n`;
-};
-
-module.exports = (dirname, React, Ink, originalCommands) => {
-	let commands = originalCommands;
-
-	// For backwards compatibility for builds made with versions prior to 1.1.0 that don't include positionalArgs
-	if (originalCommands.some(command => !command.positionalArgs && (command.args || []).some(arg => arg.positional))) {
-		commands = originalCommands.map(command => ({
-			...command,
-			positionalArgs: (command.args || []).filter(arg => arg.positional).map(arg => arg.key)
-		}));
-	}
-
-	const addCommand = (command, yargs) => {
-		// Don't need to add a description as it'll be handled by the * selector in the builder
-		// eslint-disable-next-line no-use-before-define
-		yargs.command(command.name, '', builder.bind(null, command), () => yargs.showHelp());
-	};
-
-	const handler = (command, argv) => {
-		const props = {
-			...camelcaseKeys(argv),
-			inputArgs: argv._
-		};
-
-		const UI = require(path.join(dirname, 'commands', command.path.replace('.tsx', '.js'))).default;
-		const {waitUntilExit} = Ink.render(React.createElement(UI, props));
-
-		waitUntilExit().catch(error => {
-			console.error(error.stack);
-		});
-	};
-
-	const builder = (command, yargs) => {
-		const {
-			positionalArgs = [],
-			args,
-			description,
-			name,
-			subCommands,
-			isDefaultIndex,
-			usage
-		} = command;
-
-		for (const subCommand of subCommands) {
-			addCommand({
-				...subCommand,
-				usage: [...usage, name]
-			}, yargs);
-		}
-
-		// If there is no index defined, yargs will just list the sub-commands
-		if (isDefaultIndex) {
-			return;
-		}
-
-		const hasPositionalArgs = positionalArgs.length > 0;
-		const positionalArgsString = positionalArgs.map(key => {
-			const {isRequired, type, aliases} = args.find(arg => arg.key === key);
-			const [startTag, endTag] = isRequired ? ['<', '>'] : ['[', type === 'array' ? '..]' : ']'];
-			const argsNames = [key, ...aliases.slice(0, 1)].map(name => decamelize(name, '-')).join('|');
-
-			return `${startTag}${argsNames}${endTag}`;
-		}).join(' ');
-
-		const yargsName = hasPositionalArgs ? `* ${positionalArgsString}` : '*';
-		const commandDescription = description || `${name} command`;
-
-		yargs.command(yargsName, commandDescription, scopedYargs => {
-			for (const arg of command.args) {
-				// `inputArgs` is a reserved prop by Pastel and doesn't require a definition in yargs
-				if (arg.key === 'inputArgs') {
-					continue;
-				}
-
-				if (arg.positional) {
-					scopedYargs.positional(decamelize(arg.key, '-'), {
-						type: arg.type,
-						description: arg.description,
-						default: arg.defaultValue,
-						// This only keeps one for some reason for positional arguments
-						// The slice ensures we keep the same as the one we add in the command
-						alias: arg.aliases.slice(0, 1).map(alias => decamelize(alias, '-'))
-					});
-				} else {
-					scopedYargs.option(decamelize(arg.key, '-'), {
-						type: arg.type,
-						description: arg.description,
-						default: arg.defaultValue,
-						demandOption: arg.isRequired,
-						alias: arg.aliases.map(alias => decamelize(alias, '-'))
-					});
-				}
-			}
-
-			// If the index command takes no arguments and there are available sub-commands,
-			// list the sub-commands in the help message.
-			if (!hasPositionalArgs && subCommands.length > 0) {
-				const usageMessage = getCommandsMessage(command);
-				scopedYargs.demandCommand(0, 0, usageMessage, usageMessage);
-			}
-		}, handler.bind(null, command));
-	};
-
-	yargs.command(
-		'*', '',
-		yargs => {
-			const usage = [path.basename(yargs.$0)];
-			for (const command of commands) {
-				addCommand({...command, usage}, yargs);
-			}
-		},
-		() => yargs.showHelp()
-	);
-
-	yargs.parse();
-};

package/build/cli.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-const React = require('react'); // eslint-disable-line import/no-unresolved
-const Ink = require('ink'); // eslint-disable-line import/no-unresolved
-const boot = require('./boot'); // eslint-disable-line import/no-extraneous-dependencies, import/no-unresolved
-const {commands} = require('./commands.json'); // eslint-disable-line import/no-unresolved
-
-// This file is an entrypoint of CLI applications based on Pastel
-// This file is copied to "build" directory of the CLI and "bin" field
-// in package.json must point to it
-boot(__dirname, React, Ink, commands);

package/build/cli.js.bak

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-const React = require('react'); // eslint-disable-line import/no-unresolved
-const Ink = require('ink'); // eslint-disable-line import/no-unresolved
-const boot = require('pastel/boot'); // eslint-disable-line import/no-extraneous-dependencies, import/no-unresolved
-const {commands} = require('./commands.json'); // eslint-disable-line import/no-unresolved
-
-// This file is an entrypoint of CLI applications based on Pastel
-// This file is copied to "build" directory of the CLI and "bin" field
-// in package.json must point to it
-boot(__dirname, React, Ink, commands);