@webiny/cli 5.31.0-beta.1 → 5.32.0

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [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
+
+
+
+
+
+# [5.32.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.31.0...v5.32.0-beta.0) (2022-09-06)
+
+
+### Bug Fixes
+
+* run WCP-related hooks in watch command ([370a381](https://github.com/webiny/webiny-js/commit/370a381b5dad78184803db63ed529ff725cba9f7))
+
+
+
+
+
+# [5.31.0](https://github.com/webiny/webiny-js/compare/v5.31.0-beta.1...v5.31.0) (2022-08-18)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
 # [5.31.0-beta.1](https://github.com/webiny/webiny-js/compare/v5.31.0-beta.0...v5.31.0-beta.1) (2022-08-17)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/wcp/hooks.js

@@ -21,100 +21,113 @@ const { getUser, getProjectEnvironment, updateUserLastActiveOn } = require("./ut
 
 let projectEnvironment;
 
+const getEnvironmentHookHandler = async (args, context) => {
+    // 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.
+        const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);
+        process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;
+        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("/");
+
+    const apiKey = process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;
+
+    let projectEnvironment;
+    if (apiKey) {
+        projectEnvironment = await getProjectEnvironment({ apiKey });
+    } else {
+        const isValidId = orgId && projectId;
+        if (!isValidId) {
+            throw new Error(
+                `It seems the project ID, specified in "webiny.project.ts" file, is invalid.`
+            );
+        }
+
+        // If there is no API key, that means we need to retrieve the currently logged-in user.
+        const user = await getUser();
+        const project = user.projects.find(item => item.id === projectId);
+        if (!project) {
+            throw new Error(
+                `It seems you don't belong to the current project or the current project has been deleted.`
+            );
+        }
+
+        projectEnvironment = await getProjectEnvironment({
+            orgId,
+            projectId,
+            userId: user.id,
+            environmentId: args.env
+        });
+    }
+
+    if (projectEnvironment.org.id !== orgId) {
+        throw new Error(
+            `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${orgId}" organization. Please check your WCP project ID (currently set to "${wcpProjectId}").`
+        );
+    }
+
+    if (projectEnvironment.project.id !== projectId) {
+        throw new Error(
+            `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${wcpProjectId}" project. Please check your WCP project ID (currently set to "${wcpProjectId}").`
+        );
+    }
+
+    if (projectEnvironment && projectEnvironment.status !== "enabled") {
+        throw new Error(
+            `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment has been disabled.`
+        );
+    }
+
+    // Assign `WCP_PROJECT_ENVIRONMENT` and `WCP_PROJECT_ENVIRONMENT_API_KEY`
+    const wcpProjectEnvironment = {
+        id: projectEnvironment.id,
+        apiKey: projectEnvironment.apiKey,
+        org: { id: projectEnvironment.org.id },
+        project: { id: projectEnvironment.project.id }
+    };
+
+    process.env.WCP_PROJECT_ENVIRONMENT = encrypt(wcpProjectEnvironment);
+    process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;
+};
+
+const updateLastActiveOnHookHandler = async () => {
+    if (!projectEnvironment) {
+        return;
+    }
+
+    // Is this a user environment? If so, let's update his "last active" field.
+    if (projectEnvironment.user) {
+        await updateUserLastActiveOn();
+    }
+};
+
+// Export hooks plugins for deploy and watch commands.
 module.exports = () => [
+    // Deploy hook handlers.
     {
         type: "hook-before-deploy",
         name: "hook-before-deploy-environment-get-environment",
-        async hook(args, context) {
-            // 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.
-                const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);
-                process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;
-                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("/");
-
-            const apiKey = process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;
-
-            let projectEnvironment;
-            if (apiKey) {
-                projectEnvironment = await getProjectEnvironment({ apiKey });
-            } else {
-                const isValidId = orgId && projectId;
-                if (!isValidId) {
-                    throw new Error(
-                        `It seems the project ID, specified in "webiny.project.ts" file, is invalid.`
-                    );
-                }
-
-                // If there is no API key, that means we need to retrieve the currently logged-in user.
-                const user = await getUser();
-                const project = user.projects.find(item => item.id === projectId);
-                if (!project) {
-                    throw new Error(
-                        `It seems you don't belong to the current project or the current project has been deleted.`
-                    );
-                }
-
-                projectEnvironment = await getProjectEnvironment({
-                    orgId,
-                    projectId,
-                    userId: user.id,
-                    environmentId: args.env
-                });
-            }
-
-            if (projectEnvironment.org.id !== orgId) {
-                throw new Error(
-                    `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${orgId}" organization. Please check your WCP project ID (currently set to "${wcpProjectId}").`
-                );
-            }
-
-            if (projectEnvironment.project.id !== projectId) {
-                throw new Error(
-                    `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment doesn't belong to the "${wcpProjectId}" project. Please check your WCP project ID (currently set to "${wcpProjectId}").`
-                );
-            }
-
-            if (projectEnvironment && projectEnvironment.status !== "enabled") {
-                throw new Error(
-                    `Cannot proceed with the deployment because the "${projectEnvironment.name}" project environment has been disabled.`
-                );
-            }
-
-            // Assign `WCP_PROJECT_ENVIRONMENT` and `WCP_PROJECT_ENVIRONMENT_API_KEY`
-            const wcpProjectEnvironment = {
-                id: projectEnvironment.id,
-                apiKey: projectEnvironment.apiKey,
-                org: { id: projectEnvironment.org.id },
-                project: { id: projectEnvironment.project.id }
-            };
-
-            process.env.WCP_PROJECT_ENVIRONMENT = encrypt(wcpProjectEnvironment);
-            process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;
-        }
+        hook: getEnvironmentHookHandler
     },
     {
         type: "hook-before-deploy",
         name: "hook-before-deploy-update-last-active-on",
-        async hook() {
-            if (!projectEnvironment) {
-                return;
-            }
-
-            // Is this a user environment? If so, let's update his "last active" field.
-            if (projectEnvironment.user) {
-                await updateUserLastActiveOn();
-            }
-        }
+        hook: updateLastActiveOnHookHandler
+    },
+
+    // Watch hook handlers.
+    {
+        type: "hook-before-watch",
+        name: "hook-before-watch-environment-get-environment",
+        hook: getEnvironmentHookHandler
     }
 ];

package/context.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { importModule, getProject, PluginsContainer, log, localStorage } = require("./utils");
+const { importModule, getProject, PluginsContainer, log, localStorage, noop } = require("./utils");
 
 const project = getProject();
 
@@ -92,7 +92,7 @@ class Context {
     log = log.log;
     info = log.info;
     success = log.success;
-    debug = log.debug;
+    debug = process.argv.includes("--debug") ? log.debug : noop;
     warning = log.warning;
     error = log.error;
 

package/package.json

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

package/utils/index.js

@@ -8,6 +8,10 @@ const log = require("./log");
 const sendEvent = require("./sendEvent");
 const PluginsContainer = require("./PluginsContainer");
 
+const noop = () => {
+    // Do nothing.
+};
+
 module.exports = {
     createProjectApplicationWorkspace,
     getApiProjectApplicationFolder,
@@ -16,6 +20,7 @@ module.exports = {
     importModule,
     localStorage,
     log,
+    noop,
     sendEvent,
     PluginsContainer
 };

package/utils/log.js

@@ -1,28 +1,26 @@
 const chalk = require("chalk");
 
-const getLogType = type => {
-    switch (type) {
-        case "log":
-            return type;
-        case "info":
-            return `${chalk.blueBright(type)}`;
-        case "error":
-            return `${chalk.red(type)}`;
-        case "warning":
-            return `${chalk.yellow(type)}`;
-        case "debug":
-            return `${chalk.gray(type)}`;
-        case "success":
-            return `${chalk.green(type)}`;
-    }
+const logColors = {
+    log: v => v,
+    info: chalk.blueBright,
+    error: chalk.red,
+    warning: chalk.yellow,
+    debug: chalk.gray,
+    success: chalk.green
+};
+
+const colorizePlaceholders = (type, string) => {
+    return string.replace(/\%[a-zA-Z]/g, match => {
+        return logColors[type](match);
+    });
 };
 
 const webinyLog = (type, ...args) => {
-    const prefix = `webiny ${getLogType(type)}: `;
+    const prefix = `webiny ${logColors[type](type)}: `;
 
     const [first, ...rest] = args;
     if (typeof first === "string") {
-        return console.log(prefix + first, ...rest);
+        return console.log(prefix + colorizePlaceholders(type, first), ...rest);
     }
     return console.log(prefix, first, ...rest);
 };