@raisenow/tamaro-cli 1.0.12 → 1.0.15

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-BWJBN44Y.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,109 @@ 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 halt = (message, exitCode = 1) => {
+  logError(message);
+  process.exit(exitCode);
+};
+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, _o, _p;
+  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).PUBLIC_URL) != null ? _l : _k.PUBLIC_URL = "";
+  (_n = (_m = process.env).HMR_ENABLED) != null ? _n : _m.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}` : "";
+      (_p = (_o = process.env).CORE_URL) != null ? _p : _o.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",
+    "PUBLIC_URL",
+    "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) {
+      halt("Flag \u201C--env\u201D is required.");
+    }
+    if (!envs.includes(env)) {
+      halt(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 +243,9 @@ export {
   getWidgetUuid,
   getPaths,
   getRelativePaths,
-  getIfCoreFns
+  getIfCoreFns,
+  halt,
+  runCommandSync,
+  getEnvVars,
+  assertEnvValid
 };

package/dist/cli.js

@@ -1,22 +1,25 @@
 #!/usr/bin/env node
 import {
+  assertEnvValid,
   getIfCoreFns,
   getPaths,
   getWidgetUuid,
+  halt,
   logCommand,
   logDataTable,
   logError,
   logTitle,
   resolveBin,
-  resolveOwn
-} from "./chunk-PIEFLCDU.js";
+  resolveOwn,
+  runCommandSync
+} from "./chunk-BWJBN44Y.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
 
 // package.json
 var name = "@raisenow/tamaro-cli";
-var version = "1.0.12";
+var version = "1.0.15";
 var author = {
   name: "RaiseNow",
   email: "development@raisenow.com"
@@ -37,48 +40,47 @@ var engines = {
 };
 var dependencies = {
   "@babel/cli": "^7.17.6",
-  "@babel/core": "^7.17.8",
-  "@babel/plugin-proposal-decorators": "^7.17.8",
+  "@babel/core": "^7.17.9",
+  "@babel/plugin-proposal-decorators": "^7.17.9",
   "@babel/plugin-syntax-dynamic-import": "^7.8.3",
   "@babel/plugin-transform-runtime": "^7.17.0",
   "@babel/preset-env": "^7.16.11",
   "@babel/preset-react": "^7.16.7",
   "@babel/preset-typescript": "^7.16.7",
-  "@babel/runtime-corejs3": "^7.17.8",
-  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
+  "@babel/runtime-corejs3": "^7.17.9",
+  "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
   "@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.182",
+  "@types/node": "^17.0.26",
   "@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",
-  autoprefixer: "^10.4.4",
-  "babel-loader": "^8.2.3",
+  "@typescript-eslint/eslint-plugin": "^5.20.0",
+  "@typescript-eslint/parser": "^5.20.0",
+  autoprefixer: "^10.4.5",
+  "babel-loader": "^8.2.5",
   "babel-plugin-lodash": "^3.3.4",
   chalk: "^5.0.1",
   "clean-webpack-plugin": "^4.0.0",
   columnify: "^1.6.0",
-  commander: "^9.1.0",
+  commander: "^9.2.0",
   "copy-webpack-plugin": "^10.2.4",
-  "core-js": "^3.21.1",
+  "core-js": "^3.22.2",
   "css-loader": "^6.7.1",
   "css-minimizer-webpack-plugin": "^3.4.1",
   dotenv: "^16.0.0",
   "dotenv-expand": "^8.0.3",
   "escape-string-regexp": "^5.0.0",
-  eslint: "^8.11.0",
+  eslint: "^8.14.0",
   "eslint-config-prettier": "^8.5.0",
   "eslint-plugin-node": "^11.1.0",
   "eslint-plugin-promise": "^6.0.0",
   "eslint-webpack-plugin": "^3.1.1",
   execa: "^6.1.0",
   "file-loader": "^6.2.0",
-  "fork-ts-checker-webpack-plugin": "^7.2.1",
-  glob: "^7.2.0",
+  "fork-ts-checker-webpack-plugin": "^7.2.7",
+  glob: "^8.0.1",
   "html-loader": "^3.1.0",
   "html-webpack-plugin": "^5.5.0",
   "json-loader": "^0.5.7",
@@ -87,25 +89,25 @@ var dependencies = {
   "node-notifier": "^10.0.1",
   portfinder: "^1.0.28",
   postcss: "^8.4.12",
-  "postcss-custom-properties": "^12.1.5",
+  "postcss-custom-properties": "^12.1.7",
   "postcss-loader": "^6.2.1",
-  prettier: "^2.6.0",
-  "react-refresh": "^0.11.0",
+  prettier: "^2.6.2",
+  "react-refresh": "^0.12.0",
   "resolve-url-loader": "^5.0.0",
-  sass: "^1.49.9",
+  sass: "^1.50.1",
   "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",
+  tsup: "^5.12.6",
+  typescript: "^4.6.3",
   "url-loader": "^4.1.1",
-  webpack: "^5.70.0",
+  webpack: "^5.72.0",
   "webpack-cli": "^4.9.2",
   "webpack-config-utils": "^2.3.1",
-  "webpack-dev-server": "^4.7.4",
-  "yaml-loader": "^0.6.0"
+  "webpack-dev-server": "^4.8.1",
+  "yaml-loader": "^0.7.0"
 };
 var package_default = {
   name,
@@ -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.');
+    halt("Flag \u201C--local-core\u201D is redundant if running in Tamaro Core context.");
   }
   if (isNaN(Number(port))) {
-    fail('Flag "--port" should be a number.');
+    halt("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);
@@ -223,24 +211,24 @@ var assertProfileValid = (profile) => {
       Check the wiki for more information:
       https://raisenow.atlassian.net/wiki/x/lIrWvg
     `);
-    fail(message);
+    halt(message);
   }
 };
 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.");
+    halt("Login failed.");
   }
 };
 var prepareFlags2 = (flags, options) => {
@@ -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.');
+    halt("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.');
+    halt("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;
@@ -318,6 +307,7 @@ var prepareFlags3 = (flags, options) => {
 
 // src/commands/deploy.ts
 import { existsSync } from "fs";
+import stripIndent3 from "strip-indent";
 var deploy = async (options) => {
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);
@@ -341,7 +331,7 @@ var deploy = async (options) => {
   try {
     withAwsAuthenticate(() => runCommandSync(cmdSyncAll, { stdout: "inherit" }), options);
   } catch (error) {
-    fail(error.stderr);
+    halt(error.stderr);
   }
   const cmdCpEntry = `
     aws s3 cp ${paths.appDist}/${entryFilename} ${deployUrl}/${entryFilename}
@@ -354,7 +344,7 @@ var deploy = async (options) => {
   try {
     withAwsAuthenticate(() => runCommandSync(cmdCpEntry, { stdout: "inherit" }), options);
   } catch (error) {
-    fail(error.stderr);
+    halt(error.stderr);
   }
   const cmdInvalidateCache = `
     aws cloudfront create-invalidation
@@ -367,7 +357,7 @@ var deploy = async (options) => {
   try {
     withAwsAuthenticate(() => runCommandSync(cmdInvalidateCache), options);
   } catch (error) {
-    fail(error.stderr);
+    halt(error.stderr);
   }
   const demoPage = `https://${AWS_S3_BUCKET}/${configName}/${tag}/index.html`;
   const entryPoint = `https://${AWS_S3_BUCKET}/${configName}/${tag}/${entryFilename}`;
@@ -395,16 +385,16 @@ var assertOptionsValid3 = (options) => {
 };
 var assertDistPathExists = (distPath) => {
   if (!existsSync(distPath)) {
-    fail(`
-      Dist folder does not exists.
-      Make sure you have built the bundle before trying to deploy it.
-    `);
+    halt(stripIndent3(`
+        Dist folder does not exists.
+        Make sure you have built the bundle before trying to deploy it.
+      `));
   }
 };
 var assertTagValid = (tag) => {
   const regex = /^[a-zA-Z0-9-_.]+$/;
   if (!regex.test(tag)) {
-    fail(`Flag "--tag" has forbidden format. Allowed format: ${regex}.`);
+    halt(`Flag \u201C--tag\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var prepareFlags4 = (flags, options) => {
@@ -430,7 +420,7 @@ var serve = async (options) => {
 var assertOptionsValid4 = (options) => {
   const { port } = options;
   if (isNaN(Number(port))) {
-    fail('Flag "--port" should be a number.');
+    halt('Flag "--port" should be a number.');
   }
 };
 var prepareFlags5 = async (flags, options) => {
@@ -459,7 +449,7 @@ var listDeployed = async (options) => {
   } catch (error) {
     out = error.stdout;
     if (error.stderr) {
-      fail(error.stderr);
+      halt(error.stderr);
     }
   }
   const lines = out.split("\n");
@@ -486,7 +476,7 @@ var assertConfigValid = (config) => {
   }
   const regex = /^[a-zA-Z0-9-_]+$/;
   if (!regex.test(config)) {
-    fail(`Flag "--config" has forbidden format. Allowed format: ${regex}.`);
+    halt(`Flag \u201C--config\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var prepareFlags6 = (flags, options) => {
@@ -504,8 +494,8 @@ var deployEmailConfig = async (options) => {
   const paths = getPaths(ifCore);
   const emailConfigPath = `${paths.app}/email-config`;
   assertOptionsValid6(options);
-  assertEmailConfigPathExists(emailConfigPath);
   assertIsNotCore();
+  assertEmailConfigPathExists(emailConfigPath);
   const flags = prepareFlags7([], options).join(" ");
   const { bucket } = options;
   const configName = getWidgetUuid();
@@ -521,7 +511,7 @@ var deployEmailConfig = async (options) => {
   try {
     withAwsAuthenticate(() => runCommandSync(cmd, { stdout: "inherit" }), options);
   } catch (error) {
-    fail(error.stderr);
+    halt(error.stderr);
   }
   logTitle(`Email configuration for \u201C${configName}\u201D customer configuration is deployed.`);
   logDataTable({ "Deploy URL:": deployUrl });
@@ -539,19 +529,19 @@ var assertOptionsValid6 = (options) => {
 };
 var assertEmailConfigPathExists = (distPath) => {
   if (!existsSync2(distPath)) {
-    fail("Email config folder does not exists. Nothing to deploy.");
+    halt("Email config folder does not exists. Nothing to deploy.", 0);
   }
 };
 var assertBucketValid = (tag) => {
   const regex = /^[a-zA-Z0-9-_]+$/;
   if (!regex.test(tag)) {
-    fail(`Flag "--bucket" has forbidden format. Allowed format: ${regex}.`);
+    halt(`Flag \u201C--bucket\u201D has forbidden format. Allowed format: ${regex}.`);
   }
 };
 var assertIsNotCore = () => {
   const { ifCore } = getIfCoreFns();
   if (ifCore()) {
-    fail("You cannot deploy widget email configuration for Tamaro Core.");
+    halt("You cannot deploy widget email configuration for Tamaro Core.");
   }
 };
 var prepareFlags7 = (flags, options) => {
@@ -566,10 +556,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);