@raisenow/tamaro-cli 1.0.10 → 1.0.13

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
 
@@ -49,14 +44,17 @@ 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 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 +119,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),
@@ -234,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: {
@@ -321,7 +275,6 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
     devtool: ifMin(false, 'cheap-module-source-map'),
 
     devServer: {
-      port,
       static: false,
       historyApiFallback: {
         disableDotRule: true,
@@ -347,7 +300,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 +337,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 +368,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
         }),
       ),
 
-      new IgnorePlugin({
+      new webpack.IgnorePlugin({
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/,
       }),
@@ -424,16 +377,7 @@ const getWebpackConfig = async (env: any): Promise<Configuration> => {
 
       ifMin() && ifCore()
         ? new CopyPlugin({
-            patterns: [
-              {
-                from: 'readme.md',
-                to: 'readme.md',
-              },
-              {
-                from: 'readme.html',
-                to: 'readme.html',
-              },
-            ],
+            patterns: ['README.md', 'readme.html'],
           })
         : undefined,
 
@@ -447,6 +391,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. */