@raisenow/tamaro-cli 1.0.25 → 1.1.0

package/src/lib/env.ts

@@ -1,18 +1,16 @@
 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 {expand as dotenvExpand} from 'dotenv-expand'
+import {globSync} from 'glob'
 import stripIndent from 'strip-indent'
-import {getIfCoreFns, getPaths, getWidgetUuid, resolveApp} from 'lib/resolve'
+import type {IfUtilsFn} from 'webpack-config-utils'
 import {halt} from 'lib/command'
+import {getIfCoreFns, getPaths, getWidgetUuid, resolveApp} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export type EnvVars = {
-  [key: string]: string | undefined
-}
+export type EnvVars = Record<string, string | undefined>
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -29,7 +27,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 +41,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()) {
@@ -61,7 +58,7 @@ export const getEnvVars = (
 
     if (ifLocalCore()) {
       const protocol = ifHttps() ? 'https' : 'http'
-      process.env.CORE_URL = `${protocol}://0.0.0.0:1234/index.js`
+      process.env.CORE_URL = `${protocol}://localhost:1234/index.js`
     } else {
       let version = process.env.CORE_VERSION
       version = version ? `@${version}` : ''
@@ -85,7 +82,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',
@@ -97,16 +99,11 @@ export const getEnvVars = (
     'EPMS_PROXY_URL_PROD',
     'EPMS_TWINT_CHECKOUT_URL_STAGE',
     'EPMS_TWINT_CHECKOUT_URL_PROD',
-
-    // config
-    'WIDGET_UUID',
-    'CORE_URL',
-    'CORE_VERSION', // must be explicitly specified in each config
   ]
 
   // Collect all vars which names start from "PUBLIC_" or present in "varNames" array
   const raw = Object.keys(process.env)
-    .filter((key) => /^PUBLIC_/.test(key) || varNames.includes(key))
+    .filter((key) => key.startsWith('PUBLIC_') || varNames.includes(key))
     .reduce<EnvVars>((env, key) => {
       env[key] = process.env[key]
 
@@ -127,35 +124,53 @@ 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) {
-      console.log('Flag “--env” is ignored.')
+      // There are no ".env.<env>" files, so we must ignore "--env" flag
+      // eslint-disable-next-line no-console
+      console.log('Flag "--env" is ignored.')
     }
   }
 
   if (envs.length !== 0) {
     if (!env) {
-      halt('Flag “--env” is required.')
+      // 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.
-          Available values are: ${envs.map((v) => `“${v}”`).join(', ')}.
+          Flag "--env" has wrong value.
+          Available values are: ${envs.map((v) => `"${v}"`).join(', ')}.
         `),
       )
     }
+  }
+}
+
+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/lib/https.ts

@@ -2,8 +2,8 @@ import {existsSync} from 'fs'
 import {resolve} from 'path'
 import stripIndent from 'strip-indent'
 import {halt} from 'lib/command'
-import {getIfCoreFns, getPaths} from 'lib/resolve'
 import {HTTPS_CRT_FILE, HTTPS_KEY_FILE} from 'lib/constants'
+import {getIfCoreFns, getPaths} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -19,7 +19,7 @@ export const assertCrtExists = () => {
 
   halt(
     stripIndent(`
-      Flag “--https” is used, but “${HTTPS_CRT_FILE}” and/or “${HTTPS_KEY_FILE}” files are not found.
+      Flag "--https" is used, but "${HTTPS_CRT_FILE}" and/or "${HTTPS_KEY_FILE}" files are not found.
       You need to generate certificate first.
       Check docs: https://unpkg.com/@raisenow/tamaro-cli/readme.html#/?id=use-transport-level-security-https
     `),

package/src/lib/logging.ts

@@ -1,10 +1,11 @@
 import chalk from 'chalk'
-import stripIndent from 'strip-indent'
 import columnify from 'columnify'
+import stripIndent from 'strip-indent'
 
 ///////////////////////////////////////////////////////////////////////////////
 
 export const logTitle = (title: string) => {
+  // eslint-disable-next-line no-console
   console.log(`${chalk.bold(title)}`)
 }
 
@@ -12,6 +13,7 @@ export const logTitle = (title: string) => {
 
 export const logError = (message?: string) => {
   if (message) {
+    // eslint-disable-next-line no-console
     console.log(chalk.red(message))
   }
 }
@@ -19,14 +21,17 @@ export const logError = (message?: string) => {
 ///////////////////////////////////////////////////////////////////////////////
 
 export const logCommand = (cmd: string): void => {
+  // eslint-disable-next-line no-console
   console.log(`\n${chalk.dim(stripIndent(cmd).trim())}\n`)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export const logDataTable = (data: {
-  [key: string]: string | undefined
-}): void => {
+export const logDataTable = (
+  data: Record<string, string | undefined>,
+): void => {
+  // eslint-disable-next-line no-console
   console.log(columnify(data, {showHeaders: false}))
+  // eslint-disable-next-line no-console
   console.log('')
 }

package/src/lib/resolve.ts

@@ -1,10 +1,10 @@
+import {existsSync, realpathSync} from 'fs'
 import {createRequire} from 'module'
 import {basename, dirname, join, relative, resolve} from 'path'
-import {existsSync, realpathSync} from 'fs'
-import {getIfUtils, IfUtils, IfUtilsFn} from 'webpack-config-utils'
-import {logError} from 'lib/logging'
-import stripIndent from 'strip-indent'
 import chalk from 'chalk'
+import stripIndent from 'strip-indent'
+import {getIfUtils, type IfUtils, type IfUtilsFn} from 'webpack-config-utils'
+import {logError} from 'lib/logging'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -93,9 +93,7 @@ export const getPaths = (ifCore: IfUtilsFn) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-type Paths = {
-  [key: string]: string | undefined
-}
+type Paths = Record<string, string | undefined>
 
 export const getRelativePaths = (paths: Paths): Paths => {
   const relativePaths: Paths = {}

package/src/webpack.config.ts

@@ -1,23 +1,27 @@
+import {existsSync} from 'fs'
 import {createRequire} from 'module'
 import {basename, dirname, resolve} from 'path'
-import {existsSync} from 'fs'
-import glob from 'glob'
-import {getIfUtils, removeEmpty} from 'webpack-config-utils'
-import webpack from 'webpack'
-import type {Configuration, RuleSetUseItem} from 'webpack'
-import {TsconfigPathsPlugin} from 'tsconfig-paths-webpack-plugin'
+import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'
+import StatoscopeWebpackPlugin from '@statoscope/webpack-plugin'
 import {CleanWebpackPlugin} from 'clean-webpack-plugin'
-import HtmlWebpackPlugin from 'html-webpack-plugin'
+import CopyPlugin from 'copy-webpack-plugin'
+import CssMinimizerPlugin from 'css-minimizer-webpack-plugin'
+import ESLintPlugin from 'eslint-webpack-plugin'
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'
-import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'
+import {globSync} from 'glob'
+import HtmlWebpackPlugin from 'html-webpack-plugin'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin'
+import {TsconfigPathsPlugin} from 'tsconfig-paths-webpack-plugin'
+import type {Configuration, RuleSetUseItem} from 'webpack'
+// eslint-disable-next-line import/no-named-as-default
+import webpack from 'webpack'
+import {getIfUtils, removeEmpty} from 'webpack-config-utils'
 // Needed for webpack-dev-server types to be picked up correctly
 import {} from 'webpack-dev-server'
-import ESLintPlugin from 'eslint-webpack-plugin'
-import CopyPlugin from 'copy-webpack-plugin'
-import StatoscopeWebpackPlugin from '@statoscope/webpack-plugin'
+import {HTTPS_CRT_FILE, HTTPS_KEY_FILE} from 'lib/constants'
+import {getEnvVars} from 'lib/env'
 import {InterpolateHtmlPlugin} from 'lib/InterpolateHtmlPlugin'
+import {logDataTable, logTitle} from 'lib/logging'
 import {
   extensions,
   getIfCoreFns,
@@ -26,9 +30,6 @@ import {
   moduleFileExtensions,
   resolveApp,
 } from 'lib/resolve'
-import {getEnvVars} from 'lib/env'
-import {logDataTable, logTitle} from 'lib/logging'
-import {HTTPS_CRT_FILE, HTTPS_KEY_FILE} from 'lib/constants'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -38,15 +39,15 @@ const imageInlineSizeLimit = 0
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const getWebpackConfig = async (env: any): Promise<Configuration> => {
+const getWebpackConfig = (env: any): Configuration => {
   const {ifMin, ifNotMin} = getIfUtils(env, ['min'])
   const {ifAnalyze} = getIfUtils(env, ['analyze'])
   const {ifHttps} = getIfUtils(env, ['https'])
   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 =
@@ -84,7 +85,6 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
             plugins: removeEmpty([
               useTailwind
                 ? [
-                    // eslint-disable-next-line node/no-missing-require
                     require.resolve('tailwindcss', {
                       paths: [paths.appNodeModules],
                     }),
@@ -387,6 +387,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
         contextRegExp: /moment$/,
       }),
 
+      // eslint-disable-next-line import/no-named-as-default-member
       ifMin(new webpack.ids.HashedModuleIdsPlugin()), // todo: remove?
 
       ifMin() && ifCore()
@@ -400,7 +401,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,

package/tsconfig.json

@@ -75,8 +75,12 @@
   },
   "include": [
     "**/*",
+    ".eslintrc.cjs",
   ],
   "exclude": [
-    "./dist/**/*",
+    ".history/**/*",
+    ".idea/**/*",
+    "dist/**/*",
+    "node_modules/**/*",
   ]
 }

package/.gitignore

@@ -1,14 +0,0 @@
-/*
-!src
-!.eslintignore
-!.eslintrc.cjs
-!.gitignore
-!.nvmrc
-!.prettierignore
-!.prettierrc.cjs
-!package.json
-!package-lock.json
-!tsconfig.eslint.json
-!tsconfig.json
-!readme.html
-!README.md

package/tsconfig.eslint.json

@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": [
-    "**/*",
-    "./.eslintrc.cjs",
-  ],
-}