@raisenow/tamaro-cli 1.0.25 → 1.1.0

package/dist/webpack.config.js

@@ -10,29 +10,29 @@ import {
   logTitle,
   moduleFileExtensions,
   resolveApp
-} from "./chunk-XC5QT3RG.js";
+} from "./chunk-S4M23KNZ.js";
 
 // src/webpack.config.ts
+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 { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin";
-import { CleanWebpackPlugin } from "clean-webpack-plugin";
-import HtmlWebpackPlugin2 from "html-webpack-plugin";
-import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
 import ReactRefreshWebpackPlugin from "@pmmmwh/react-refresh-webpack-plugin";
-import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import StatoscopeWebpackPlugin from "@statoscope/webpack-plugin";
+import { CleanWebpackPlugin } from "clean-webpack-plugin";
+import CopyPlugin from "copy-webpack-plugin";
 import CssMinimizerPlugin from "css-minimizer-webpack-plugin";
 import ESLintPlugin from "eslint-webpack-plugin";
-import CopyPlugin from "copy-webpack-plugin";
-import StatoscopeWebpackPlugin from "@statoscope/webpack-plugin";
+import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
+import { globSync } from "glob";
+import HtmlWebpackPlugin2 from "html-webpack-plugin";
+import MiniCssExtractPlugin from "mini-css-extract-plugin";
+import { TsconfigPathsPlugin } from "tsconfig-paths-webpack-plugin";
+import webpack from "webpack";
+import { getIfUtils, removeEmpty } from "webpack-config-utils";
 
 // src/lib/InterpolateHtmlPlugin.ts
-import HtmlWebpackPlugin from "html-webpack-plugin";
 import escapeStringRegexp from "escape-string-regexp";
+import HtmlWebpackPlugin from "html-webpack-plugin";
 var PLUGIN_NAME = "InterpolateHtmlPlugin";
 var InterpolateHtmlPlugin = class {
   replacements;
@@ -43,16 +43,16 @@ var InterpolateHtmlPlugin = class {
     compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
       const hooks = HtmlWebpackPlugin.getHooks(compilation);
       hooks.alterAssetTagGroups.tap(PLUGIN_NAME, (assets) => {
-        const publicUrl = this.replacements["PUBLIC_URL"] ?? "";
-        const entry = assets.headTags[0].attributes["src"];
-        this.replacements["ENTRY"] = `${publicUrl}${entry}`;
+        const publicUrl = this.replacements.PUBLIC_URL ?? "";
+        const entry = assets.headTags[0].attributes.src;
+        this.replacements.ENTRY = `${publicUrl}${entry}`;
         return assets;
       });
       hooks.afterTemplateExecution.tap(PLUGIN_NAME, (data) => {
         Object.entries(this.replacements).forEach(([key, value]) => {
           data.html = data.html.replace(
             new RegExp(`%${escapeStringRegexp(key)}%`, "g"),
-            value || ""
+            value ?? ""
           );
         });
         return data;
@@ -64,15 +64,15 @@ var InterpolateHtmlPlugin = class {
 // src/webpack.config.ts
 var require2 = createRequire(import.meta.url);
 var imageInlineSizeLimit = 0;
-var getWebpackConfig = async (env) => {
+var getWebpackConfig = (env) => {
   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 = ifCore() && paths.appTailwindConfig && existsSync(paths.appTailwindConfig);
@@ -165,6 +165,7 @@ var getWebpackConfig = async (env) => {
     ),
     module: {
       rules: removeEmpty([
+        // Source maps
         ifNotMin({
           enforce: "pre",
           exclude: /@babel\/runtime/,
@@ -173,6 +174,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 +228,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 +240,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 +257,7 @@ var getWebpackConfig = async (env) => {
                 }
               }
             },
+            // YML
             {
               test: /\.ya?ml$/,
               use: [
@@ -260,6 +268,7 @@ var getWebpackConfig = async (env) => {
                 }
               ]
             },
+            // HTML
             {
               test: /\.html$/,
               loader: require2.resolve("html-loader"),
@@ -267,6 +276,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 +312,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 +328,9 @@ var getWebpackConfig = async (env) => {
         resolvePluginsRelativeTo: paths.app
       }),
       ifMin(
-        new CleanWebpackPlugin({})
+        new CleanWebpackPlugin({
+          // verbose: true,
+        })
       ),
       ...appHtmlFiles.map(
         (file) => new HtmlWebpackPlugin2({
@@ -321,6 +338,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),
@@ -355,7 +385,9 @@ var getWebpackConfig = async (env) => {
         resourceRegExp: /^\.\/locale$/,
         contextRegExp: /moment$/
       }),
+      // eslint-disable-next-line import/no-named-as-default-member
       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,94 +1,104 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.0.25",
+  "version": "1.1.0",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
   },
   "type": "module",
   "scripts": {
-    "prepare": "npm run build",
-    "start": "npm run dev",
+    "prepare": "pnpm build",
+    "tscheck": "tsc --noEmit",
     "build": "tsup src/cli.ts src/webpack.config.ts --clean --shims --format esm",
-    "build:watch": "npm run build -- --watch --ignore-watch .idea",
-    "docs": "npx -y http-server . --cors -o /readme.html",
-    "lint": "eslint --fix . && prettier --write ."
+    "build:watch": "pnpm build --watch --ignore-watch .history --ignore-watch .idea",
+    "readme": "pnpx http-server . --cors -o /readme.html",
+    "lint": "eslint .",
+    "lint:fix": "eslint --fix .",
+    "format": "prettier --write ."
   },
   "bin": "dist/cli.js",
   "engines": {
-    "node": ">=16",
-    "npm": ">=8"
+    "node": ">=18",
+    "npm": ">=10"
   },
   "dependencies": {
-    "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-proposal-decorators": "^7.20.13",
+    "@babel/cli": "^7.22.15",
+    "@babel/core": "^7.22.17",
+    "@babel/plugin-proposal-decorators": "^7.22.15",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/runtime-corejs3": "^7.20.13",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
-    "@statoscope/webpack-plugin": "^5.24.0",
-    "@types/columnify": "^1.5.1",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.18",
+    "@babel/plugin-transform-runtime": "^7.22.15",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
+    "@babel/preset-typescript": "^7.22.15",
+    "@babel/runtime-corejs3": "^7.22.15",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+    "@statoscope/webpack-plugin": "^5.27.0",
+    "@types/columnify": "^1.5.2",
+    "@types/lodash": "^4.14.198",
+    "@types/node": "^18.17.15",
     "@types/node-notifier": "^8.0.2",
+    "@types/prompts": "^2.4.4",
     "@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",
-    "babel-loader": "^9.1.2",
+    "@typescript-eslint/eslint-plugin": "^6.7.0",
+    "@typescript-eslint/parser": "^6.7.0",
+    "autoprefixer": "^10.4.15",
+    "babel-loader": "^9.1.3",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-lodash": "^3.3.4",
-    "chalk": "^5.2.0",
+    "chalk": "^5.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "columnify": "^1.6.0",
-    "commander": "^10.0.0",
+    "commander": "^11.0.0",
     "copy-webpack-plugin": "^11.0.0",
-    "core-js": "^3.27.2",
-    "css-loader": "^6.7.3",
-    "css-minimizer-webpack-plugin": "^4.2.2",
-    "dotenv": "^16.0.3",
+    "core-js": "^3.32.2",
+    "css-loader": "^6.8.1",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
     "escape-string-regexp": "^5.0.0",
-    "eslint": "^8.33.0",
-    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint": "^8.49.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-deprecation": "^1.5.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-markdownlint": "^0.5.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-webpack-plugin": "^3.2.0",
-    "execa": "^6.1.0",
+    "eslint-plugin-unused-imports": "^3.0.0",
+    "eslint-plugin-yml": "^1.9.0",
+    "eslint-webpack-plugin": "^4.0.1",
+    "execa": "^8.0.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": "^10.3.4",
     "html-loader": "^4.2.0",
-    "html-webpack-plugin": "^5.5.0",
+    "html-webpack-plugin": "^5.5.3",
     "json-loader": "^0.5.7",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.7.2",
+    "mini-css-extract-plugin": "^2.7.6",
     "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": "^8.4.29",
+    "postcss-custom-properties": "^13.3.0",
+    "postcss-loader": "^7.3.3",
+    "prettier": "^3.0.3",
+    "prompts": "^2.4.2",
     "react-refresh": "^0.14.0",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.58.0",
-    "sass-loader": "^13.2.0",
+    "sass": "^1.66.1",
+    "sass-loader": "^13.3.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.3",
+    "tsconfig-paths-webpack-plugin": "^4.1.0",
+    "tsup": "^7.2.0",
+    "typescript": "^5.2.2",
     "url-loader": "^4.1.1",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
     "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-dev-server": "^4.15.1",
     "yaml-loader": "^0.8.0"
-  }
+  },
+  "packageManager": "pnpm@8.7.5"
 }

package/readme.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

package/src/cli.ts

@@ -1,23 +1,15 @@
 #!/usr/bin/env node
 
 import {createCommand} from 'commander'
-import pkg from '../package.json'
-import {
-  DEFAULT_AWS_PROFILE,
-  DEFAULT_AWS_S3_EMAIL_CONFIG_BUCKET,
-  DEFAULT_PORT,
-  DEFAULT_TAG,
-} from 'lib/constants'
+import {build, type BuildOptions} from 'commands/build'
+import {deploy, type DeployOptions} from 'commands/deploy'
+import {deployEmailConfig} from 'commands/deploy-email-config'
+import {dev, type DevOptions} from 'commands/dev'
+import {listDeployed, type ListDeployedOptions} from 'commands/list-deployed'
+import {serve, type ServeOptions} from 'commands/serve'
+import {DEFAULT_PORT, DEFAULT_TAG} from 'lib/constants'
 import {logError} from 'lib/logging'
-import {dev, DevOptions} from 'commands/dev'
-import {build, BuildOptions} from 'commands/build'
-import {deploy, DeployOptions} from 'commands/deploy'
-import {serve, ServeOptions} from 'commands/serve'
-import {listDeployed, ListDeployedOptions} from 'commands/list-deployed'
-import {
-  deployEmailConfig,
-  DeployEmailConfigOptions,
-} from 'commands/deploy-email-config'
+import pkg from '../package.json'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -89,11 +81,6 @@ cli
     '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: BuildOptions & ServeOptions & DeployOptions) => {
     await build(options)
 
@@ -129,11 +116,6 @@ cli
     '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: DeployOptions) => {
     await deploy(options)
   })
@@ -147,30 +129,15 @@ cli
     '--config <config>',
     'Configuration name (default: current customer configuration)',
   )
-  .option(
-    '--profile <profile>',
-    'AWS profile which should be used for fetching deployments',
-    DEFAULT_AWS_PROFILE,
-  )
   .action(async (options: ListDeployedOptions) => {
     await listDeployed(options)
   })
 
 cli
   .command('deploy-email-config')
-  .description('Deploy a widget’s email configuration to AWS S3')
-  .option(
-    '--bucket <bucket>',
-    'AWS S3 bucket where it should be deployed',
-    DEFAULT_AWS_S3_EMAIL_CONFIG_BUCKET,
-  )
-  .option(
-    '--profile <profile>',
-    'AWS profile which should be used for the deployment of email configuration',
-    DEFAULT_AWS_PROFILE,
-  )
-  .action(async (options: DeployEmailConfigOptions) => {
-    await deployEmailConfig(options)
+  .description("Deploy a widget's email configuration to AWS S3")
+  .action(async () => {
+    await deployEmailConfig()
   })
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -183,6 +150,7 @@ cli
       // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
       logError(`\n${error.signalDescription}`)
     } else {
+      // eslint-disable-next-line no-console
       console.log('')
       logError(error.stack)
     }

package/src/commands/build.ts

@@ -1,5 +1,11 @@
+import {type DeployOptions} from 'commands/deploy'
+import {assertProfilesPresent, promptProfile} from 'lib/aws'
+import {halt, runCommandSync} from 'lib/command'
 import {CORE_CONFIG_NAME} from 'lib/constants'
-import {assertProfileValid} from 'lib/aws'
+import {applyEnv, assertEnvValid} from 'lib/env'
+import {assertCrtExists} from 'lib/https'
+import {logCommand, logTitle} from 'lib/logging'
+import {notify} from 'lib/notifier'
 import {
   getIfCoreFns,
   getPaths,
@@ -7,12 +13,6 @@ import {
   resolveBin,
   resolveOwn,
 } from 'lib/resolve'
-import {assertEnvValid} from 'lib/env'
-import {assertCrtExists} from 'lib/https'
-import {logCommand, logTitle} from 'lib/logging'
-import {notify} from 'lib/notifier'
-import {halt, runCommandSync} from 'lib/command'
-import {DeployOptions} from 'commands/deploy'
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -22,7 +22,7 @@ export type BuildOptions = {
   https: boolean
   serve: boolean
   deploy: boolean
-  env: string
+  env?: string
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,15 @@ export type BuildOptions = {
 export const build = async (
   options: BuildOptions & DeployOptions,
 ): Promise<void> => {
+  const {env} = options
+
   assertOptionsValid(options)
+  assertProfilesPresent()
+  applyEnv(env)
+
+  if (options.deploy) {
+    options.profile = await promptProfile()
+  }
 
   const flags = prepareFlags([], options).join(' ')
   const {ifCore} = getIfCoreFns()
@@ -38,7 +46,7 @@ export const build = async (
   const configName = ifCore(CORE_CONFIG_NAME, getWidgetUuid())
   const title = ifCore(
     'Building optimised (minified) bundle of Tamaro Core …',
-    `Building optimised (minified) bundle of “${configName}” customer configuration …`,
+    `Building optimised (minified) bundle of "${configName}" customer configuration …`,
   )
 
   const wpBin = resolveBin('webpack')
@@ -56,7 +64,8 @@ export const build = async (
 
   /////////////////////////////////////////////////////////////////////////////
 
-  logTitle(`\nBundle for “${configName}” customer configuration is done.`)
+  logTitle(`\nBundle for "${configName}" customer configuration is done.`)
+  // eslint-disable-next-line no-console
   console.log(`Path: ${paths.appDist}\n`)
 
   /////////////////////////////////////////////////////////////////////////////
@@ -64,7 +73,7 @@ export const build = async (
   process.on('exit', () => {
     notify({
       title: 'build',
-      message: `Bundle for “${configName}” customer configuration is done.`,
+      message: `Bundle for "${configName}" customer configuration is done.`,
     })
   })
 }
@@ -72,22 +81,21 @@ export const build = async (
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: BuildOptions & DeployOptions) => {
-  const {localCore, https, deploy, profile, env} = options
+  const {localCore, https, deploy, env} = options
   const {ifCore} = getIfCoreFns()
 
   if (ifCore() && localCore) {
-    halt('Flag “--local-core” is redundant if running in Tamaro Core context.')
+    halt('Flag "--local-core" is redundant if running in Tamaro Core context.')
   }
 
   if (localCore && deploy) {
-    halt('Flags “--local-core” and “--deploy” must not be used together.')
+    halt('Flags "--local-core" and "--deploy" must not be used together.')
   }
 
   if (https) {
     assertCrtExists()
   }
 
-  assertProfileValid(profile)
   assertEnvValid(env)
 }