@raisenow/tamaro-cli 1.0.9 → 1.0.12

package/src/lib/resolve.ts

@@ -0,0 +1,144 @@
+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'
+
+///////////////////////////////////////////////////////////////////////////////
+
+export type ResolveFn = (relativePath: string) => string
+
+///////////////////////////////////////////////////////////////////////////////
+
+const require = createRequire(import.meta.url)
+export const moduleFileExtensions = ['ts', 'tsx', 'js', 'jsx']
+export const extensions = moduleFileExtensions.map((v) => `.${v}`)
+
+///////////////////////////////////////////////////////////////////////////////
+
+const TAMARO_CORE_PACKAGE_NAMES = ['@raisenow/tamaro-core']
+const TAMARO_CONFIGURATIONS_PACKAGE_NAMES = ['@raisenow/tamaro-configurations']
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const resolveApp: ResolveFn = (relativePath) =>
+  resolve(realpathSync(process.cwd()), relativePath)
+
+///////////////////////////////////////////////////////////////////////////////
+
+// __dirname is "dist" in runtime
+export const resolveOwn: ResolveFn = (relativePath) =>
+  resolve(__dirname, '..', relativePath)
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const resolveModule = (resolveFn: ResolveFn, filePath: string) => {
+  const extension = moduleFileExtensions.find((extension) =>
+    existsSync(resolveFn(`${filePath}.${extension}`)),
+  )
+
+  if (extension) {
+    return resolveFn(`${filePath}.${extension}`)
+  }
+
+  return resolveFn(`${filePath}.js`)
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const resolveBin = (name: string) => {
+  const pkgPath = require.resolve(`${name}/package.json`)
+  const {bin} = require(pkgPath)
+  const dir = dirname(pkgPath)
+  const binPath = typeof bin === 'object' ? bin[name] : bin
+
+  return join(dir, binPath)
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const getWidgetUuid = () => basename(resolveApp('.'))
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const getPaths = (ifCore: IfUtilsFn) => {
+  return ifCore(
+    {
+      app: resolveApp('.'),
+      appEntry: resolveModule(resolveApp, 'src/index'),
+      appDist: resolveApp('dist'),
+      appNodeModules: resolveApp('node_modules'),
+      appTsConfig: resolveApp('tsconfig.json'),
+      appHtml: resolveApp('src/*.html'),
+      appEnv: resolveApp('.env'),
+      appTailwindConfig: resolveApp('tailwind.config.js'),
+    },
+    {
+      app: resolveApp('.'),
+      appEntry: resolveModule(resolveApp, 'widget'),
+      appDist: resolveApp(`../../dist/${getWidgetUuid()}`),
+      appNodeModules: resolveApp('../../node_modules'),
+      appTsConfig: resolveApp('tsconfig.json'),
+      appHtml: resolveApp('*.html'),
+      appEnv: resolveApp('.env'),
+      appTailwindConfig: undefined,
+    },
+  )
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+type Paths = {
+  [key: string]: string | undefined
+}
+
+export const getRelativePaths = (paths: Paths): Paths => {
+  const relativePaths: Paths = {}
+
+  for (const [type, absPath] of Object.entries(paths)) {
+    if (absPath) {
+      relativePaths[type] = relative('./', absPath) || '.'
+    }
+  }
+
+  return relativePaths
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+export const getIfCoreFns = (): IfUtils => {
+  const corePkgPath = resolveApp('package.json')
+  const configsPkgPath = resolveApp('../../package.json')
+
+  if (existsSync(corePkgPath)) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const {name} = require(corePkgPath)
+
+    if (TAMARO_CORE_PACKAGE_NAMES.includes(name)) {
+      return getIfUtils({core: true}, ['core'])
+    }
+  }
+
+  if (existsSync(configsPkgPath)) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const {name} = require(configsPkgPath)
+
+    if (TAMARO_CONFIGURATIONS_PACKAGE_NAMES.includes(name)) {
+      return getIfUtils({core: false}, ['core'])
+    }
+  }
+
+  logError(
+    stripIndent(`\
+      You must run "npx @raisenow/tamaro-cli" commands from:
+      1. Root of "${chalk.bold(TAMARO_CORE_PACKAGE_NAMES[0])}" package folder.
+      2. Root of particular customer configuration folder of "${chalk.bold(
+        TAMARO_CONFIGURATIONS_PACKAGE_NAMES[0],
+      )}" package.
+      You are currently in "${chalk.bold(realpathSync(process.cwd()))}".
+    `),
+  )
+  process.exit(1)
+}

package/src/webpack.config.ts

@@ -1,15 +1,10 @@
+import {createRequire} from 'module'
 import {basename, dirname} from 'path'
 import {existsSync} from 'fs'
 import glob from 'glob'
 import {getIfUtils, removeEmpty} from 'webpack-config-utils'
-import webpack, {
-  Configuration,
-  DefinePlugin,
-  IgnorePlugin,
-  ProgressPlugin,
-  RuleSetUseItem,
-} from 'webpack'
-import {getPortPromise} from 'portfinder'
+import webpack from 'webpack'
+import type {Configuration, RuleSetUseItem} from 'webpack'
 import {TsconfigPathsPlugin} from 'tsconfig-paths-webpack-plugin'
 import {CleanWebpackPlugin} from 'clean-webpack-plugin'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
@@ -22,21 +17,21 @@ import {} from 'webpack-dev-server'
 import ESLintPlugin from 'eslint-webpack-plugin'
 import CopyPlugin from 'copy-webpack-plugin'
 import StatoscopeWebpackPlugin from '@statoscope/webpack-plugin'
-import InterpolateHtmlPlugin from 'lib/InterpolateHtmlPlugin'
+import {InterpolateHtmlPlugin} from 'lib/InterpolateHtmlPlugin'
 import {
   extensions,
-  getEnvVars,
   getIfCoreFns,
   getPaths,
   getRelativePaths,
-  logDataTable,
   moduleFileExtensions,
   resolveApp,
-  resolveOwn,
-} from 'lib/helpers'
+} from 'lib/resolve'
+import {getEnvVars} from 'lib/env'
+import {logDataTable, logTitle} from 'lib/logging'
 
 ///////////////////////////////////////////////////////////////////////////////
 
+const require = createRequire(import.meta.url)
 const imageInlineSizeLimit = 0
 // const imageInlineSizeLimit = 8 * 1024 // 8kb
 
@@ -51,12 +46,14 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
   const appHtmlFiles = glob.sync(paths.appHtml)
   const envVars = getEnvVars(paths.appEnv, ifMin, ifCore, ifLocalCore)
   const {ifHmr} = getIfUtils({hmr: process.env.HMR_ENABLED === 'true'}, ['hmr'])
-  const port = await getPortPromise({port: 1234})
   const useTailwind =
     ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig)
 
-  logDataTable(getRelativePaths(paths), 'Paths')
-  logDataTable(envVars.raw, 'Environment variables')
+  logTitle('Paths:')
+  logDataTable(getRelativePaths(paths))
+
+  logTitle('Environment variables:')
+  logDataTable(envVars.raw)
 
   const getCssLoaders = (cssOptions: any = {}): RuleSetUseItem[] => {
     return removeEmpty([
@@ -121,7 +118,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
         }),
       ],
     },
-    entry: [resolveOwn('src/lib/polyfills.js'), paths.appEntry],
+    entry: paths.appEntry,
     output: {
       publicPath: 'auto',
       path: ifMin(paths.appDist, undefined),
@@ -321,7 +318,6 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
     devtool: ifMin(false, 'cheap-module-source-map'),
 
     devServer: {
-      port,
       static: false,
       historyApiFallback: {
         disableDotRule: true,
@@ -347,7 +343,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
     },
 
     plugins: removeEmpty([
-      new ProgressPlugin(),
+      new webpack.ProgressPlugin(),
       new ESLintPlugin({
         extensions: moduleFileExtensions,
         eslintPath: require.resolve('eslint'),
@@ -384,7 +380,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
       ),
 
       new InterpolateHtmlPlugin(envVars.raw),
-      new DefinePlugin(envVars.stringified),
+      new webpack.DefinePlugin(envVars.stringified),
 
       new ForkTsCheckerWebpackPlugin({
         typescript: {
@@ -415,7 +411,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
         }),
       ),
 
-      new IgnorePlugin({
+      new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,
       }),
@@ -424,12 +420,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
 
       ifMin() && ifCore()
         ? new CopyPlugin({
-            patterns: [
-              {
-                from: 'docs',
-                to: 'docs',
-              },
-            ],
+            patterns: ['README.md', 'readme.html'],
           })
         : undefined,
 
@@ -443,6 +434,11 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
           })
         : undefined,
     ]),
+
+    infrastructureLogging: {
+      stream: process.stdout,
+      appendOnly: false,
+    },
   }
 
   // console.log(util.inspect(config, {showHidden: false, depth: null}))

package/tsconfig.json

@@ -5,7 +5,7 @@
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
     "target": "esnext",                       /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
-    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "module": "esnext",                       /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
     // "lib": [],                             /* Specify library files to be included in the compilation. */
     "allowJs": true,                          /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */

package/src/lib/helpers.ts

@@ -1,356 +0,0 @@
-import {basename, relative, resolve} from 'path'
-import {existsSync, realpathSync} from 'fs'
-import chalk from 'chalk'
-import notifier from 'node-notifier'
-import {getIfUtils, IfUtils, IfUtilsFn} from 'webpack-config-utils'
-import columnify from 'columnify'
-import boxen from 'boxen'
-import {expand as dotenvExpand} from 'dotenv-expand'
-import {config as dotenvConfig} from 'dotenv'
-import open from 'open'
-import stripIndent from 'strip-indent'
-import {commandSync, ExecaSyncReturnValue, SyncOptions} from 'execa'
-
-///////////////////////////////////////////////////////////////////////////////
-
-export type ResolveFn = (relativePath: string) => string
-
-export type EnvVars = {
-  [key: string]: string | undefined
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Supported packages
-///////////////////////////////////////////////////////////////////////////////
-
-const TAMARO_CORE_PACKAGE_NAMES = ['@raisenow/tamaro-core']
-const TAMARO_CONFIGURATIONS_PACKAGE_NAMES = ['@raisenow/tamaro-configurations']
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const getIfCoreFns = (): IfUtils => {
-  const corePkgPath = resolveApp('package.json')
-  const configsPkgPath = resolveApp('../../package.json')
-
-  if (existsSync(corePkgPath)) {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const {name} = require(corePkgPath)
-
-    if (TAMARO_CORE_PACKAGE_NAMES.includes(name)) {
-      return getIfUtils({core: true}, ['core'])
-    }
-  }
-
-  if (existsSync(configsPkgPath)) {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const {name} = require(configsPkgPath)
-
-    if (TAMARO_CONFIGURATIONS_PACKAGE_NAMES.includes(name)) {
-      return getIfUtils({core: false}, ['core'])
-    }
-  }
-
-  logError(
-    stripIndent(`\
-      You must run "npx @raisenow/tamaro-cli" commands from:
-      1. Root of "${chalk.bold(TAMARO_CORE_PACKAGE_NAMES[0])}" package folder.
-      2. Root of particular customer configuration folder of "${chalk.bold(
-        TAMARO_CONFIGURATIONS_PACKAGE_NAMES[0],
-      )}" package.
-      You are currently in "${chalk.bold(realpathSync(process.cwd()))}".
-    `),
-  )
-  process.exit(1)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Extensions
-///////////////////////////////////////////////////////////////////////////////
-
-export const moduleFileExtensions = ['ts', 'tsx', 'js', 'jsx']
-export const extensions = moduleFileExtensions.map((v) => `.${v}`)
-
-///////////////////////////////////////////////////////////////////////////////
-// Paths
-///////////////////////////////////////////////////////////////////////////////
-
-export const resolveApp: ResolveFn = (relativePath) =>
-  resolve(realpathSync(process.cwd()), relativePath)
-
-///////////////////////////////////////////////////////////////////////////////
-
-// __dirname is "dist" in runtime
-export const resolveOwn: ResolveFn = (relativePath) =>
-  resolve(__dirname, '..', relativePath)
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const resolveModule = (resolveFn: ResolveFn, filePath: string) => {
-  const extension = moduleFileExtensions.find((extension) =>
-    existsSync(resolveFn(`${filePath}.${extension}`)),
-  )
-
-  if (extension) {
-    return resolveFn(`${filePath}.${extension}`)
-  }
-
-  return resolveFn(`${filePath}.js`)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const getWidgetUuid = () => basename(resolveApp('.'))
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const getPaths = (ifCore: IfUtilsFn) => {
-  return ifCore(
-    {
-      app: resolveApp('.'),
-      appEntry: resolveModule(resolveApp, 'src/index'),
-      appDist: resolveApp('dist'),
-      appNodeModules: resolveApp('node_modules'),
-      appTsConfig: resolveApp('tsconfig.json'),
-      appHtml: resolveApp('src/*.html'),
-      appEnv: resolveApp('.env'),
-      appTailwindConfig: resolveApp('tailwind.config.js'),
-    },
-    {
-      app: resolveApp('.'),
-      appEntry: resolveModule(resolveApp, 'widget'),
-      appDist: resolveApp(`../../dist/${getWidgetUuid()}`),
-      appNodeModules: resolveApp('../../node_modules'),
-      appTsConfig: resolveApp('tsconfig.json'),
-      appHtml: resolveApp('*.html'),
-      appEnv: resolveApp('.env'),
-      appTailwindConfig: undefined,
-    },
-  )
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-type Paths = {
-  [key: string]: string | undefined
-}
-
-export const getRelativePaths = (paths: Paths): Paths => {
-  const relativePaths: Paths = {}
-
-  for (const [type, absPath] of Object.entries(paths)) {
-    if (absPath) {
-      relativePaths[type] = relative('./', absPath) || '.'
-    }
-  }
-
-  return relativePaths
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Env vars
-///////////////////////////////////////////////////////////////////////////////
-
-export const getEnvVars = (
-  filePath: string,
-  ifMin: IfUtilsFn,
-  ifCore: IfUtilsFn,
-  ifLocalCore: IfUtilsFn,
-) => {
-  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')
-  process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET ??= ifCore(
-    'rnw-tamaro-core',
-    'rnw-tamaro',
-  )
-  process.env.WEBPACK_UNIQUE_NAME ??= ifCore('RnwTamaroCore', 'RnwTamaro')
-
-  // 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()) {
-    process.env.PRODUCT_NAME = 'tamaro'
-
-    const corePkgPath = resolveApp('package.json')
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const {version} = require(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}` : ''
-
-      process.env.CORE_URL ??= `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
-    }
-  }
-
-  // var names which will be exposed along with "PUBLIC_*" var names
-  const varNames = [
-    // common
-    'NODE_ENV',
-    'BABEL_ENV',
-    'EXPOSE_VAR',
-    'ELEMENT_ATTRIBUTE_DATA_WIDGET',
-    'WEBPACK_UNIQUE_NAME',
-
-    // core
-    'PRODUCT_NAME',
-    'PRODUCT_VERSION',
-
-    // config
-    'WIDGET_UUID',
-    'CORE_URL',
-    'CORE_VERSION', // must be explicitly specified in each config
-    'IS_CREDIT_CARD_IFRAME',
-
-    // // todo: Environment variables for twint-qr-base
-    // 'EPMS_ENV',
-    // 'SOLUTION_CONFIG_BASE_URL',
-    // 'SHORT_ID_RESOLUTION_URL',
-    // 'HANDSHAKE_RESOLUTION_URL',
-    // 'TWINT_CHECKOUT_PAGE',
-  ]
-
-  // 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))
-    .reduce<EnvVars>((env, key) => {
-      env[key] = process.env[key]
-
-      return env
-    }, {})
-
-  // Stringify all values so we can feed into webpack DefinePlugin
-  const stringified = {
-    'process.env': Object.keys(raw).reduce<EnvVars>((env, key) => {
-      env[key] = JSON.stringify(raw[key])
-
-      return env
-    }, {}),
-  }
-
-  return {raw, stringified}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Other
-///////////////////////////////////////////////////////////////////////////////
-
-export const delay = (ms: number) =>
-  new Promise((resolve) => setTimeout(resolve, ms))
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const logTitle = (title: string) => {
-  console.log(`\n${chalk.bold(title)}`)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const logError = (message?: string) => {
-  if (message) {
-    console.log(chalk.red(message))
-  }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const fail = (message?: string) => {
-  logError(message)
-  process.exit(1)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const logCommand = (command: string): void => {
-  console.log(chalk.dim(stripIndent(command)))
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const prepareCommand = (command: string): string => {
-  return command
-    .replace(/\n/gm, ' ')
-    .replace(/[ \t]{2,}/gm, ' ')
-    .trim()
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const runCommandSync = (
-  command: string,
-  options?: SyncOptions,
-): ExecaSyncReturnValue => {
-  return commandSync(prepareCommand(command), options)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const logDataTable = (
-  vars: {[key: string]: string | undefined},
-  title?: string,
-): void => {
-  logTable(columnify(vars, {showHeaders: false}), title)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export const logTable = (text: string, title?: string): void => {
-  let out = ''
-  const boxTitle = title ? chalk.bold(`${title}`) : undefined
-
-  if (boxTitle) {
-    out += `${boxTitle}\n`
-  }
-
-  out += text
-
-  console.log(
-    boxen(out, {
-      margin: 0,
-      padding: {
-        top: 0,
-        right: 1,
-        bottom: 0,
-        left: 1,
-      },
-      borderColor: 'green',
-    }),
-  )
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
-export type NotifyArgs = {
-  title: string
-  message: string
-  target?: string
-}
-
-export const notify = (args: NotifyArgs): void => {
-  const {title, message, target} = args
-
-  notifier.notify({
-    title,
-    message,
-    contentImage: 'https://assets.raisenow.io/favicon.png',
-    sound: 'Funk',
-    timeout: 30,
-  })
-
-  if (target) {
-    notifier.on('click', () => {
-      open(target)
-    })
-  }
-}

package/src/lib/polyfills.js

@@ -1,8 +0,0 @@
-import 'core-js/stable'
-// import 'core-js/features/promise'
-// import 'core-js/features/symbol'
-// import 'core-js/features/object/assign'
-// import 'core-js/features/string/match-all'
-import 'element-closest/browser.js'
-import 'unfetch/polyfill'
-import 'current-script-polyfill'