@webiny/cli 5.33.5 → 5.34.0-beta.1

package/cli.js

@@ -1,32 +1,11 @@
 #!/usr/bin/env node
-const path = require("path");
 const yargs = require("yargs");
-const { log, getProject } = require("./utils");
-const { boolean } = require("boolean");
 
 // Disable help processing until after plugins are imported.
 yargs.help(false);
 
-// Immediately load .env.{PASSED_ENVIRONMENT} and .env files.
-// This way we ensure all of the environment variables are not loaded too late.
-const project = getProject();
-let paths = [path.join(project.root, ".env")];
-
-if (yargs.argv.env) {
-    paths.push(path.join(project.root, `.env.${yargs.argv.env}`));
-}
-
-for (let i = 0; i < paths.length; i++) {
-    const path = paths[i];
-    const { error } = require("dotenv").config({ path });
-    if (boolean(yargs.argv.debug)) {
-        if (error) {
-            log.debug(`No environment file found on ${log.debug.hl(path)}.`);
-        } else {
-            log.success(`Successfully loaded environment variables from ${log.success.hl(path)}.`);
-        }
-    }
-}
+// Loads environment variables from multiple sources.
+require("./utils/loadEnvVariables");
 
 const { blue, red } = require("chalk");
 const context = require("./context");

package/context.js

@@ -92,7 +92,7 @@ class Context {
     log = log.log;
     info = log.info;
     success = log.success;
-    debug = process.argv.includes("--debug") ? log.debug : noop;
+    debug = process.argv.some(v => v.match("--debug")) ? log.debug : noop;
     warning = log.warning;
     error = log.error;
 
@@ -116,7 +116,7 @@ class Context {
         }
 
         if (!fs.existsSync(filePath)) {
-            debug && this.debug(`No environment file found on ${this.debug.hl(filePath)}.`);
+            debug && this.debug(`No environment file found on %s.`, filePath);
             return;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.33.5",
+	"version": "5.34.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.33.5",
-		"@webiny/wcp": "5.33.5",
+		"@webiny/telemetry": "5.34.0-beta.1",
+		"@webiny/wcp": "5.34.0-beta.1",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -28,11 +28,11 @@
 		"ncp": "2.0.0",
 		"open": "8.4.0",
 		"pirates": "4.0.5",
-		"semver": "7.3.7",
+		"semver": "7.3.8",
 		"ts-morph": "11.0.3",
 		"typescript": "4.7.4",
 		"uniqid": "5.4.0",
-		"yargs": "17.5.1"
+		"yargs": "17.6.0"
 	},
 	"license": "MIT",
 	"publishConfig": {
@@ -64,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "5063045cd2abdcdb360f97262f9b90b8858ec1df"
+	"gitHead": "1ee2a7338a865a67e24eb42d16bf0b6091195286"
 }

package/utils/loadEnvVariables.js

@@ -0,0 +1,46 @@
+const path = require("path");
+const yargs = require("yargs");
+const log = require("./log");
+const getProject = require("./getProject");
+const { boolean } = require("boolean");
+
+// Load environment variables from following sources:
+// - `webiny.project.ts` file
+// - `.env` file
+// - `.env.{PASSED_ENVIRONMENT}` file
+
+const project = getProject();
+
+// `webiny.project.ts` file.
+// Environment variables defined via the `env` property.
+if (project.config.env) {
+    Object.assign(process.env, project.config.env);
+}
+
+// `.env.{PASSED_ENVIRONMENT}` and `.env` files.
+let paths = [path.join(project.root, ".env")];
+
+if (yargs.argv.env) {
+    paths.push(path.join(project.root, `.env.${yargs.argv.env}`));
+}
+
+// Let's load environment variables
+for (let i = 0; i < paths.length; i++) {
+    const path = paths[i];
+    const { error } = require("dotenv").config({ path });
+    if (boolean(yargs.argv.debug)) {
+        if (error) {
+            log.debug(`No environment file found on ${log.debug.hl(path)}.`);
+        } else {
+            log.success(`Successfully loaded environment variables from ${log.success.hl(path)}.`);
+        }
+    }
+}
+
+// Feature flags defined via the `featureFlags` property.
+// We set twice, to be available for both backend and frontend application code.
+// TODO: one day we might want to sync this up a bit.
+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);
+}