@webiny/cli 5.32.0 → 5.33.0-beta.1

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.33.0-beta.1](https://github.com/webiny/webiny-js/compare/v5.33.0-beta.0...v5.33.0-beta.1) (2022-10-12)
+
+
+### Bug Fixes
+
+* deprecate `init` method and introduce `link` ([2fe6bf1](https://github.com/webiny/webiny-js/commit/2fe6bf17fdd0554af6130accb1b88fc0996a0370))
+* replace word `init` with `link` ([8309a57](https://github.com/webiny/webiny-js/commit/8309a57ec98c672382f600c82ca7af2c212caff2))
+* switch the order of commands ([1e37a6a](https://github.com/webiny/webiny-js/commit/1e37a6af290e50366fe625e587c2372f382cb4f5))
+
+
+
+
+
+# [5.33.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.32.0...v5.33.0-beta.0) (2022-10-11)
+
+
+### Bug Fixes
+
+* do not continue if there's no WCP project ID present ([faf54da](https://github.com/webiny/webiny-js/commit/faf54da5d8028c1658ba15429e2c366482727c3a))
+* replace verb "activated" with "linked" ([a4634eb](https://github.com/webiny/webiny-js/commit/a4634eb6b0cf5d05edf9b0ca45e742731af21924))
+* skip PAT auth if the environment is being retrieved via API key ([99214e3](https://github.com/webiny/webiny-js/commit/99214e3b124884eafdc94ba8df03bc9345837b92))
+
+
+
+
+
 # [5.32.0](https://github.com/webiny/webiny-js/compare/v5.32.0-beta.0...v5.32.0) (2022-09-07)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/wcp/hooks.js

@@ -22,6 +22,12 @@ const { getUser, getProjectEnvironment, updateUserLastActiveOn } = require("./ut
 let projectEnvironment;
 
 const getEnvironmentHookHandler = async (args, context) => {
+    // If the project isn't linked with WCP, do nothing.
+    const wcpProjectId = context.project.config.id || process.env.WCP_PROJECT_ID;
+    if (!wcpProjectId) {
+        return;
+    }
+
     // For development purposes, we allow setting the WCP_PROJECT_ENVIRONMENT env var directly.
     if (process.env.WCP_PROJECT_ENVIRONMENT) {
         // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WCP_PROJECT_ENVIRONMENT_API_KEY too.
@@ -30,12 +36,6 @@ const getEnvironmentHookHandler = async (args, context) => {
         return;
     }
 
-    // If the project isn't activated, do nothing.
-    const wcpProjectId = context.project.config.id || process.env.WCP_PROJECT_ID;
-    if (!wcpProjectId) {
-        return;
-    }
-
     // The `id` has the orgId/projectId structure, for example `my-org-x/my-project-y`.
     const [orgId, projectId] = wcpProjectId.split("/");
 

package/commands/wcp/login.js

@@ -183,7 +183,7 @@ module.exports.command = () => ({
                     context.project.config.id || process.env.WCP_PROJECT_ID
                 );
 
-                // If we have `orgId` and `projectId` in PAT's meta data, let's immediately activate the project.
+                // If we have `orgId` and `projectId` in PAT's metadata, let's immediately link the project.
                 if (pat.meta && pat.meta.orgId && pat.meta.projectId) {
                     await sleep();
 
@@ -192,7 +192,7 @@ module.exports.command = () => ({
                     const { orgId, projectId } = pat.meta;
 
                     const id = `${orgId}/${projectId}`;
-                    console.log(`Project ${chalk.green(id)} detected. Initializing...`);
+                    console.log(`Project ${chalk.green(id)} detected. Linking...`);
 
                     await sleep();
 
@@ -202,7 +202,7 @@ module.exports.command = () => ({
                         projectId
                     });
 
-                    console.log(`Project ${context.success.hl(id)} initialized successfully.`);
+                    console.log(`Project ${context.success.hl(id)} linked successfully.`);
                     projectInitialized = true;
                 }
 
@@ -213,8 +213,8 @@ module.exports.command = () => ({
 
                 if (!projectInitialized) {
                     console.log(
-                        `‣ initialize your project via the ${chalk.green(
-                            "yarn webiny project init"
+                        `‣ link your project via the ${chalk.green(
+                            "yarn webiny project link"
                         )} command`
                     );
                 }

package/commands/wcp/project.js

@@ -12,9 +12,27 @@ module.exports.command = () => [
                 ["project <command>"],
                 `Webiny project-related commands`,
                 projectCommand => {
+                    projectCommand.command(
+                        "link",
+                        `Link a Webiny project with Webiny Control Panel (WCP)`,
+                        command => {
+                            yargs.option("debug", {
+                                describe: `Turn on debug logs`,
+                                type: "boolean"
+                            });
+                            yargs.option("debug-level", {
+                                default: 1,
+                                describe: `Set the debug logs verbosity level`,
+                                type: "number"
+                            });
+                            command.example("$0 project link");
+                        },
+                        () => handler({ context })
+                    );
+
                     projectCommand.command(
                         "init",
-                        `Initialize a Webiny project`,
+                        `Initialize a Webiny project (deprecated, please use the link command instead)`,
                         command => {
                             yargs.option("debug", {
                                 describe: `Turn on debug logs`,
@@ -39,13 +57,13 @@ const handler = async ({ context }) => {
     // Check login.
     const user = await getUser();
 
-    // User already initialized a project?
+    // User already linked a project?
     const { id: orgProjectId } = context.project.config;
     if (orgProjectId) {
         const [, projectId] = orgProjectId.split("/");
         const project = user.projects.find(item => item.id === projectId);
         if (project) {
-            console.log(`Your ${chalk.green(orgProjectId)} project has already been initialized.`);
+            console.log(`Your ${chalk.green(orgProjectId)} project has already been linked.`);
 
             const prompt = inquirer.createPromptModule();
             const { proceed } = await prompt({
@@ -170,7 +188,7 @@ const handler = async ({ context }) => {
     console.log(
         `${chalk.green("✔")} Project ${context.success.hl(
             selectedProject.name
-        )} initialized successfully.`
+        )} linked successfully.`
     );
 
     await sleep();

package/commands/wcp/utils/getProjectEnvironment.js

@@ -69,6 +69,16 @@ module.exports.getProjectEnvironment = async ({
     environmentId,
     apiKey
 }) => {
+    if (apiKey) {
+        return request(getWcpGqlApiUrl(), GET_ENVIRONMENT, { apiKey })
+            .then(response => response.projects.getEnvironment)
+            .catch(() => {
+                throw new Error(
+                    `It seems the API key you provided is incorrect or disabled. Please double check the API key and try again.`
+                );
+            });
+    }
+
     const pat = localStorage().get("wcpPat");
     if (!pat) {
         throw new Error(

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.32.0",
+	"version": "5.33.0-beta.1",
 	"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": "5.32.0",
-		"@webiny/wcp": "5.32.0",
+		"@webiny/telemetry": "5.33.0-beta.1",
+		"@webiny/wcp": "5.33.0-beta.1",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -64,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "1227aa53c68afa4ccd518c8a4344195a2b8e354b"
+	"gitHead": "537fe39e2309315f01aa41b1e4cacddccee9a10b"
 }