@raisenow/tamaro-cli 1.0.24 → 1.0.26

package/dist/{chunk-WGWOPIQD.js → chunk-ZAKDPU5F.js}

@@ -137,7 +137,7 @@ var getIfCoreFns = () => {
 // src/lib/env.ts
 import { createRequire as createRequire2 } from "module";
 import { basename as basename2 } from "path";
-import glob from "glob";
+import { globSync } from "glob";
 import { expand as dotenvExpand } from "dotenv-expand";
 import { config as dotenvConfig } from "dotenv";
 import stripIndent3 from "strip-indent";
@@ -159,7 +159,9 @@ var runCommandSync = (cmd, options) => {
 var require3 = createRequire2(import.meta.url);
 var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
   const filePath = files.find((file) => basename2(file) === ".env");
-  dotenvExpand(dotenvConfig({ path: filePath }));
+  if (filePath) {
+    dotenvExpand(dotenvConfig({ path: filePath }));
+  }
   process.env.NODE_ENV ??= ifMin("production", "development");
   process.env.BABEL_ENV ??= ifMin("production", "development");
   process.env.EXPOSE_VAR ??= ifCore("rnw.tamaroCore", "rnw.tamaro");
@@ -168,7 +170,7 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
     "rnw-tamaro"
   );
   process.env.WEBPACK_UNIQUE_NAME ??= ifCore("RnwTamaroCore", "RnwTamaro");
-  process.env.BUILD_DATE = new Date().toISOString();
+  process.env.BUILD_DATE = (/* @__PURE__ */ new Date()).toISOString();
   process.env.PUBLIC_URL ??= "";
   process.env.HMR_ENABLED ??= ifMin("false", "true");
   if (ifCore()) {
@@ -189,6 +191,7 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
     }
   }
   const varNames = [
+    // common
     "NODE_ENV",
     "BABEL_ENV",
     "EXPOSE_VAR",
@@ -196,8 +199,15 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
     "WEBPACK_UNIQUE_NAME",
     "BUILD_DATE",
     "PUBLIC_URL",
+    // core
     "PRODUCT_NAME",
     "PRODUCT_VERSION",
+    // config
+    "WIDGET_UUID",
+    "CORE_URL",
+    "CORE_VERSION",
+    // should be explicitly specified in each config
+    // epik (obsolete since Tamaro v2.5.0)
     "EPP_API_KEY_DEFAULT",
     "EPP_API_URL_STAGE",
     "EPP_API_URL_PROD",
@@ -207,9 +217,8 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
     "EPP_PROXY_URL_PROD",
     "EPMS_PROXY_URL_STAGE",
     "EPMS_PROXY_URL_PROD",
-    "WIDGET_UUID",
-    "CORE_URL",
-    "CORE_VERSION"
+    "EPMS_TWINT_CHECKOUT_URL_STAGE",
+    "EPMS_TWINT_CHECKOUT_URL_PROD"
   ];
   const raw = Object.keys(process.env).filter((key) => /^PUBLIC_/.test(key) || varNames.includes(key)).reduce((env, key) => {
     env[key] = process.env[key];
@@ -226,8 +235,8 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
 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);
+  const files = globSync(paths.appEnv);
+  const envs = files.map((file) => basename2(file).replace(/^\.env\./, "")).map((file) => basename2(file).replace(/^\.env$/, "")).filter((v) => !!v);
   if (envs.length === 0) {
     if (env) {
       console.log("Flag \u201C--env\u201D is ignored.");
@@ -237,7 +246,7 @@ var assertEnvValid = (env) => {
     if (!env) {
       halt("Flag \u201C--env\u201D is required.");
     }
-    if (!envs.includes(env)) {
+    if (env && !envs.includes(env)) {
       halt(
         stripIndent3(`
           Flag \u201C--env\u201D has wrong value.
@@ -245,7 +254,17 @@ var assertEnvValid = (env) => {
         `)
       );
     }
-    const filePath = files.find((file) => basename2(file) === `.env.${env}`);
+  }
+};
+var applyEnv = (env) => {
+  if (!env) {
+    return;
+  }
+  const { ifCore } = getIfCoreFns();
+  const paths = getPaths(ifCore);
+  const files = globSync(paths.appEnv);
+  const filePath = files.find((file) => basename2(file) === `.env.${env}`);
+  if (filePath) {
     dotenvExpand(dotenvConfig({ path: filePath }));
   }
 };
@@ -276,5 +295,6 @@ export {
   halt,
   runCommandSync,
   getEnvVars,
-  assertEnvValid
+  assertEnvValid,
+  applyEnv
 };

package/dist/cli.js

@@ -9,6 +9,7 @@ import {
   DEFAULT_TAG,
   HTTPS_CRT_FILE,
   HTTPS_KEY_FILE,
+  applyEnv,
   assertEnvValid,
   getIfCoreFns,
   getPaths,
@@ -21,7 +22,7 @@ import {
   resolveBin,
   resolveOwn,
   runCommandSync
-} from "./chunk-WGWOPIQD.js";
+} from "./chunk-ZAKDPU5F.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
@@ -29,7 +30,7 @@ import { createCommand } from "commander";
 // package.json
 var package_default = {
   name: "@raisenow/tamaro-cli",
-  version: "1.0.24",
+  version: "1.0.26",
   author: {
     name: "RaiseNow",
     email: "development@raisenow.com"
@@ -49,26 +50,26 @@ var package_default = {
     npm: ">=8"
   },
   dependencies: {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/cli": "^7.21.0",
+    "@babel/core": "^7.21.4",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-env": "^7.21.4",
     "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime-corejs3": "^7.20.13",
+    "@babel/preset-typescript": "^7.21.4",
+    "@babel/runtime-corejs3": "^7.21.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@statoscope/webpack-plugin": "^5.24.0",
+    "@statoscope/webpack-plugin": "^5.26.2",
     "@types/columnify": "^1.5.1",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.18",
+    "@types/lodash": "^4.14.192",
+    "@types/node": "^18.15.11",
     "@types/node-notifier": "^8.0.2",
     "@types/resolve-bin": "^0.4.1",
     "@types/webpack-config-utils": "^2.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    autoprefixer: "^10.4.13",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
+    autoprefixer: "^10.4.14",
     "babel-loader": "^9.1.2",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-lodash": "^3.3.4",
@@ -77,48 +78,53 @@ var package_default = {
     columnify: "^1.6.0",
     commander: "^10.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.27.2",
+    "core-js": "^3.30.0",
     "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
+    "css-minimizer-webpack-plugin": "^5.0.0",
     dotenv: "^16.0.3",
     "dotenv-expand": "^10.0.0",
     "escape-string-regexp": "^5.0.0",
-    eslint: "^8.33.0",
-    "eslint-config-prettier": "^8.6.0",
+    eslint: "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-webpack-plugin": "^3.2.0",
-    execa: "^6.1.0",
+    "eslint-webpack-plugin": "^4.0.0",
+    execa: "^7.1.1",
     "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^7.3.0",
-    glob: "^8.1.0",
+    "fork-ts-checker-webpack-plugin": "^8.0.0",
+    glob: "^9.3.4",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "^5.5.0",
     "json-loader": "^0.5.7",
     lodash: "^4.17.21",
-    "mini-css-extract-plugin": "^2.7.2",
+    "mini-css-extract-plugin": "^2.7.5",
     "node-notifier": "^10.0.1",
     portfinder: "^1.0.32",
     postcss: "^8.4.21",
-    "postcss-custom-properties": "^13.1.1",
-    "postcss-loader": "^7.0.2",
-    prettier: "^2.8.3",
+    "postcss-custom-properties": "^13.1.4",
+    "postcss-loader": "^7.2.4",
+    prettier: "^2.8.7",
     "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    sass: "^1.58.0",
-    "sass-loader": "^13.2.0",
+    sass: "^1.60.0",
+    "sass-loader": "^13.2.2",
     "source-map-loader": "^4.0.1",
     "strip-indent": "^4.0.0",
-    "style-loader": "^3.3.1",
-    "tsconfig-paths-webpack-plugin": "^4.0.0",
-    tsup: "^6.5.0",
-    typescript: "^4.9.5",
+    "style-loader": "^3.3.2",
+    "tsconfig-paths-webpack-plugin": "^4.0.1",
+    tsup: "^6.7.0",
+    typescript: "^5.0.3",
     "url-loader": "^4.1.1",
-    webpack: "^5.75.0",
+    webpack: "^5.78.0",
     "webpack-cli": "^5.0.1",
     "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-dev-server": "^4.13.2",
     "yaml-loader": "^0.8.0"
+  },
+  overrides: {
+    "babel-plugin-lodash": {
+      "@babel/types": "~7.20.0"
+    }
   }
 };
 
@@ -148,7 +154,9 @@ var assertCrtExists = () => {
 
 // src/commands/dev.ts
 var dev = async (options) => {
+  const { env } = options;
   assertOptionsValid(options);
+  applyEnv(env);
   const flags = (await prepareFlags([], options)).join(" ");
   const { ifCore } = getIfCoreFns();
   const title = ifCore(
@@ -279,7 +287,9 @@ var notify = (args) => {
 
 // src/commands/build.ts
 var build = async (options) => {
+  const { env } = options;
   assertOptionsValid2(options);
+  applyEnv(env);
   const flags = prepareFlags3([], options).join(" ");
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);

package/dist/webpack.config.js

@@ -10,13 +10,13 @@ import {
   logTitle,
   moduleFileExtensions,
   resolveApp
-} from "./chunk-WGWOPIQD.js";
+} from "./chunk-ZAKDPU5F.js";
 
 // src/webpack.config.ts
 import { createRequire } from "module";
 import { basename, dirname, resolve } from "path";
 import { existsSync } from "fs";
-import glob from "glob";
+import { globSync } from "glob";
 import { getIfUtils, removeEmpty } from "webpack-config-utils";
 import webpack from "webpack";
 import { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin";
@@ -71,8 +71,8 @@ var getWebpackConfig = async (env) => {
   const { ifLocalCore } = getIfUtils(env, ["localCore"]);
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);
-  const appHtmlFiles = glob.sync(paths.appHtml);
-  const appEnvFiles = glob.sync(paths.appEnv);
+  const appHtmlFiles = globSync(paths.appHtml);
+  const appEnvFiles = globSync(paths.appEnv);
   const envVars = getEnvVars(appEnvFiles, ifMin, ifCore, ifLocalCore, ifHttps);
   const { ifHmr } = getIfUtils({ hmr: process.env.HMR_ENABLED === "true" }, ["hmr"]);
   const useTailwind = ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig);
@@ -105,6 +105,7 @@ var getWebpackConfig = async (env) => {
           postcssOptions: {
             plugins: removeEmpty([
               useTailwind ? [
+                // eslint-disable-next-line node/no-missing-require
                 require2.resolve("tailwindcss", {
                   paths: [paths.appNodeModules]
                 }),
@@ -165,6 +166,7 @@ var getWebpackConfig = async (env) => {
     ),
     module: {
       rules: removeEmpty([
+        // Source maps
         ifNotMin({
           enforce: "pre",
           exclude: /@babel\/runtime/,
@@ -173,6 +175,8 @@ var getWebpackConfig = async (env) => {
         }),
         {
           oneOf: [
+            // App Javascript and Typescript (Babel)
+            // and some dependencies distributed in a non-es5 formats
             {
               test: /\.(js|ts)x?$/,
               include: ifCore(
@@ -225,9 +229,11 @@ var getWebpackConfig = async (env) => {
                 ])
               }
             },
+            // Other Javascript (not in app) - no transformation
             {
               test: /\.(js|mjs)$/
             },
+            // Styles (not modules)
             {
               test: /\.s?css$/,
               exclude: /\.module\.s?css$/,
@@ -235,12 +241,14 @@ var getWebpackConfig = async (env) => {
                 modules: false
               })
             },
+            // Styles (modules)
             {
               test: /\.module\.s?css$/,
               use: getCssLoaders({
                 modules: { localIdentName: "[local]__[hash:base64]" }
               })
             },
+            // Images and fonts
             {
               test: /\.(png|jpe?g|svg|webp|gif|ico|ttf|eot|woff2?)$/,
               type: "asset",
@@ -250,6 +258,7 @@ var getWebpackConfig = async (env) => {
                 }
               }
             },
+            // YML
             {
               test: /\.ya?ml$/,
               use: [
@@ -260,6 +269,7 @@ var getWebpackConfig = async (env) => {
                 }
               ]
             },
+            // HTML
             {
               test: /\.html$/,
               loader: require2.resolve("html-loader"),
@@ -267,6 +277,8 @@ var getWebpackConfig = async (env) => {
                 minimize: false
               }
             },
+            // All other files - fallback
+            // This must be the latest rule!
             {
               exclude: [/^$/, /\.(js|jsx|ts|tsx|mjs)$/, /\.html$/, /\.json$/],
               type: "asset/resource"
@@ -301,8 +313,12 @@ var getWebpackConfig = async (env) => {
       })
     },
     optimization: {
+      // minimize: false,
       removeEmptyChunks: true,
+      // moduleIds: 'deterministic', // todo: use instead of HashedModuleIdsPlugin
+      // chunkIds: 'named',
       minimizer: ["...", new CssMinimizerPlugin()]
+      // sourceMaps: true?
     },
     plugins: removeEmpty([
       new webpack.ProgressPlugin(),
@@ -313,7 +329,9 @@ var getWebpackConfig = async (env) => {
         resolvePluginsRelativeTo: paths.app
       }),
       ifMin(
-        new CleanWebpackPlugin({})
+        new CleanWebpackPlugin({
+          // verbose: true,
+        })
       ),
       ...appHtmlFiles.map(
         (file) => new HtmlWebpackPlugin2({
@@ -321,6 +339,19 @@ var getWebpackConfig = async (env) => {
           filename: basename(file),
           inject: false,
           minify: false
+          // ...ifMin({
+          //   minify: {
+          //     collapseWhitespace: true,
+          //     removeComments: true,
+          //     removeRedundantAttributes: true,
+          //     removeScriptTypeAttributes: true,
+          //     removeStyleLinkTypeAttributes: true,
+          //     useShortDoctype: true,
+          //     quoteCharacter: '"',
+          //     minifyJS: true,
+          //     minifyCSS: true,
+          //   },
+          // }),
         })
       ),
       new InterpolateHtmlPlugin(envVars.raw),
@@ -356,6 +387,7 @@ var getWebpackConfig = async (env) => {
         contextRegExp: /moment$/
       }),
       ifMin(new webpack.ids.HashedModuleIdsPlugin()),
+      // todo: remove?
       ifMin() && ifCore() ? new CopyPlugin({
         patterns: ["*.md", "*.html"]
       }) : void 0,
@@ -363,7 +395,7 @@ var getWebpackConfig = async (env) => {
         name: ifCore("tamaro-core", "tamaro-customer-config"),
         saveReportTo: "reports/report.html",
         saveStatsTo: "reports/stats-[name]-[hash].json",
-        additionalStats: glob.sync("reports/*.json"),
+        additionalStats: globSync("reports/*.json"),
         open: false
       }) : void 0
     ]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
@@ -20,26 +20,26 @@
     "npm": ">=8"
   },
   "dependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/cli": "^7.21.0",
+    "@babel/core": "^7.21.4",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-env": "^7.21.4",
     "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime-corejs3": "^7.20.13",
+    "@babel/preset-typescript": "^7.21.4",
+    "@babel/runtime-corejs3": "^7.21.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@statoscope/webpack-plugin": "^5.24.0",
+    "@statoscope/webpack-plugin": "^5.26.2",
     "@types/columnify": "^1.5.1",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.18",
+    "@types/lodash": "^4.14.192",
+    "@types/node": "^18.15.11",
     "@types/node-notifier": "^8.0.2",
     "@types/resolve-bin": "^0.4.1",
     "@types/webpack-config-utils": "^2.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.50.0",
-    "autoprefixer": "^10.4.13",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
+    "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.2",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-lodash": "^3.3.4",
@@ -48,47 +48,52 @@
     "columnify": "^1.6.0",
     "commander": "^10.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.27.2",
+    "core-js": "^3.30.0",
     "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
+    "css-minimizer-webpack-plugin": "^5.0.0",
     "dotenv": "^16.0.3",
     "dotenv-expand": "^10.0.0",
     "escape-string-regexp": "^5.0.0",
-    "eslint": "^8.33.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.37.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-webpack-plugin": "^3.2.0",
-    "execa": "^6.1.0",
+    "eslint-webpack-plugin": "^4.0.0",
+    "execa": "^7.1.1",
     "file-loader": "^6.2.0",
-    "fork-ts-checker-webpack-plugin": "^7.3.0",
-    "glob": "^8.1.0",
+    "fork-ts-checker-webpack-plugin": "^8.0.0",
+    "glob": "^9.3.4",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "^5.5.0",
     "json-loader": "^0.5.7",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.7.2",
+    "mini-css-extract-plugin": "^2.7.5",
     "node-notifier": "^10.0.1",
     "portfinder": "^1.0.32",
     "postcss": "^8.4.21",
-    "postcss-custom-properties": "^13.1.1",
-    "postcss-loader": "^7.0.2",
-    "prettier": "^2.8.3",
+    "postcss-custom-properties": "^13.1.4",
+    "postcss-loader": "^7.2.4",
+    "prettier": "^2.8.7",
     "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.58.0",
-    "sass-loader": "^13.2.0",
+    "sass": "^1.60.0",
+    "sass-loader": "^13.2.2",
     "source-map-loader": "^4.0.1",
     "strip-indent": "^4.0.0",
-    "style-loader": "^3.3.1",
-    "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "tsup": "^6.5.0",
-    "typescript": "^4.9.5",
+    "style-loader": "^3.3.2",
+    "tsconfig-paths-webpack-plugin": "^4.0.1",
+    "tsup": "^6.7.0",
+    "typescript": "^5.0.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.75.0",
+    "webpack": "^5.78.0",
     "webpack-cli": "^5.0.1",
     "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-dev-server": "^4.13.2",
     "yaml-loader": "^0.8.0"
+  },
+  "overrides": {
+    "babel-plugin-lodash": {
+      "@babel/types": "~7.20.0"
+    }
   }
 }

package/src/commands/build.ts

@@ -7,7 +7,7 @@ import {
   resolveBin,
   resolveOwn,
 } from 'lib/resolve'
-import {assertEnvValid} from 'lib/env'
+import {applyEnv, assertEnvValid} from 'lib/env'
 import {assertCrtExists} from 'lib/https'
 import {logCommand, logTitle} from 'lib/logging'
 import {notify} from 'lib/notifier'
@@ -22,7 +22,7 @@ export type BuildOptions = {
   https: boolean
   serve: boolean
   deploy: boolean
-  env: string
+  env?: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,10 @@ export type BuildOptions = {
 export const build = async (
   options: BuildOptions & DeployOptions,
 ): Promise<void> => {
+  const {env} = options
+
   assertOptionsValid(options)
+  applyEnv(env)
 
   const flags = prepareFlags([], options).join(' ')
   const {ifCore} = getIfCoreFns()

package/src/commands/dev.ts

@@ -2,7 +2,7 @@ import {getPortPromise} from 'portfinder'
 import {getIfCoreFns, resolveBin, resolveOwn} from 'lib/resolve'
 import {logCommand, logTitle} from 'lib/logging'
 import {halt, runCommandSync} from 'lib/command'
-import {assertEnvValid} from 'lib/env'
+import {applyEnv, assertEnvValid} from 'lib/env'
 import {assertCrtExists} from 'lib/https'
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -11,13 +11,16 @@ export type DevOptions = {
   localCore: boolean
   https: boolean
   port: string
-  env: string
+  env?: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 export const dev = async (options: DevOptions): Promise<void> => {
+  const {env} = options
+
   assertOptionsValid(options)
+  applyEnv(env)
 
   const flags = (await prepareFlags([], options)).join(' ')
   const {ifCore} = getIfCoreFns()

package/src/lib/env.ts

@@ -1,6 +1,6 @@
 import {createRequire} from 'module'
 import {basename} from 'path'
-import glob from 'glob'
+import {globSync} from 'glob'
 import type {IfUtilsFn} from 'webpack-config-utils'
 import {expand as dotenvExpand} from 'dotenv-expand'
 import {config as dotenvConfig} from 'dotenv'
@@ -29,7 +29,9 @@ export const getEnvVars = (
 ) => {
   const filePath = files.find((file) => basename(file) === '.env')
 
-  dotenvExpand(dotenvConfig({path: filePath}))
+  if (filePath) {
+    dotenvExpand(dotenvConfig({path: filePath}))
+  }
 
   process.env.NODE_ENV ??= ifMin('production', 'development')
   process.env.BABEL_ENV ??= ifMin('production', 'development')
@@ -41,9 +43,6 @@ export const getEnvVars = (
   process.env.WEBPACK_UNIQUE_NAME ??= ifCore('RnwTamaroCore', 'RnwTamaro')
   process.env.BUILD_DATE = new Date().toISOString()
   process.env.PUBLIC_URL ??= ''
-
-  // 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'
   process.env.HMR_ENABLED ??= ifMin('false', 'true')
 
   if (ifCore()) {
@@ -85,7 +84,12 @@ export const getEnvVars = (
     'PRODUCT_NAME',
     'PRODUCT_VERSION',
 
-    // epik
+    // config
+    'WIDGET_UUID',
+    'CORE_URL',
+    'CORE_VERSION', // should be explicitly specified in each config
+
+    // epik (obsolete since Tamaro v2.5.0)
     'EPP_API_KEY_DEFAULT',
     'EPP_API_URL_STAGE',
     'EPP_API_URL_PROD',
@@ -95,11 +99,8 @@ export const getEnvVars = (
     'EPP_PROXY_URL_PROD',
     'EPMS_PROXY_URL_STAGE',
     'EPMS_PROXY_URL_PROD',
-
-    // config
-    'WIDGET_UUID',
-    'CORE_URL',
-    'CORE_VERSION', // must be explicitly specified in each config
+    'EPMS_TWINT_CHECKOUT_URL_STAGE',
+    'EPMS_TWINT_CHECKOUT_URL_PROD',
   ]
 
   // Collect all vars which names start from "PUBLIC_" or present in "varNames" array
@@ -125,26 +126,31 @@ export const getEnvVars = (
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const assertEnvValid = (env: string) => {
+export const assertEnvValid = (env?: string) => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
-  const files = glob.sync(paths.appEnv)
+  const files = globSync(paths.appEnv)
   const envs = files
-    .map((file) => basename(file).replace(/^\.env\.?/, ''))
+    .map((file) => basename(file).replace(/^\.env\./, ''))
+    .map((file) => basename(file).replace(/^\.env$/, ''))
     .filter((v) => !!v)
 
   if (envs.length === 0) {
     if (env) {
+      // There are no ".env.<env>" files, so we must ignore "--env" flag
       console.log('Flag “--env” is ignored.')
     }
   }
 
   if (envs.length !== 0) {
     if (!env) {
+      // There are some ".env.<env>" files, but no "--env" flag is specified,
+      // so we must require it
       halt('Flag “--env” is required.')
     }
 
-    if (!envs.includes(env)) {
+    if (env && !envs.includes(env)) {
+      // There are some ".env.<env>" files, but specified "--env" flag is incorrect
       halt(
         stripIndent(`
           Flag “--env” has wrong value.
@@ -152,8 +158,20 @@ export const assertEnvValid = (env: string) => {
         `),
       )
     }
+  }
+}
+
+export const applyEnv = (env?: string) => {
+  if (!env) {
+    return
+  }
+
+  const {ifCore} = getIfCoreFns()
+  const paths = getPaths(ifCore)
+  const files = globSync(paths.appEnv)
+  const filePath = files.find((file) => basename(file) === `.env.${env}`)
 
-    const filePath = files.find((file) => basename(file) === `.env.${env}`)
+  if (filePath) {
     dotenvExpand(dotenvConfig({path: filePath}))
   }
 }

package/src/webpack.config.ts

@@ -1,7 +1,7 @@
 import {createRequire} from 'module'
 import {basename, dirname, resolve} from 'path'
 import {existsSync} from 'fs'
-import glob from 'glob'
+import {globSync} from 'glob'
 import {getIfUtils, removeEmpty} from 'webpack-config-utils'
 import webpack from 'webpack'
 import type {Configuration, RuleSetUseItem} from 'webpack'
@@ -45,8 +45,8 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
   const {ifLocalCore} = getIfUtils(env, ['localCore'])
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
-  const appHtmlFiles = glob.sync(paths.appHtml)
-  const appEnvFiles = glob.sync(paths.appEnv)
+  const appHtmlFiles = globSync(paths.appHtml)
+  const appEnvFiles = globSync(paths.appEnv)
   const envVars = getEnvVars(appEnvFiles, ifMin, ifCore, ifLocalCore, ifHttps)
   const {ifHmr} = getIfUtils({hmr: process.env.HMR_ENABLED === 'true'}, ['hmr'])
   const useTailwind =
@@ -400,7 +400,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
             name: ifCore('tamaro-core', 'tamaro-customer-config'),
             saveReportTo: 'reports/report.html',
             saveStatsTo: 'reports/stats-[name]-[hash].json',
-            additionalStats: glob.sync('reports/*.json'),
+            additionalStats: globSync('reports/*.json'),
             open: false,
           })
         : undefined,