@webiny/cli 5.41.4 → 5.42.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.41.4",
+	"version": "5.42.0-beta.1",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,10 +13,11 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "5.41.4",
-		"@webiny/wcp": "5.41.4",
+		"@webiny/system-requirements": "5.42.0-beta.1",
+		"@webiny/telemetry": "5.42.0-beta.1",
+		"@webiny/wcp": "5.42.0-beta.1",
 		"boolean": "3.2.0",
-		"camelcase": "5.3.1",
+		"camelcase": "6.3.0",
 		"chalk": "4.1.2",
 		"dotenv": "8.6.0",
 		"execa": "5.1.1",
@@ -27,13 +28,13 @@
 		"inquirer": "8.2.6",
 		"is-ci": "3.0.1",
 		"ncp": "2.0.0",
-		"open": "8.4.0",
-		"pirates": "4.0.5",
-		"semver": "7.5.4",
+		"open": "8.4.2",
+		"pirates": "4.0.6",
+		"semver": "7.6.3",
 		"ts-morph": "11.0.3",
 		"typescript": "4.9.5",
 		"uniqid": "5.4.0",
-		"yargs": "17.6.2"
+		"yargs": "17.7.2"
 	},
 	"license": "MIT",
 	"publishConfig": {
@@ -65,5 +66,5 @@
 			]
 		}
 	},
-	"gitHead": "94922b33af59db5afe75127bb07443ce7f1448c4"
+	"gitHead": "5e69da579efa4f2c8268e0c97ac6407ddc3f5f07"
 }

package/types.d.ts

@@ -1,10 +1,9 @@
 /**
  * Rename file to types.ts when switching the package to Typescript.
  */
+export type GenericRecord<K extends PropertyKey = PropertyKey, V = any> = Record<K, V>;
 
-export type GenericRecordKey = string | number | symbol;
-
-export type GenericRecord<K extends GenericRecordKey = GenericRecordKey, V = any> = Record<K, V>;
+export type NonEmptyArray<T> = [T, ...T[]];
 
 /**
  * A simplified plugins container interface, used specifically within the Webiny CLI.
@@ -171,3 +170,25 @@ export interface CliContext {
         get: (key: string) => any;
     };
 }
+
+/**
+ * Arguments for CliPlugin.create
+ *
+ * @category Cli
+ */
+export interface CliCommandPluginArgs {
+    yargs: any;
+    context: CliContext;
+}
+
+/**
+ * A plugin defining cli-command type.
+ *
+ * @category Plugin
+ * @category Cli
+ */
+export interface CliCommandPlugin extends Plugin {
+    type: "cli-command";
+    name: string;
+    create: (args: CliCommandPluginArgs) => void;
+}

package/utils/suppressPunycodeWarnings.js

@@ -0,0 +1,7 @@
+const originalConsoleError = console.error;
+console.error = (message, ...args) => {
+    if (typeof message === "string" && message.includes("punycode")) {
+        return;
+    }
+    originalConsoleError.call(console, message, ...args);
+};

package/cli.js

@@ -1,93 +0,0 @@
-#!/usr/bin/env node
-const yargs = require("yargs");
-
-// Disable help processing until after plugins are imported.
-yargs.help(false);
-
-// Loads environment variables from multiple sources.
-require("./utils/loadEnvVariables");
-
-const { blue, red, bold, bgYellow } = require("chalk");
-const context = require("./context");
-const { createCommands } = require("./commands");
-
-yargs
-    .usage("Usage: $0 <command> [options]")
-    .demandCommand(1)
-    .recommendCommands()
-    .scriptName("webiny")
-    .epilogue(
-        `To find more information, docs and tutorials, see ${blue("https://www.webiny.com/docs")}.`
-    )
-    .epilogue(`Want to contribute? ${blue("https://github.com/webiny/webiny-js")}.`)
-    .fail(function (msg, error, yargs) {
-        if (msg) {
-            if (msg.includes("Not enough non-option arguments")) {
-                console.log();
-                context.error(red("Command was not invoked as expected!"));
-                context.info(
-                    `Some non-optional arguments are missing. See the usage examples printed below.`
-                );
-                console.log();
-                yargs.showHelp();
-                return;
-            }
-
-            if (msg.includes("Missing required argument")) {
-                const args = msg
-                    .split(":")[1]
-                    .split(",")
-                    .map(v => v.trim());
-
-                console.log();
-                context.error(red("Command was not invoked as expected!"));
-                context.info(
-                    `Missing required argument(s): ${args
-                        .map(arg => red(arg))
-                        .join(", ")}. See the usage examples printed below.`
-                );
-                console.log();
-                yargs.showHelp();
-                return;
-            }
-            console.log();
-            context.error(red("Command execution was aborted!"));
-            context.error(msg);
-            console.log();
-
-            process.exit(1);
-        }
-
-        console.log();
-        // Unfortunately, yargs doesn't provide passed args here, so we had to do it via process.argv.
-        const debugEnabled = process.argv.includes("--debug");
-        if (debugEnabled) {
-            context.debug(error);
-        } else {
-            context.error(error.message);
-        }
-
-        const gracefulError = error.cause?.gracefulError;
-        if (gracefulError instanceof Error) {
-            console.log();
-            console.log(bgYellow(bold("💡 How can I resolve this?")));
-            console.log(gracefulError.message);
-        }
-
-        const plugins = context.plugins.byType("cli-command-error");
-        for (let i = 0; i < plugins.length; i++) {
-            const plugin = plugins[i];
-            plugin.handle({
-                error,
-                context
-            });
-        }
-
-        process.exit(1);
-    });
-
-(async () => {
-    await createCommands(yargs, context);
-    // Enable help and run the CLI.
-    yargs.help().argv;
-})();