@raisenow/tamaro-cli 1.1.5 → 1.1.7

package/dist/webpack.config.js

@@ -10,7 +10,7 @@ import {
   logTitle,
   moduleFileExtensions,
   resolveApp
-} from "./chunk-TXIBRHT6.js";
+} from "./chunk-NJVU7WR2.js";
 
 // src/webpack.config.ts
 import { existsSync } from "fs";
@@ -123,7 +123,7 @@ var getWebpackConfig = (env) => {
       },
       {
         loader: require2.resolve("sass-loader"),
-        options: { sourceMap: true }
+        options: { api: "modern-compiler", sourceMap: true }
       }
     ]);
   };
@@ -175,8 +175,10 @@ var getWebpackConfig = (env) => {
         }),
         {
           oneOf: [
-            // App Javascript and Typescript (Babel)
-            // and some dependencies distributed in a non-es5 formats
+            /**
+             * App Javascript and Typescript (Babel)
+             * and some dependencies distributed in a non-es5 formats
+             */
             {
               test: /\.(js|ts)x?$/,
               include: ifCore(
@@ -277,8 +279,10 @@ var getWebpackConfig = (env) => {
                 minimize: false
               }
             },
-            // All other files - fallback
-            // This must be the latest rule!
+            /**
+             * All other files - fallback
+             * This must be the latest rule!
+             */
             {
               exclude: [/^$/, /\.(js|jsx|ts|tsx|mjs)$/, /\.html$/, /\.json$/],
               type: "asset/resource"

package/package.json

@@ -1,104 +1,106 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
   },
   "type": "module",
+  "bin": "dist/cli.js",
+  "packageManager": "pnpm@9.12.3",
+  "engines": {
+    "node": ">=20",
+    "pnpm": ">= 9.12",
+    "npm": "please-use-pnpm",
+    "yarn": "please-use-pnpm"
+  },
   "scripts": {
     "prepare": "pnpm build",
     "tscheck": "tsc --noEmit",
     "build": "tsup src/cli.ts src/webpack.config.ts --clean --shims --format esm",
     "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 .",
+    "lint": "DEBUG=eslint:cli-engine eslint .",
+    "lint:fix": "DEBUG=eslint:cli-engine eslint --fix .",
     "format": "prettier --write ."
   },
-  "bin": "dist/cli.js",
-  "engines": {
-    "node": ">=20",
-    "npm": ">=10"
-  },
-  "packageManager": "pnpm@9.0.5",
   "dependencies": {
-    "@babel/cli": "^7.24.1",
-    "@babel/core": "^7.24.4",
-    "@babel/plugin-proposal-decorators": "^7.24.1",
+    "@babel/cli": "^7.25.9",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.24.3",
-    "@babel/preset-env": "^7.24.4",
-    "@babel/preset-react": "^7.24.1",
-    "@babel/preset-typescript": "^7.24.1",
-    "@babel/runtime-corejs3": "^7.24.4",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
+    "@babel/plugin-transform-runtime": "^7.25.9",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.25.9",
+    "@babel/preset-typescript": "^7.26.0",
+    "@babel/runtime-corejs3": "^7.26.0",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@statoscope/webpack-plugin": "^5.28.2",
     "@types/columnify": "^1.5.4",
-    "@types/lodash": "^4.17.0",
-    "@types/node": "^20.12.7",
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^20.17.6",
     "@types/node-notifier": "^8.0.5",
     "@types/prompts": "^2.4.9",
     "@types/resolve-bin": "^0.4.3",
     "@types/webpack-config-utils": "^2.3.4",
-    "@typescript-eslint/eslint-plugin": "^7.7.1",
-    "@typescript-eslint/parser": "^7.7.1",
-    "autoprefixer": "^10.4.19",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-istanbul": "^6.1.1",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "autoprefixer": "^10.4.20",
+    "babel-loader": "^9.2.1",
+    "babel-plugin-istanbul": "^7.0.0",
     "babel-plugin-lodash": "^3.3.4",
     "chalk": "^5.3.0",
     "clean-webpack-plugin": "^4.0.0",
     "columnify": "^1.6.0",
-    "commander": "^12.0.0",
+    "commander": "^12.1.0",
     "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.37.0",
-    "css-loader": "^7.1.1",
-    "css-minimizer-webpack-plugin": "^6.0.0",
+    "core-js": "^3.39.0",
+    "css-loader": "^7.1.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
     "escape-string-regexp": "^5.0.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-deprecation": "^2.0.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-markdownlint": "^0.5.0",
-    "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-unused-imports": "^3.1.0",
-    "eslint-plugin-yml": "^1.14.0",
-    "eslint-webpack-plugin": "^4.1.0",
-    "execa": "^8.0.1",
+    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint-plugin-deprecation": "^3.0.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-markdownlint": "^0.6.0",
+    "eslint-plugin-promise": "^7.1.0",
+    "eslint-plugin-unused-imports": "^3.2.0",
+    "eslint-plugin-yml": "^1.15.0",
+    "eslint-webpack-plugin": "^4.2.0",
+    "execa": "^9.5.1",
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
-    "glob": "^10.3.12",
-    "html-loader": "^5.0.0",
-    "html-webpack-plugin": "^5.6.0",
+    "glob": "^11.0.0",
+    "html-loader": "^5.1.0",
+    "html-webpack-plugin": "^5.6.3",
     "json-loader": "^0.5.7",
     "lodash": "^4.17.21",
-    "mini-css-extract-plugin": "^2.9.0",
+    "mini-css-extract-plugin": "^2.9.2",
     "node-notifier": "^10.0.1",
     "portfinder": "^1.0.32",
-    "postcss": "^8.4.38",
-    "postcss-custom-properties": "^13.3.8",
+    "postcss": "^8.4.47",
+    "postcss-custom-properties": "^14.0.4",
     "postcss-loader": "^8.1.1",
-    "prettier": "^3.2.5",
+    "prettier": "^3.3.3",
     "prompts": "^2.4.2",
-    "react-refresh": "^0.14.0",
+    "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.75.0",
-    "sass-loader": "^14.2.1",
+    "sass": "^1.80.6",
+    "sass-loader": "^16.0.3",
     "source-map-loader": "^5.0.0",
     "strip-indent": "^4.0.0",
     "style-loader": "^4.0.0",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
-    "tsup": "^8.0.2",
-    "typescript": "^5.4.5",
+    "tsup": "^8.3.5",
+    "typescript": "^5.6.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.91.0",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",
     "webpack-config-utils": "^2.3.1",
-    "webpack-dev-server": "^5.0.4",
+    "webpack-dev-server": "^5.1.0",
     "yaml-loader": "^0.8.1"
   }
 }

package/src/cli.ts

@@ -10,22 +10,25 @@ import {
 import {dev, type DevOptions} from 'commands/dev'
 import {listDeployed, type ListDeployedOptions} from 'commands/list-deployed'
 import {serve, type ServeOptions} from 'commands/serve'
+import {halt} from 'lib/command'
 import {DEFAULT_PORT, DEFAULT_TAG} from 'lib/constants'
-import {logError} from 'lib/logging'
+import {logError, logTitle} from 'lib/logging'
 import pkg from '../package.json'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
+/**
+ * Makes the script crash on unhandled rejections instead of silently
+ * ignoring them. In the future, promise rejections that are not handled will
+ * terminate the Node.js process with a non-zero exit code.
+ */
 process.on('unhandledRejection', (error) => {
   throw error
 })
 
 // Exit on ctrl+c
 process.on('SIGINT', () => {
-  process.exit(1)
+  halt()
 })
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -75,6 +78,7 @@ cli
   )
   .option('--port <port>', 'Web server port', `${DEFAULT_PORT}`)
   .option('--env <env>', 'Environment (dev, stage, prod)')
+  .option('--profile <profile>', 'AWS profile')
   .option('--ci', 'CI environment', false)
   .option(
     '--deploy',
@@ -117,6 +121,7 @@ cli
   .description(
     'Deploy a pre-built Tamaro Core or customer configuration bundle to AWS S3',
   )
+  .option('--profile <profile>', 'AWS profile')
   .option('--ci', 'CI environment', false)
   .option(
     '--tag <tag>',
@@ -132,6 +137,7 @@ cli
   .description(
     'List deployments of Tamaro Core or a particular customer configuration',
   )
+  .option('--profile <profile>', 'AWS profile')
   .option('--ci', 'CI environment', false)
   .option(
     '--config <config>',
@@ -144,7 +150,9 @@ cli
 cli
   .command('deploy-email-config')
   .description("Deploy a widget's email configuration to AWS S3")
+  .option('--profile <profile>', 'AWS profile')
   .option('--ci', 'CI environment', false)
+  .option('--bucket <bucket>', 'AWS bucket for email configs')
   .action(async (options: DeployEmailConfigOptions) => {
     await deployEmailConfig(options)
   })
@@ -154,6 +162,8 @@ cli
 // eslint-disable-next-line @typescript-eslint/no-floating-promises
 ;(async () => {
   try {
+    logTitle(`${pkg.name} ${pkg.version}\n`)
+
     await cli.parseAsync(process.argv)
   } catch (error: any) {
     if (error.signal === 'SIGINT' && error.signalDescription) {

package/src/commands/build.ts

@@ -1,5 +1,5 @@
 import {type DeployOptions} from 'commands/deploy'
-import {assertProfilesPresent, promptProfile} from 'lib/aws'
+import {assertProfilesPresent, assertProfileValid, promptProfile} from 'lib/aws'
 import {halt, runCommandSync} from 'lib/command'
 import {CORE_CONFIG_NAME} from 'lib/constants'
 import {applyEnv, assertEnvValid} from 'lib/env'
@@ -33,15 +33,16 @@ export const build = async (
 ): Promise<void> => {
   const {env} = options
 
-  assertOptionsValid(options)
   applyEnv(env)
 
-  if (options.deploy && !options.ci) {
+  if (options.deploy && !options.profile && !options.ci) {
     assertProfilesPresent()
     options.profile = await promptProfile()
   }
 
-  const flags = prepareFlags([], options).join(' ')
+  assertOptionsValid(options)
+
+  const flags = prepareFlags(options)
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
   const configName = ifCore(CORE_CONFIG_NAME, getWidgetUuid())
@@ -82,7 +83,7 @@ export const build = async (
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: BuildOptions & DeployOptions) => {
-  const {localCore, https, deploy, env} = options
+  const {localCore, https, deploy, env, profile} = options
   const {ifCore} = getIfCoreFns()
 
   if (ifCore() && localCore) {
@@ -97,12 +98,17 @@ const assertOptionsValid = (options: BuildOptions & DeployOptions) => {
     assertCrtExists()
   }
 
+  if (profile) {
+    assertProfileValid(profile)
+  }
+
   assertEnvValid(env)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const prepareFlags = (flags: string[], options: BuildOptions): string[] => {
+const prepareFlags = (options: BuildOptions) => {
+  const flags: string[] = []
   const {localCore, analyze, https, nolint} = options
 
   if (localCore) {
@@ -121,5 +127,5 @@ const prepareFlags = (flags: string[], options: BuildOptions): string[] => {
     flags.push('--env nolint')
   }
 
-  return flags
+  return flags.join(' ')
 }

package/src/commands/deploy-email-config.ts

@@ -1,21 +1,28 @@
 import {existsSync} from 'fs'
+// eslint-disable-next-line import/no-named-as-default
+import prompts from 'prompts'
 import {
   assertProfilesPresent,
+  assertProfileValid,
+  awsAuthenticate,
   type AwsOptions,
   prepareFlags,
-  promptBucket,
   promptProfile,
-  withAwsAuthenticate,
 } from 'lib/aws'
 import {halt, runCommandSync} from 'lib/command'
-import {AWS_S3_EMAIL_CONFIG_PROD_BUCKET} from 'lib/constants'
+import {
+  AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD,
+  AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE,
+} from 'lib/constants'
 import {logCommand, logDataTable, logTitle} from 'lib/logging'
 import {notify} from 'lib/notifier'
 import {getIfCoreFns, getPaths, getWidgetUuid} from 'lib/resolve'
 
 ///////////////////////////////////////////////////////////////////////////////
 
-export type DeployEmailConfigOptions = AwsOptions
+export type DeployEmailConfigOptions = AwsOptions & {
+  bucket?: string
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -29,18 +36,23 @@ export const deployEmailConfig = async (
   assertIsNotCore()
   assertEmailConfigPathExists(emailConfigPath)
 
-  if (!options.ci) {
+  if (!options.profile && !options.ci) {
     assertProfilesPresent()
     options.profile = await promptProfile()
   }
 
-  const bucket = options.ci
-    ? AWS_S3_EMAIL_CONFIG_PROD_BUCKET
-    : await promptBucket()
+  if (!options.bucket) {
+    options.bucket = options.ci
+      ? AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD
+      : await promptBucketTamaroEmailConfig()
+  }
+
+  assertOptionsValid(options)
+  awsAuthenticate(options)
 
-  const flags = prepareFlags([], options).join(' ')
+  const flags = prepareFlags(options)
   const configName = getWidgetUuid()
-  const deployUrl = `s3://${bucket}/${configName}`
+  const deployUrl = `s3://${options.bucket}/${configName}`
 
   const cmd = `
     aws s3 sync ${emailConfigPath} ${deployUrl}
@@ -54,7 +66,7 @@ export const deployEmailConfig = async (
   logCommand(cmd)
 
   try {
-    withAwsAuthenticate(() => runCommandSync(cmd, {stdout: 'inherit'}), options)
+    runCommandSync(cmd, {stdout: 'inherit'})
   } catch (error: any) {
     halt(error.stderr)
   }
@@ -78,9 +90,23 @@ export const deployEmailConfig = async (
 
 ///////////////////////////////////////////////////////////////////////////////
 
+const assertOptionsValid = (options: DeployEmailConfigOptions) => {
+  const {profile, bucket} = options
+
+  if (profile) {
+    assertProfileValid(profile)
+  }
+
+  if (bucket) {
+    assertBucketValid(bucket)
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 const assertEmailConfigPathExists = (distPath: string) => {
   if (!existsSync(distPath)) {
-    halt('Email config folder does not exists. Nothing to deploy.', 0)
+    halt('Email config folder does not exists. Nothing to deploy.')
   }
 }
 
@@ -93,3 +119,41 @@ const assertIsNotCore = () => {
     halt('You cannot deploy widget email configuration for Tamaro Core.')
   }
 }
+
+///////////////////////////////////////////////////////////////////////////////
+
+const assertBucketValid = (bucket: string) => {
+  const buckets = [
+    AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE,
+    AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD,
+  ] as const
+
+  if (!buckets.includes(bucket as any)) {
+    halt('Invalid bucket name.')
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+const promptBucketTamaroEmailConfig = async (): Promise<string> => {
+  const buckets = [
+    {title: 'stage', value: AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE},
+    {title: 'prod', value: AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD},
+  ]
+
+  const {bucket} = await prompts(
+    [
+      {
+        type: 'select',
+        name: 'bucket',
+        message: 'Select environment',
+        choices: buckets,
+      },
+    ],
+    {
+      onCancel: () => halt(),
+    },
+  )
+
+  return bucket
+}

package/src/commands/deploy.ts

@@ -2,15 +2,16 @@ import {existsSync} from 'fs'
 import stripIndent from 'strip-indent'
 import {
   assertProfilesPresent,
+  assertProfileValid,
+  awsAuthenticate,
   type AwsOptions,
   prepareFlags,
   promptProfile,
-  withAwsAuthenticate,
 } from 'lib/aws'
 import {halt, runCommandSync} from 'lib/command'
 import {
   AWS_CLOUDFRONT_DISTRIBUTION_ID,
-  AWS_S3_BUCKET,
+  AWS_S3_BUCKET_TAMARO,
   CORE_CONFIG_NAME,
 } from 'lib/constants'
 import {logCommand, logDataTable, logTitle} from 'lib/logging'
@@ -29,24 +30,25 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
   const {ifCore} = getIfCoreFns()
   const paths = getPaths(ifCore)
 
-  assertOptionsValid(options)
   assertDistPathExists(paths.appDist)
 
-  if (!options.ci && !options.profile) {
+  if (!options.profile && !options.ci) {
     assertProfilesPresent()
     options.profile = await promptProfile()
   }
 
-  const flags = prepareFlags([], options).join(' ')
+  assertOptionsValid(options)
+  awsAuthenticate(options)
+
+  const flags = prepareFlags(options)
   const {tag} = options
   const configName = ifCore(CORE_CONFIG_NAME, getWidgetUuid())
-  const deployUrl = `s3://${AWS_S3_BUCKET}/${configName}/${tag}`
+  const deployUrl = `s3://${AWS_S3_BUCKET_TAMARO}/${configName}/${tag}`
   const entryFilename = ifCore('index.js', 'widget.js')
 
-  /////////////////////////////////////////////////////////////////////////////
-  // Sync all files except entrypoint (without deleting old files)
-  /////////////////////////////////////////////////////////////////////////////
-
+  /**
+   * Sync all files except entrypoint (without deleting old files)
+   */
   const cmdSyncAll = `
     aws s3 sync ${paths.appDist} ${deployUrl}
       --acl public-read
@@ -58,18 +60,14 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
   logCommand(cmdSyncAll)
 
   try {
-    withAwsAuthenticate(
-      () => runCommandSync(cmdSyncAll, {stdout: 'inherit'}),
-      options,
-    )
+    runCommandSync(cmdSyncAll, {stdout: 'inherit'})
   } catch (error: any) {
     halt(error.stderr)
   }
 
-  /////////////////////////////////////////////////////////////////////////////
-  // Copy entrypoint
-  /////////////////////////////////////////////////////////////////////////////
-
+  /**
+   * Copy entrypoint
+   */
   const cmdCpEntry = `
     aws s3 cp ${paths.appDist}/${entryFilename} ${deployUrl}/${entryFilename}
       --acl public-read
@@ -79,18 +77,14 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
   logCommand(cmdCpEntry)
 
   try {
-    withAwsAuthenticate(
-      () => runCommandSync(cmdCpEntry, {stdout: 'inherit'}),
-      options,
-    )
+    runCommandSync(cmdCpEntry, {stdout: 'inherit'})
   } catch (error: any) {
     halt(error.stderr)
   }
 
-  /////////////////////////////////////////////////////////////////////////////
-  // Invalidate cloudfront cache
-  /////////////////////////////////////////////////////////////////////////////
-
+  /**
+   * Invalidate cloudfront cache
+   */
   const cmdInvalidateCache = `
     aws cloudfront create-invalidation
       --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID}
@@ -102,15 +96,15 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
 
   try {
     // ignore output
-    withAwsAuthenticate(() => runCommandSync(cmdInvalidateCache), options)
+    runCommandSync(cmdInvalidateCache)
   } catch (error: any) {
     halt(error.stderr)
   }
 
   /////////////////////////////////////////////////////////////////////////////
 
-  const demoPage = `https://${AWS_S3_BUCKET}/${configName}/${tag}/index.html`
-  const entryPoint = `https://${AWS_S3_BUCKET}/${configName}/${tag}/${entryFilename}`
+  const demoPage = `https://${AWS_S3_BUCKET_TAMARO}/${configName}/${tag}/index.html`
+  const entryPoint = `https://${AWS_S3_BUCKET_TAMARO}/${configName}/${tag}/${entryFilename}`
 
   logTitle(`\nBundle for "${configName}" is deployed with tag "${tag}".`)
   logDataTable({
@@ -135,7 +129,11 @@ export const deploy = async (options: DeployOptions): Promise<void> => {
 ///////////////////////////////////////////////////////////////////////////////
 
 const assertOptionsValid = (options: DeployOptions) => {
-  const {tag} = options
+  const {profile, tag} = options
+
+  if (profile) {
+    assertProfileValid(profile)
+  }
 
   assertTagValid(tag)
 }

package/src/commands/dev.ts

@@ -20,10 +20,10 @@ export type DevOptions = {
 export const dev = async (options: DevOptions): Promise<void> => {
   const {env} = options
 
-  assertOptionsValid(options)
   applyEnv(env)
+  assertOptionsValid(options)
 
-  const flags = (await prepareFlags([], options)).join(' ')
+  const flags = await prepareFlags(options)
   const {ifCore} = getIfCoreFns()
   const title = ifCore(
     'Running dev web-server for Tamaro Core …',
@@ -65,10 +65,8 @@ const assertOptionsValid = (options: DevOptions) => {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-const prepareFlags = async (
-  flags: string[],
-  options: DevOptions,
-): Promise<string[]> => {
+const prepareFlags = async (options: DevOptions) => {
+  const flags: string[] = []
   const {localCore, port: defaultPort, https, nolint} = options
   const port = await getPortPromise({port: Number(defaultPort)})
 
@@ -86,5 +84,5 @@ const prepareFlags = async (
     flags.push('--env nolint')
   }
 
-  return flags
+  return flags.join(' ')
 }