@webiny/cli 0.0.0-unstable.da99e0b846 → 0.0.0-unstable.de38392959

package/bin.js

@@ -22,12 +22,12 @@ const currentNodeVersion = process.versions.node;
 
     try {
         const { stdout } = await execa("yarn", ["--version"]);
-        if (!semver.satisfies(stdout, ">=2")) {
-            console.error(chalk.red(`"@webiny/cli" requires yarn >=2!`));
+        if (!semver.satisfies(stdout, ">=3")) {
+            console.error(chalk.red(`"@webiny/cli" requires yarn 3 or 4!`));
             process.exit(1);
         }
     } catch (err) {
-        console.error(chalk.red(`"@webiny/cli" requires yarn >=2!`));
+        console.error(chalk.red(`"@webiny/cli" requires yarn 3 or 4!`));
         console.log(
             `Run ${chalk.blue("yarn set version berry")} to install a compatible version of yarn.`
         );

package/commands/about/getNpxVersion.js

@@ -0,0 +1,10 @@
+const execa = require("execa");
+
+module.exports.getNpxVersion = async () => {
+    try {
+        const { stdout } = await execa("npx", ["--version"]);
+        return stdout;
+    } catch (err) {
+        return "";
+    }
+};

package/commands/about/getPulumiVersions.js

@@ -0,0 +1,43 @@
+const execa = require("execa");
+
+module.exports.getPulumiVersions = async () => {
+    let pulumi, pulumiAws;
+
+    try {
+        {
+            const { stdout } = await execa("yarn", [
+                "info",
+                "@pulumi/pulumi",
+                "-A",
+                "-R",
+                "--name-only",
+                "--json"
+            ]);
+
+            const match = stdout.match(/npm:(.*?)"/);
+            if (match) {
+                pulumi = match[1];
+            }
+        }
+
+        {
+            const { stdout } = await execa("yarn", [
+                "info",
+                "@pulumi/aws",
+                "-A",
+                "-R",
+                "--name-only",
+                "--json"
+            ]);
+
+            const match = stdout.match(/npm:(.*?)"/);
+            if (match) {
+                pulumiAws = match[1];
+            }
+        }
+    } catch (err) {
+        return "";
+    }
+
+    return [pulumi, pulumiAws];
+};

package/commands/about/getYarnVersion.js

@@ -0,0 +1,10 @@
+const execa = require("execa");
+
+module.exports.getYarnVersion = async () => {
+    try {
+        const { stdout } = await execa("yarn", ["--version"]);
+        return stdout;
+    } catch (err) {
+        return "";
+    }
+};

package/commands/about/index.js

@@ -0,0 +1,93 @@
+const NO_VALUE = "-";
+
+const getData = async context => {
+    const { getUser } = require("../wcp/utils");
+    const { getNpxVersion } = require("./getNpxVersion");
+    const { getPulumiVersions } = require("./getPulumiVersions");
+    const { getYarnVersion } = require("./getYarnVersion");
+
+    const [pulumiVersion, pulumiAwsVersion] = await getPulumiVersions();
+
+    return [
+        {
+            sectionName: "Webiny Project",
+            data: {
+                Name: context.project.name,
+                Version: context.version,
+                Template: context.project.config.template || NO_VALUE,
+                "Debug Enabled": process.env.DEBUG === "true" ? "Yes" : "No",
+                "Feature Flags": process.env.WEBINY_FEATURE_FLAGS || "N/A"
+            }
+        },
+        {
+            sectionName: "Webiny Control Panel (WCP)",
+            data: {
+                "Project ID": context.project.config.id || process.env.WCP_PROJECT_ID,
+                User: await getUser()
+                    .catch(() => "N/A")
+                    .then(res => res.email),
+                Authentication: process.env.WEBINY_PROJECT_ENVIRONMENT_API_KEY
+                    ? "Project Environment API Key"
+                    : "Personal Access Token"
+            }
+        },
+        {
+            sectionName: "Pulumi",
+            data: {
+                "@pulumi/pulumi": pulumiVersion,
+                "@pulumi/aws": pulumiAwsVersion,
+                "Used AWS Region": process.env.AWS_REGION,
+                "Secrets Provider": process.env.PULUMI_SECRETS_PROVIDER,
+                "Using Password": process.env.PULUMI_CONFIG_PASSPHRASE ? "Yes" : "No"
+            }
+        },
+        {
+            sectionName: "Host",
+            data: {
+                OS: `${process.platform} (${process.arch})`,
+                "Node.js": process.version,
+                NPX: await getNpxVersion(),
+                Yarn: await getYarnVersion()
+            }
+        }
+    ];
+};
+
+module.exports = {
+    type: "cli-command",
+    name: "cli-command-about",
+    create({ yargs, context }) {
+        yargs.command(
+            "about",
+            `Prints out information helpful for debugging purposes.`,
+            yargs => {
+                yargs.option("json", {
+                    describe: "Emit output as JSON.",
+                    type: "boolean",
+                    default: false
+                });
+            },
+            async yargs => {
+                const data = await getData(context);
+
+                if (yargs.json) {
+                    console.log(JSON.stringify(data, null, 2));
+                    return;
+                }
+
+                data.forEach(({ sectionName, data }, index) => {
+                    if (index > 0) {
+                        console.log();
+                    }
+
+                    const { bold } = require("chalk");
+                    console.log(bold(sectionName));
+
+                    Object.keys(data).forEach(key => {
+                        console.log(key.padEnd(30), data[key] || NO_VALUE);
+                    });
+                });
+            }
+        );
+    }
+};

package/commands/index.js

@@ -1,9 +1,10 @@
+const about = require("./about");
 const run = require("./run");
 const telemetry = require("./telemetry");
 const upgrade = require("./upgrade");
 
 module.exports.createCommands = async (yargs, context) => {
-    context.plugins.register(run, telemetry, upgrade);
+    context.plugins.register(about, run, telemetry, upgrade);
 
     try {
         const wcp = require("./wcp");

package/commands/telemetry/index.js

@@ -8,9 +8,8 @@ module.exports = {
             telemetry.enable();
             await telemetry.sendEvent({ event: "enable-telemetry" });
             context.info(
-                `Webiny telemetry is now ${context.info.hl(
-                    "enabled"
-                )}! Thank you for helping us in making Webiny better!`
+                `Webiny telemetry is now %s! Thank you for helping us in making Webiny better!`,
+                "enabled"
             );
             context.info(
                 `For more information, please visit the following link: https://www.webiny.com/telemetry.`
@@ -20,11 +19,10 @@ module.exports = {
         yargs.command("disable-telemetry", "Disable anonymous telemetry.", async () => {
             await telemetry.sendEvent({ event: "disable-telemetry" });
             telemetry.disable();
-            context.info(`Webiny telemetry is now ${context.info.hl("disabled")}!`);
+            context.info(`Webiny telemetry is now %s!`, "disabled");
             context.info(
-                `Note that, in order to complete the process, you will also need to re-deploy your project, using the ${context.info.hl(
-                    "yarn webiny deploy"
-                )} command.`
+                `Note that, in order to complete the process, you will also need to re-deploy your project, using the %s command.`,
+                "yarn webiny deploy"
             );
         });
     }

package/commands/upgrade/index.js

@@ -70,7 +70,8 @@ module.exports = [
                     const npx = execa("npx", command, {
                         env: {
                             FORCE_COLOR: true
-                        }
+                        },
+                        stdin: process.stdin
                     });
 
                     npx.stdout.on("data", data => {

package/commands/wcp/login.js

@@ -95,9 +95,8 @@ module.exports.command = () => ({
                     } catch (e) {
                         if (debug) {
                             context.debug(
-                                `Could not use the provided ${context.debug.hl(
-                                    patFromParams
-                                )} PAT because of the following error:`
+                                `Could not use the provided %s PAT because of the following error:`,
+                                patFromParams
                             );
                             console.debug(e);
                         }
@@ -118,7 +117,7 @@ module.exports.command = () => ({
                     )}&ref=cli`;
                     const openUrl = `${getWcpAppUrl()}/login/cli?${queryParams}`;
 
-                    debug && context.debug(`Opening ${context.debug.hl(openUrl)}...`);
+                    debug && context.debug(`Opening %s...`, openUrl);
                     await open(openUrl);
 
                     const graphql = {

package/commands/wcp/utils/getWcpOrgProjectId.js

@@ -0,0 +1,9 @@
+const { getWcpProjectId } = require("./getWcpProjectId");
+
+module.exports.getWcpOrgProjectId = context => {
+    const id = getWcpProjectId(context);
+    if (typeof id === "string") {
+        return id.split("/");
+    }
+    return [];
+};

package/commands/wcp/utils/getWcpProjectId.js

@@ -0,0 +1,3 @@
+module.exports.getWcpProjectId = context => {
+    return context?.project?.config?.id || process.env.WCP_PROJECT_ID || "";
+};

package/commands/wcp/utils/index.js

@@ -4,6 +4,8 @@ const { updateUserLastActiveOn } = require("./updateUserLastActiveOn");
 const { setProjectId } = require("./setProjectId");
 const { setWcpPat } = require("./setWcpPat");
 const { getWcpPat } = require("./getWcpPat");
+const { getWcpProjectId } = require("./getWcpProjectId");
+const { getWcpOrgProjectId } = require("./getWcpOrgProjectId");
 const { sleep } = require("./sleep");
 
 module.exports = {
@@ -13,5 +15,7 @@ module.exports = {
     setProjectId,
     setWcpPat,
     getWcpPat,
+    getWcpProjectId,
+    getWcpOrgProjectId,
     sleep
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "0.0.0-unstable.da99e0b846",
+	"version": "0.0.0-unstable.de38392959",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,8 +13,8 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "0.0.0-unstable.da99e0b846",
-		"@webiny/wcp": "0.0.0-unstable.da99e0b846",
+		"@webiny/telemetry": "0.0.0-unstable.de38392959",
+		"@webiny/wcp": "0.0.0-unstable.de38392959",
 		"boolean": "3.2.0",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -28,7 +28,7 @@
 		"ncp": "2.0.0",
 		"open": "8.4.0",
 		"pirates": "4.0.5",
-		"semver": "7.3.8",
+		"semver": "7.5.4",
 		"ts-morph": "11.0.3",
 		"typescript": "4.7.4",
 		"uniqid": "5.4.0",
@@ -64,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "da99e0b8461741d3ae57fdb9d4b2fc7646c1d754"
+	"gitHead": "de38392959f2692d1feb08945a3588cd80e4924c"
 }

package/utils/loadEnvVariables.js

@@ -44,3 +44,11 @@ if (project.config.featureFlags) {
     process.env.WEBINY_FEATURE_FLAGS = JSON.stringify(project.config.featureFlags);
     process.env.REACT_APP_WEBINY_FEATURE_FLAGS = JSON.stringify(project.config.featureFlags);
 }
+
+// With 5.38.0, we are hiding the `WEBINY_ELASTICSEARCH_INDEX_LOCALE` env variable and always setting it to `true`.
+// This is because this variable is not something users should be concerned with, nor should they be able to change it.
+// In order to ensure backwards compatibility, we first check if the variable is set, and if it is, we don't override it.
+const esIndexLocaleEnvVarExists = "WEBINY_ELASTICSEARCH_INDEX_LOCALE" in process.env;
+if (!esIndexLocaleEnvVarExists) {
+    process.env.WEBINY_ELASTICSEARCH_INDEX_LOCALE = "true";
+}