@raisenow/tamaro-cli 1.0.12 → 1.0.13

package/README.md

@@ -39,6 +39,7 @@ Runs the local development server for _Tamaro Core_ or a particular customer con
 
 - `--local-core` – Load _Tamaro Core_ from localhost:1234 instead of the CDN
 - `--port <port>` – Web server port (default: 1234)
+- `--env <env>` – Environment (dev, stage, prod)
 
 ### Run local server using Tamaro Core from CDN
 
@@ -75,6 +76,7 @@ Build an optimised (minified) bundle of _Tamaro Core_ or a customer configuratio
 - `--analyze` – Generate bundle statistics to `reports` folder
 - `--serve` – Run the generated bundle with a local web server
 - `--port <port>` – Web server port (default: 1234)
+- `--env <env>` – Environment (dev, stage, prod)
 - `--deploy` – Deploy _Tamaro Core_ or a customer configuration bundle to AWS S3
 - `--tag <tag>` – Tag which should be used for the deployment of the bundle (default: “latest”)
 - `--profile <profile>` – AWS profile which should be used for the deployment of the bundle (default: “payments-prod-cs-deployer”)

package/dist/{chunk-PIEFLCDU.js → chunk-OXDXJ5B5.js}

@@ -81,7 +81,7 @@ var getPaths = (ifCore) => {
     appNodeModules: resolveApp("node_modules"),
     appTsConfig: resolveApp("tsconfig.json"),
     appHtml: resolveApp("src/*.html"),
-    appEnv: resolveApp(".env"),
+    appEnv: resolveApp(".env*"),
     appTailwindConfig: resolveApp("tailwind.config.js")
   }, {
     app: resolveApp("."),
@@ -90,7 +90,7 @@ var getPaths = (ifCore) => {
     appNodeModules: resolveApp("../../node_modules"),
     appTsConfig: resolveApp("tsconfig.json"),
     appHtml: resolveApp("*.html"),
-    appEnv: resolveApp(".env"),
+    appEnv: resolveApp(".env*"),
     appTailwindConfig: void 0
   });
 };
@@ -126,6 +126,107 @@ var getIfCoreFns = () => {
   process.exit(1);
 };
 
+// src/lib/env.ts
+import { createRequire as createRequire2 } from "module";
+import { basename as basename2 } from "path";
+import glob from "glob";
+import { expand as dotenvExpand } from "dotenv-expand";
+import { config as dotenvConfig } from "dotenv";
+import stripIndent3 from "strip-indent";
+
+// src/lib/command.ts
+import { execaCommandSync } from "execa";
+var fail = (message) => {
+  logError(message);
+  process.exit(1);
+};
+var prepareCommand = (cmd) => {
+  return cmd.replace(/\n/gm, " ").replace(/[ \t]{2,}/gm, " ").trim();
+};
+var runCommandSync = (cmd, options) => {
+  return execaCommandSync(prepareCommand(cmd), options);
+};
+
+// src/lib/env.ts
+var require3 = createRequire2(import.meta.url);
+var getEnvVars = (files, ifMin, ifCore, ifLocalCore) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  const filePath = files.find((file) => basename2(file) === ".env");
+  dotenvExpand(dotenvConfig({ path: filePath }));
+  (_b = (_a = process.env).NODE_ENV) != null ? _b : _a.NODE_ENV = ifMin("production", "development");
+  (_d = (_c = process.env).BABEL_ENV) != null ? _d : _c.BABEL_ENV = ifMin("production", "development");
+  (_f = (_e = process.env).EXPOSE_VAR) != null ? _f : _e.EXPOSE_VAR = ifCore("rnw.tamaroCore", "rnw.tamaro");
+  (_h = (_g = process.env).ELEMENT_ATTRIBUTE_DATA_WIDGET) != null ? _h : _g.ELEMENT_ATTRIBUTE_DATA_WIDGET = ifCore("rnw-tamaro-core", "rnw-tamaro");
+  (_j = (_i = process.env).WEBPACK_UNIQUE_NAME) != null ? _j : _i.WEBPACK_UNIQUE_NAME = ifCore("RnwTamaroCore", "RnwTamaro");
+  process.env.BUILD_DATE = new Date().toISOString();
+  (_l = (_k = process.env).HMR_ENABLED) != null ? _l : _k.HMR_ENABLED = ifMin("false", "true");
+  if (ifCore()) {
+    process.env.PRODUCT_NAME = "tamaro";
+    const corePkgPath = resolveApp("package.json");
+    const { version } = require3(corePkgPath);
+    process.env.PRODUCT_VERSION = version;
+  }
+  if (!ifCore()) {
+    process.env.WIDGET_UUID = getWidgetUuid();
+    if (ifLocalCore()) {
+      process.env.CORE_URL = `http://0.0.0.0:1234/index.js`;
+    } else {
+      let version = process.env.CORE_VERSION;
+      version = version ? `@${version}` : "";
+      (_n = (_m = process.env).CORE_URL) != null ? _n : _m.CORE_URL = `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`;
+    }
+  }
+  const varNames = [
+    "NODE_ENV",
+    "BABEL_ENV",
+    "EXPOSE_VAR",
+    "ELEMENT_ATTRIBUTE_DATA_WIDGET",
+    "WEBPACK_UNIQUE_NAME",
+    "BUILD_DATE",
+    "PRODUCT_NAME",
+    "PRODUCT_VERSION",
+    "WIDGET_UUID",
+    "CORE_URL",
+    "CORE_VERSION",
+    "IS_CREDIT_CARD_IFRAME"
+  ];
+  const raw = Object.keys(process.env).filter((key) => /^PUBLIC_/.test(key) || varNames.includes(key)).reduce((env, key) => {
+    env[key] = process.env[key];
+    return env;
+  }, {});
+  const stringified = {
+    "process.env": Object.keys(raw).reduce((env, key) => {
+      env[key] = JSON.stringify(raw[key]);
+      return env;
+    }, {})
+  };
+  return { raw, stringified };
+};
+var assertEnvValid = (env) => {
+  const { ifCore } = getIfCoreFns();
+  const paths = getPaths(ifCore);
+  const files = glob.sync(paths.appEnv);
+  const envs = files.map((file) => basename2(file).replace(/^\.env\.?/, "")).filter((v) => !!v);
+  if (envs.length === 0) {
+    if (env) {
+      console.log("Flag \u201C--env\u201D is ignored.");
+    }
+  }
+  if (envs.length !== 0) {
+    if (!env) {
+      fail("Flag \u201C--env\u201D is required.");
+    }
+    if (!envs.includes(env)) {
+      fail(stripIndent3(`
+          Flag \u201C--env\u201D has wrong value.
+          Available values are: ${envs.map((v) => `\u201C${v}\u201D`).join(", ")}.
+        `));
+    }
+    const filePath = files.find((file) => basename2(file) === `.env.${env}`);
+    dotenvExpand(dotenvConfig({ path: filePath }));
+  }
+};
+
 export {
   __spreadValues,
   logTitle,
@@ -140,5 +241,9 @@ export {
   getWidgetUuid,
   getPaths,
   getRelativePaths,
-  getIfCoreFns
+  getIfCoreFns,
+  fail,
+  runCommandSync,
+  getEnvVars,
+  assertEnvValid
 };

package/dist/cli.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 import {
+  assertEnvValid,
+  fail,
   getIfCoreFns,
   getPaths,
   getWidgetUuid,
@@ -8,15 +10,16 @@ import {
   logError,
   logTitle,
   resolveBin,
-  resolveOwn
-} from "./chunk-PIEFLCDU.js";
+  resolveOwn,
+  runCommandSync
+} from "./chunk-OXDXJ5B5.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
 
 // package.json
 var name = "@raisenow/tamaro-cli";
-var version = "1.0.12";
+var version = "1.0.13";
 var author = {
   name: "RaiseNow",
   email: "development@raisenow.com"
@@ -47,17 +50,16 @@ var dependencies = {
   "@babel/runtime-corejs3": "^7.17.8",
   "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
   "@statoscope/webpack-plugin": "^5.20.1",
-  "@svgr/webpack": "^6.2.1",
   "@types/columnify": "^1.5.1",
-  "@types/lodash": "^4.14.180",
-  "@types/node": "^17.0.21",
+  "@types/lodash": "^4.14.181",
+  "@types/node": "^17.0.23",
   "@types/node-notifier": "^8.0.2",
   "@types/resolve-bin": "^0.4.1",
   "@types/webpack-config-utils": "^2.3.1",
-  "@typescript-eslint/eslint-plugin": "^5.15.0",
-  "@typescript-eslint/parser": "^5.15.0",
+  "@typescript-eslint/eslint-plugin": "^5.17.0",
+  "@typescript-eslint/parser": "^5.17.0",
   autoprefixer: "^10.4.4",
-  "babel-loader": "^8.2.3",
+  "babel-loader": "^8.2.4",
   "babel-plugin-lodash": "^3.3.4",
   chalk: "^5.0.1",
   "clean-webpack-plugin": "^4.0.0",
@@ -70,7 +72,7 @@ var dependencies = {
   dotenv: "^16.0.0",
   "dotenv-expand": "^8.0.3",
   "escape-string-regexp": "^5.0.0",
-  eslint: "^8.11.0",
+  eslint: "^8.12.0",
   "eslint-config-prettier": "^8.5.0",
   "eslint-plugin-node": "^11.1.0",
   "eslint-plugin-promise": "^6.0.0",
@@ -89,17 +91,17 @@ var dependencies = {
   postcss: "^8.4.12",
   "postcss-custom-properties": "^12.1.5",
   "postcss-loader": "^6.2.1",
-  prettier: "^2.6.0",
+  prettier: "^2.6.1",
   "react-refresh": "^0.11.0",
   "resolve-url-loader": "^5.0.0",
-  sass: "^1.49.9",
+  sass: "^1.49.10",
   "sass-loader": "^12.6.0",
   "source-map-loader": "^3.0.1",
   "strip-indent": "^4.0.0",
   "style-loader": "^3.3.1",
   "tsconfig-paths-webpack-plugin": "^3.5.2",
   tsup: "^5.12.1",
-  typescript: "^4.6.2",
+  typescript: "^4.6.3",
   "url-loader": "^4.1.1",
   webpack: "^5.70.0",
   "webpack-cli": "^4.9.2",
@@ -129,21 +131,6 @@ var AWS_CLOUDFRONT_DISTRIBUTION_ID = "EHJ1OM458YQ0I";
 
 // src/commands/dev.ts
 import { getPortPromise } from "portfinder";
-
-// src/lib/command.ts
-import { execaCommandSync } from "execa";
-var fail = (message) => {
-  logError(message);
-  process.exit(1);
-};
-var prepareCommand = (cmd) => {
-  return cmd.replace(/\n/gm, " ").replace(/[ \t]{2,}/gm, " ").trim();
-};
-var runCommandSync = (cmd, options) => {
-  return execaCommandSync(prepareCommand(cmd), options);
-};
-
-// src/commands/dev.ts
 var dev = async (options) => {
   assertOptionsValid(options);
   const flags = (await prepareFlags([], options)).join(" ");
@@ -161,14 +148,15 @@ var dev = async (options) => {
   runCommandSync(cmd, { stdio: "inherit" });
 };
 var assertOptionsValid = (options) => {
-  const { localCore, port } = options;
+  const { localCore, port, env } = options;
   const { ifCore } = getIfCoreFns();
   if (ifCore() && localCore) {
-    fail('Flag "--local-core" is redundant if running in Tamaro Core context.');
+    fail("Flag \u201C--local-core\u201D is redundant if running in Tamaro Core context.");
   }
   if (isNaN(Number(port))) {
-    fail('Flag "--port" should be a number.');
+    fail("Flag \u201C--port\u201D should be a number.");
   }
+  assertEnvValid(env);
 };
 var prepareFlags = async (flags, options) => {
   const { localCore, port: defaultPort } = options;
@@ -181,7 +169,7 @@ var prepareFlags = async (flags, options) => {
 };
 
 // src/lib/aws.ts
-import { execaCommandSync as execaCommandSync2 } from "execa";
+import { execaCommandSync } from "execa";
 import stripIndent from "strip-indent";
 var withAwsAuthenticate = (fn, options) => {
   awsAuthenticate(options);
@@ -227,17 +215,17 @@ var assertProfileValid = (profile) => {
   }
 };
 var getAvailableProfiles = () => {
-  const { stdout } = execaCommandSync2("aws configure list-profiles");
+  const { stdout } = execaCommandSync("aws configure list-profiles");
   return stdout.split("\n");
 };
 var checkIdentity = (options) => {
   const flags = prepareFlags2([], options).join(" ");
-  execaCommandSync2(`aws sts get-caller-identity ${flags}`);
+  execaCommandSync(`aws sts get-caller-identity ${flags}`);
 };
 var login = (options) => {
   const flags = prepareFlags2([], options).join(" ");
   try {
-    execaCommandSync2(`aws sso login ${flags}`, { stdio: "inherit" });
+    execaCommandSync(`aws sso login ${flags}`, { stdio: "inherit" });
     console.log("");
   } catch (error) {
     fail("Login failed.");
@@ -295,15 +283,16 @@ Bundle for \u201C${configName}\u201D customer configuration is done.`);
   });
 };
 var assertOptionsValid2 = (options) => {
-  const { localCore, deploy: deploy2, profile } = options;
+  const { localCore, deploy: deploy2, profile, env } = options;
   const { ifCore } = getIfCoreFns();
   if (ifCore() && localCore) {
-    fail('Flag "--local-core" is redundant if running in Tamaro Core context.');
+    fail("Flag \u201C--local-core\u201D is redundant if running in Tamaro Core context.");
   }
   if (localCore && deploy2) {
-    fail('Flags "--local-core" and "--deploy" must not be used together.');
+    fail("Flags \u201C--local-core\u201D and \u201C--deploy\u201D must not be used together.");
   }
   assertProfileValid(profile);
+  assertEnvValid(env);
 };
 var prepareFlags3 = (flags, options) => {
   const { localCore, analyze } = options;
@@ -404,7 +393,7 @@ var assertDistPathExists = (distPath) => {
 var assertTagValid = (tag) => {
   const regex = /^[a-zA-Z0-9-_.]+$/;
   if (!regex.test(tag)) {
-    fail(`Flag "--tag" has forbidden format. Allowed format: ${regex}.`);
+    fail(`Flag \u201C--tag\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var prepareFlags4 = (flags, options) => {
@@ -486,7 +475,7 @@ var assertConfigValid = (config) => {
   }
   const regex = /^[a-zA-Z0-9-_]+$/;
   if (!regex.test(config)) {
-    fail(`Flag "--config" has forbidden format. Allowed format: ${regex}.`);
+    fail(`Flag \u201C--config\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var prepareFlags6 = (flags, options) => {
@@ -545,7 +534,7 @@ var assertEmailConfigPathExists = (distPath) => {
 var assertBucketValid = (tag) => {
   const regex = /^[a-zA-Z0-9-_]+$/;
   if (!regex.test(tag)) {
-    fail(`Flag "--bucket" has forbidden format. Allowed format: ${regex}.`);
+    fail(`Flag \u201C--bucket\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var assertIsNotCore = () => {
@@ -566,10 +555,10 @@ process.on("SIGINT", () => {
   process.exit(1);
 });
 var cli = createCommand().name(package_default.name).version(package_default.version, "-v, --version");
-cli.command("dev").description("Run the local development server for Tamaro Core or a particular customer configuration").option("--local-core", "Load Tamaro Core from localhost:1234 instead of the CDN", false).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).action(async (options) => {
+cli.command("dev").description("Run the local development server for Tamaro Core or a particular customer configuration").option("--local-core", "Load Tamaro Core from localhost:1234 instead of the CDN", false).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).option("--env <env>", "Environment (dev, stage, prod)").action(async (options) => {
   await dev(options);
 });
-cli.command("build").description("Build an optimised (minified) bundle of Tamaro Core or a customer configuration").option("--local-core", "Load Tamaro Core from localhost:1234 instead of the CDN", false).option("--analyze", 'Generate bundle statistics to "reports" folder', false).option("--serve", "Run the generated bundle with a local web server", false).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).option("--deploy", "Deploy Tamaro Core or a customer configuration bundle to AWS S3", false).option("--tag <tag>", "Tag which should be used for the deployment of the bundle", DEFAULT_TAG).option("--profile <profile>", "AWS profile which should be used for the deployment of the bundle", DEFAULT_AWS_PROFILE).action(async (options) => {
+cli.command("build").description("Build an optimised (minified) bundle of Tamaro Core or a customer configuration").option("--local-core", "Load Tamaro Core from localhost:1234 instead of the CDN", false).option("--analyze", 'Generate bundle statistics to "reports" folder', false).option("--serve", "Run the generated bundle with a local web server", false).option("--port <port>", "Web server port", `${DEFAULT_PORT}`).option("--env <env>", "Environment (dev, stage, prod)").option("--deploy", "Deploy Tamaro Core or a customer configuration bundle to AWS S3", false).option("--tag <tag>", "Tag which should be used for the deployment of the bundle", DEFAULT_TAG).option("--profile <profile>", "AWS profile which should be used for the deployment of the bundle", DEFAULT_AWS_PROFILE).action(async (options) => {
   await build(options);
   if (options.serve) {
     await serve(options);

package/dist/webpack.config.js

@@ -1,18 +1,18 @@
 import {
   __spreadValues,
   extensions,
+  getEnvVars,
   getIfCoreFns,
   getPaths,
   getRelativePaths,
-  getWidgetUuid,
   logDataTable,
   logTitle,
   moduleFileExtensions,
   resolveApp
-} from "./chunk-PIEFLCDU.js";
+} from "./chunk-OXDXJ5B5.js";
 
 // src/webpack.config.ts
-import { createRequire as createRequire2 } from "module";
+import { createRequire } from "module";
 import { basename, dirname } from "path";
 import { existsSync } from "fs";
 import glob from "glob";
@@ -55,64 +55,8 @@ var InterpolateHtmlPlugin = class {
   }
 };
 
-// src/lib/env.ts
-import { createRequire } from "module";
-import { expand as dotenvExpand } from "dotenv-expand";
-import { config as dotenvConfig } from "dotenv";
-var require2 = createRequire(import.meta.url);
-var getEnvVars = (filePath, ifMin, ifCore, ifLocalCore) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
-  dotenvExpand(dotenvConfig({ path: filePath }));
-  (_b = (_a = process.env).NODE_ENV) != null ? _b : _a.NODE_ENV = ifMin("production", "development");
-  (_d = (_c = process.env).BABEL_ENV) != null ? _d : _c.BABEL_ENV = ifMin("production", "development");
-  (_f = (_e = process.env).EXPOSE_VAR) != null ? _f : _e.EXPOSE_VAR = ifCore("rnw.tamaroCore", "rnw.tamaro");
-  (_h = (_g = process.env).ELEMENT_ATTRIBUTE_DATA_WIDGET) != null ? _h : _g.ELEMENT_ATTRIBUTE_DATA_WIDGET = ifCore("rnw-tamaro-core", "rnw-tamaro");
-  (_j = (_i = process.env).WEBPACK_UNIQUE_NAME) != null ? _j : _i.WEBPACK_UNIQUE_NAME = ifCore("RnwTamaroCore", "RnwTamaro");
-  (_l = (_k = process.env).HMR_ENABLED) != null ? _l : _k.HMR_ENABLED = ifMin("false", "true");
-  if (ifCore()) {
-    process.env.PRODUCT_NAME = "tamaro";
-    const corePkgPath = resolveApp("package.json");
-    const { version } = require2(corePkgPath);
-    process.env.PRODUCT_VERSION = version;
-  }
-  if (!ifCore()) {
-    process.env.WIDGET_UUID = getWidgetUuid();
-    if (ifLocalCore()) {
-      process.env.CORE_URL = `http://0.0.0.0:1234/index.js`;
-    } else {
-      let version = process.env.CORE_VERSION;
-      version = version ? `@${version}` : "";
-      (_n = (_m = process.env).CORE_URL) != null ? _n : _m.CORE_URL = `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`;
-    }
-  }
-  const varNames = [
-    "NODE_ENV",
-    "BABEL_ENV",
-    "EXPOSE_VAR",
-    "ELEMENT_ATTRIBUTE_DATA_WIDGET",
-    "WEBPACK_UNIQUE_NAME",
-    "PRODUCT_NAME",
-    "PRODUCT_VERSION",
-    "WIDGET_UUID",
-    "CORE_URL",
-    "CORE_VERSION",
-    "IS_CREDIT_CARD_IFRAME"
-  ];
-  const raw = Object.keys(process.env).filter((key) => /^PUBLIC_/.test(key) || varNames.includes(key)).reduce((env, key) => {
-    env[key] = process.env[key];
-    return env;
-  }, {});
-  const stringified = {
-    "process.env": Object.keys(raw).reduce((env, key) => {
-      env[key] = JSON.stringify(raw[key]);
-      return env;
-    }, {})
-  };
-  return { raw, stringified };
-};
-
 // src/webpack.config.ts
-var require3 = createRequire2(import.meta.url);
+var require2 = createRequire(import.meta.url);
 var imageInlineSizeLimit = 0;
 var getWebpackConfig = async (env) => {
   const { ifMin, ifNotMin } = getIfUtils(env, ["min"]);
@@ -121,7 +65,8 @@ var getWebpackConfig = async (env) => {
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);
   const appHtmlFiles = glob.sync(paths.appHtml);
-  const envVars = getEnvVars(paths.appEnv, ifMin, ifCore, ifLocalCore);
+  const appEnvFiles = glob.sync(paths.appEnv);
+  const envVars = getEnvVars(appEnvFiles, ifMin, ifCore, ifLocalCore);
   const { ifHmr } = getIfUtils({ hmr: process.env.HMR_ENABLED === "true" }, ["hmr"]);
   const useTailwind = ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig);
   logTitle("Paths:");
@@ -132,7 +77,7 @@ var getWebpackConfig = async (env) => {
     return removeEmpty([
       ifMin({ loader: MiniCssExtractPlugin.loader }),
       ifNotMin({
-        loader: require3.resolve("style-loader"),
+        loader: require2.resolve("style-loader"),
         options: {
           attributes: {
             "data-widget": process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET
@@ -140,35 +85,35 @@ var getWebpackConfig = async (env) => {
         }
       }),
       {
-        loader: require3.resolve("css-loader"),
+        loader: require2.resolve("css-loader"),
         options: __spreadValues({
           sourceMap: ifNotMin(),
           importLoaders: 3
         }, cssOptions)
       },
       {
-        loader: require3.resolve("postcss-loader"),
+        loader: require2.resolve("postcss-loader"),
         options: {
           postcssOptions: {
             plugins: removeEmpty([
               useTailwind ? [
-                require3.resolve("tailwindcss", {
+                require2.resolve("tailwindcss", {
                   paths: [paths.appNodeModules]
                 }),
                 paths.appTailwindConfig
               ] : void 0,
-              require3.resolve("postcss-custom-properties"),
-              require3.resolve("autoprefixer")
+              require2.resolve("postcss-custom-properties"),
+              require2.resolve("autoprefixer")
             ])
           }
         }
       },
       {
-        loader: require3.resolve("resolve-url-loader"),
+        loader: require2.resolve("resolve-url-loader"),
         options: { sourceMap: ifNotMin() }
       },
       {
-        loader: require3.resolve("sass-loader"),
+        loader: require2.resolve("sass-loader"),
         options: { sourceMap: true }
       }
     ]);
@@ -213,7 +158,7 @@ var getWebpackConfig = async (env) => {
           enforce: "pre",
           exclude: /@babel\/runtime/,
           test: /\.(js|jsx|ts|tsx|css|scss)$/,
-          use: require3.resolve("source-map-loader")
+          use: require2.resolve("source-map-loader")
         }),
         {
           oneOf: [
@@ -224,42 +169,42 @@ var getWebpackConfig = async (env) => {
                 resolveApp("node_modules/micromark"),
                 resolveApp("node_modules/decode-named-character-reference")
               ], [resolveApp("."), resolveApp("../../src")]),
-              loader: require3.resolve("babel-loader"),
+              loader: require2.resolve("babel-loader"),
               options: {
                 babelrc: false,
                 configFile: false,
                 sourceMaps: ifNotMin(),
                 inputSourceMap: ifNotMin(),
                 presets: [
-                  require3.resolve("@babel/preset-env"),
+                  require2.resolve("@babel/preset-env"),
                   [
-                    require3.resolve("@babel/preset-typescript"),
+                    require2.resolve("@babel/preset-typescript"),
                     {
                       allowDeclareFields: true
                     }
                   ],
-                  require3.resolve("@babel/preset-react")
+                  require2.resolve("@babel/preset-react")
                 ],
                 plugins: removeEmpty([
                   [
-                    require3.resolve("@babel/plugin-transform-runtime"),
+                    require2.resolve("@babel/plugin-transform-runtime"),
                     {
                       corejs: {
                         version: 3,
                         proposals: true
                       },
-                      absoluteRuntime: dirname(require3.resolve("@babel/runtime-corejs3/package.json"))
+                      absoluteRuntime: dirname(require2.resolve("@babel/runtime-corejs3/package.json"))
                     }
                   ],
                   [
-                    require3.resolve("@babel/plugin-proposal-decorators"),
+                    require2.resolve("@babel/plugin-proposal-decorators"),
                     {
                       legacy: true
                     }
                   ],
-                  require3.resolve("@babel/plugin-syntax-dynamic-import"),
-                  require3.resolve("babel-plugin-lodash"),
-                  ifHmr(require3.resolve("react-refresh/babel"))
+                  require2.resolve("@babel/plugin-syntax-dynamic-import"),
+                  require2.resolve("babel-plugin-lodash"),
+                  ifHmr(require2.resolve("react-refresh/babel"))
                 ])
               }
             },
@@ -280,47 +225,7 @@ var getWebpackConfig = async (env) => {
               })
             },
             {
-              test: /\.svg$/,
-              issuer: [/\.html$/, /\.s?css$/],
-              type: "asset",
-              parser: {
-                dataUrlCondition: {
-                  maxSize: imageInlineSizeLimit
-                }
-              }
-            },
-            {
-              test: /\.svg$/,
-              issuer: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-              use: [
-                {
-                  loader: require3.resolve("@svgr/webpack"),
-                  options: {
-                    svgoConfig: {
-                      plugins: [
-                        {
-                          removeHiddenElems: false,
-                          moveGroupAttrsToElems: false,
-                          collapseGroups: false
-                        }
-                      ]
-                    },
-                    prettier: false,
-                    titleProp: true,
-                    ref: true
-                  }
-                },
-                {
-                  loader: require3.resolve("url-loader"),
-                  options: {
-                    name: "assets/[name]-[contenthash:16].[ext]",
-                    limit: imageInlineSizeLimit
-                  }
-                }
-              ]
-            },
-            {
-              test: /\.(png|jpe?g|webp|gif|ico|ttf|eot|woff2?)$/,
+              test: /\.(png|jpe?g|svg|webp|gif|ico|ttf|eot|woff2?)$/,
               type: "asset",
               parser: {
                 dataUrlCondition: {
@@ -331,13 +236,13 @@ var getWebpackConfig = async (env) => {
             {
               test: /\.ya?ml$/,
               use: [
-                { loader: require3.resolve("json-loader") },
-                { loader: require3.resolve("yaml-loader") }
+                { loader: require2.resolve("json-loader") },
+                { loader: require2.resolve("yaml-loader") }
               ]
             },
             {
               test: /\.html$/,
-              loader: require3.resolve("html-loader"),
+              loader: require2.resolve("html-loader"),
               options: {
                 minimize: false
               }
@@ -375,7 +280,7 @@ var getWebpackConfig = async (env) => {
       new webpack.ProgressPlugin(),
       new ESLintPlugin({
         extensions: moduleFileExtensions,
-        eslintPath: require3.resolve("eslint"),
+        eslintPath: require2.resolve("eslint"),
         cwd: paths.app,
         resolvePluginsRelativeTo: paths.app
       }),
@@ -390,7 +295,7 @@ var getWebpackConfig = async (env) => {
       new webpack.DefinePlugin(envVars.stringified),
       new ForkTsCheckerWebpackPlugin({
         typescript: {
-          typescriptPath: require3.resolve("typescript", {
+          typescriptPath: require2.resolve("typescript", {
             paths: [paths.appNodeModules]
           }),
           configFile: paths.appTsConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
@@ -31,17 +31,16 @@
     "@babel/runtime-corejs3": "^7.17.8",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
     "@statoscope/webpack-plugin": "^5.20.1",
-    "@svgr/webpack": "^6.2.1",
     "@types/columnify": "^1.5.1",
-    "@types/lodash": "^4.14.180",
-    "@types/node": "^17.0.21",
+    "@types/lodash": "^4.14.181",
+    "@types/node": "^17.0.23",
     "@types/node-notifier": "^8.0.2",
     "@types/resolve-bin": "^0.4.1",
     "@types/webpack-config-utils": "^2.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
-    "@typescript-eslint/parser": "^5.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.17.0",
+    "@typescript-eslint/parser": "^5.17.0",
     "autoprefixer": "^10.4.4",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "^8.2.4",
     "babel-plugin-lodash": "^3.3.4",
     "chalk": "^5.0.1",
     "clean-webpack-plugin": "^4.0.0",
@@ -54,7 +53,7 @@
     "dotenv": "^16.0.0",
     "dotenv-expand": "^8.0.3",
     "escape-string-regexp": "^5.0.0",
-    "eslint": "^8.11.0",
+    "eslint": "^8.12.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
@@ -73,17 +72,17 @@
     "postcss": "^8.4.12",
     "postcss-custom-properties": "^12.1.5",
     "postcss-loader": "^6.2.1",
-    "prettier": "^2.6.0",
+    "prettier": "^2.6.1",
     "react-refresh": "^0.11.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.49.9",
+    "sass": "^1.49.10",
     "sass-loader": "^12.6.0",
     "source-map-loader": "^3.0.1",
     "strip-indent": "^4.0.0",
     "style-loader": "^3.3.1",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "tsup": "^5.12.1",
-    "typescript": "^4.6.2",
+    "typescript": "^4.6.3",
     "url-loader": "^4.1.1",
     "webpack": "^5.70.0",
     "webpack-cli": "^4.9.2",

package/src/cli.ts

@@ -50,6 +50,7 @@ cli
     false,
   )
   .option('--port <port>', 'Web server port', `${DEFAULT_PORT}`)
+  .option('--env <env>', 'Environment (dev, stage, prod)')
   .action(async (options: DevOptions) => {
     await dev(options)
   })
@@ -67,6 +68,7 @@ cli
   .option('--analyze', 'Generate bundle statistics to "reports" folder', false)
   .option('--serve', 'Run the generated bundle with a local web server', false)
   .option('--port <port>', 'Web server port', `${DEFAULT_PORT}`)
+  .option('--env <env>', 'Environment (dev, stage, prod)')
   .option(
     '--deploy',
     'Deploy Tamaro Core or a customer configuration bundle to AWS S3',

package/src/commands/build.ts

@@ -7,6 +7,7 @@ import {
   resolveBin,
   resolveOwn,
 } from 'lib/resolve'
+import {assertEnvValid} from 'lib/env'
 import {logCommand, logTitle} from 'lib/logging'
 import {notify} from 'lib/notifier'
 import {fail, runCommandSync} from 'lib/command'
@@ -19,6 +20,7 @@ export type BuildOptions = {
   analyze: boolean
   serve: boolean
   deploy: boolean
+  env: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -68,18 +70,19 @@ export const build = async (
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: BuildOptions & DeployOptions) => {
-  const {localCore, deploy, profile} = options
+  const {localCore, deploy, profile, env} = options
   const {ifCore} = getIfCoreFns()
 
   if (ifCore() && localCore) {
-    fail('Flag "--local-core" is redundant if running in Tamaro Core context.')
+    fail('Flag “--local-core” is redundant if running in Tamaro Core context.')
   }
 
   if (localCore && deploy) {
-    fail('Flags "--local-core" and "--deploy" must not be used together.')
+    fail('Flags “--local-core” and “--deploy” must not be used together.')
   }
 
   assertProfileValid(profile)
+  assertEnvValid(env)
 }
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/commands/deploy-email-config.ts

@@ -91,7 +91,7 @@ const assertBucketValid = (tag: string) => {
   const regex = /^[a-zA-Z0-9-_]+$/
 
   if (!regex.test(tag)) {
-    fail(`Flag "--bucket" has forbidden format. Allowed format: ${regex}.`)
+    fail(`Flag “--bucket” has forbidden format. Allowed format: ${regex}.`)
   }
 }
 

package/src/commands/deploy.ts

@@ -153,7 +153,7 @@ const assertTagValid = (tag: string) => {
   const regex = /^[a-zA-Z0-9-_.]+$/
 
   if (!regex.test(tag)) {
-    fail(`Flag "--tag" has forbidden format. Allowed format: ${regex}.`)
+    fail(`Flag “--tag” has forbidden format. Allowed format: ${regex}.`)
   }
 }
 

package/src/commands/dev.ts

@@ -2,12 +2,14 @@ import {getPortPromise} from 'portfinder'
 import {getIfCoreFns, resolveBin, resolveOwn} from 'lib/resolve'
 import {logCommand, logTitle} from 'lib/logging'
 import {fail, runCommandSync} from 'lib/command'
+import {assertEnvValid} from 'lib/env'
 
 ///////////////////////////////////////////////////////////////////////////////
 
 export type DevOptions = {
   localCore: boolean
   port: string
+  env: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -37,16 +39,18 @@ export const dev = async (options: DevOptions): Promise<void> => {
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: DevOptions) => {
-  const {localCore, port} = options
+  const {localCore, port, env} = options
   const {ifCore} = getIfCoreFns()
 
   if (ifCore() && localCore) {
-    fail('Flag "--local-core" is redundant if running in Tamaro Core context.')
+    fail('Flag “--local-core” is redundant if running in Tamaro Core context.')
   }
 
   if (isNaN(Number(port))) {
-    fail('Flag "--port" should be a number.')
+    fail('Flag “--port” should be a number.')
   }
+
+  assertEnvValid(env)
 }
 
 ///////////////////////////////////////////////////////////////////////////////

package/src/commands/list-deployed.ts

@@ -88,7 +88,7 @@ const assertConfigValid = (config: string | undefined) => {
   const regex = /^[a-zA-Z0-9-_]+$/
 
   if (!regex.test(config)) {
-    fail(`Flag "--config" has forbidden format. Allowed format: ${regex}.`)
+    fail(`Flag “--config” has forbidden format. Allowed format: ${regex}.`)
   }
 }
 

package/src/lib/env.ts

@@ -1,8 +1,12 @@
 import {createRequire} from 'module'
+import {basename} from 'path'
+import glob from 'glob'
 import type {IfUtilsFn} from 'webpack-config-utils'
 import {expand as dotenvExpand} from 'dotenv-expand'
 import {config as dotenvConfig} from 'dotenv'
-import {getWidgetUuid, resolveApp} from 'lib/resolve'
+import stripIndent from 'strip-indent'
+import {getIfCoreFns, getPaths, getWidgetUuid, resolveApp} from 'lib/resolve'
+import {fail} from 'lib/command'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,11 +21,13 @@ const require = createRequire(import.meta.url)
 ///////////////////////////////////////////////////////////////////////////////
 
 export const getEnvVars = (
-  filePath: string,
+  files: string[],
   ifMin: IfUtilsFn,
   ifCore: IfUtilsFn,
   ifLocalCore: IfUtilsFn,
 ) => {
+  const filePath = files.find((file) => basename(file) === '.env')
+
   dotenvExpand(dotenvConfig({path: filePath}))
 
   process.env.NODE_ENV ??= ifMin('production', 'development')
@@ -32,6 +38,7 @@ export const getEnvVars = (
     'rnw-tamaro',
   )
   process.env.WEBPACK_UNIQUE_NAME ??= ifCore('RnwTamaroCore', 'RnwTamaro')
+  process.env.BUILD_DATE = new Date().toISOString()
 
   // HMR doesn't work in ie11, it breaks everything.
   // If you want to run dev-server and test in ie11, set HMR_ENABLED to 'false'
@@ -68,6 +75,7 @@ export const getEnvVars = (
     'EXPOSE_VAR',
     'ELEMENT_ATTRIBUTE_DATA_WIDGET',
     'WEBPACK_UNIQUE_NAME',
+    'BUILD_DATE',
 
     // core
     'PRODUCT_NAME',
@@ -100,3 +108,38 @@ export const getEnvVars = (
 
   return {raw, stringified}
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const assertEnvValid = (env: string) => {
+  const {ifCore} = getIfCoreFns()
+  const paths = getPaths(ifCore)
+  const files = glob.sync(paths.appEnv)
+  const envs = files
+    .map((file) => basename(file).replace(/^\.env\.?/, ''))
+    .filter((v) => !!v)
+
+  if (envs.length === 0) {
+    if (env) {
+      console.log('Flag “--env” is ignored.')
+    }
+  }
+
+  if (envs.length !== 0) {
+    if (!env) {
+      fail('Flag “--env” is required.')
+    }
+
+    if (!envs.includes(env)) {
+      fail(
+        stripIndent(`
+          Flag “--env” has wrong value.
+          Available values are: ${envs.map((v) => `“${v}”`).join(', ')}.
+        `),
+      )
+    }
+
+    const filePath = files.find((file) => basename(file) === `.env.${env}`)
+    dotenvExpand(dotenvConfig({path: filePath}))
+  }
+}

package/src/lib/resolve.ts

@@ -72,7 +72,7 @@ export const getPaths = (ifCore: IfUtilsFn) => {
       appNodeModules: resolveApp('node_modules'),
       appTsConfig: resolveApp('tsconfig.json'),
       appHtml: resolveApp('src/*.html'),
-      appEnv: resolveApp('.env'),
+      appEnv: resolveApp('.env*'),
       appTailwindConfig: resolveApp('tailwind.config.js'),
     },
     {
@@ -82,7 +82,7 @@ export const getPaths = (ifCore: IfUtilsFn) => {
       appNodeModules: resolveApp('../../node_modules'),
       appTsConfig: resolveApp('tsconfig.json'),
       appHtml: resolveApp('*.html'),
-      appEnv: resolveApp('.env'),
+      appEnv: resolveApp('.env*'),
       appTailwindConfig: undefined,
     },
   )

package/src/webpack.config.ts

@@ -44,7 +44,8 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const appHtmlFiles = glob.sync(paths.appHtml)
-  const envVars = getEnvVars(paths.appEnv, ifMin, ifCore, ifLocalCore)
+  const appEnvFiles = glob.sync(paths.appEnv)
+  const envVars = getEnvVars(appEnvFiles, ifMin, ifCore, ifLocalCore)
   const {ifHmr} = getIfUtils({hmr: process.env.HMR_ENABLED === 'true'}, ['hmr'])
   const useTailwind =
     ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig)
@@ -231,53 +232,9 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
               }),
             },
 
-            // SVG (in HTML and styles)
-            {
-              test: /\.svg$/,
-              issuer: [/\.html$/, /\.s?css$/],
-              type: 'asset',
-              parser: {
-                dataUrlCondition: {
-                  maxSize: imageInlineSizeLimit,
-                },
-              },
-            },
-
-            // SVG (in components)
-            {
-              test: /\.svg$/,
-              issuer: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-              use: [
-                {
-                  loader: require.resolve('@svgr/webpack'),
-                  options: {
-                    svgoConfig: {
-                      plugins: [
-                        {
-                          removeHiddenElems: false,
-                          moveGroupAttrsToElems: false,
-                          collapseGroups: false,
-                        },
-                      ],
-                    },
-                    prettier: false,
-                    titleProp: true,
-                    ref: true,
-                  },
-                },
-                {
-                  loader: require.resolve('url-loader'),
-                  options: {
-                    name: 'assets/[name]-[contenthash:16].[ext]',
-                    limit: imageInlineSizeLimit,
-                  },
-                },
-              ],
-            },
-
             // Images and fonts
             {
-              test: /\.(png|jpe?g|webp|gif|ico|ttf|eot|woff2?)$/,
+              test: /\.(png|jpe?g|svg|webp|gif|ico|ttf|eot|woff2?)$/,
               type: 'asset',
               parser: {
                 dataUrlCondition: {