@raisenow/tamaro-cli 1.1.7 → 1.1.9

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/tamaro-cli.iml" filepath="$PROJECT_DIR$/.idea/tamaro-cli.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/prettier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="AUTOMATIC" />
+  </component>
+</project>

package/.idea/runConfigurations/build_watch.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build:watch" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="build:watch" />
+    </scripts>
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

package/.idea/runConfigurations/lint_fix.xml

@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="lint:fix" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="lint:fix" />
+    </scripts>
+    <node-interpreter value="project" />
+    <package-manager value="pnpm" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

package/.idea/runConfigurations/tscheck.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tscheck" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="tscheck" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

package/.idea/tamaro-cli.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/.nvmrc

@@ -1 +1 @@
-v20.18.0
+v22.11.0

package/README.md

@@ -2,7 +2,8 @@
 
 It’s a command-line interface for all operations with Tamaro customer configurations and _Tamaro Core_.
 
-You don’t need to install it manually. The recommended way to run it is by using the `npx` command, which comes along with NPM.
+You don’t need to install it manually. The recommended way to run it is by using the `npx` command, which comes along
+with NPM.
 
 # Usage
 
@@ -12,7 +13,8 @@ To see an overview of all possible commands just run the following command witho
 npx -y @raisenow/tamaro-cli
 ```
 
-To see the information about some particular command (for example `dev` command), prepend `help` before the command name:
+To see the information about some particular command (for example `dev` command), prepend `help` before the command
+name:
 
 ```bash
 npx -y @raisenow/tamaro-cli help dev
@@ -44,7 +46,8 @@ Runs the local development server for _Tamaro Core_ or a particular customer con
 
 ### Run local server using Tamaro Core from CDN
 
-Run the local development server for the _example-02-typical-customisations_ customer configuration. You will be able to access Tamaro on <http://localhost:1234> (port may differ, see console output).
+Run the local development server for the _example-02-typical-customisations_ customer configuration. You will be able to
+access Tamaro on <http://localhost:1234> (port may differ, see console output).
 
 ```bash
 cd /path/to/tamaro-configurations/configs/example-02-typical-customisations
@@ -53,14 +56,17 @@ npx -y @raisenow/tamaro-cli dev
 
 ### Run local server using a locally running Tamaro Core
 
-1. Run the local development web server for _Tamaro Core_ in the first terminal tab. You will be able to access a default configuration of Tamaro on <http://localhost:1234> (port may differ, see console output).
+1. Run the local development web server for _Tamaro Core_ in the first terminal tab. You will be able to access a
+   default configuration of Tamaro on <http://localhost:1234> (port may differ, see console output).
 
     ```bash
     cd /path/to/tamaro-core
     npx -y @raisenow/tamaro-cli dev
     ```
 
-2. Run the local development web server for the _example-02-typical-customisations_ customer configuration in the second terminal tab. After running this command, you will able to access the configuration on <http://localhost:1235> (port may differ, see console output).
+2. Run the local development web server for the _example-02-typical-customisations_ customer configuration in the second
+   terminal tab. After running this command, you will able to access the configuration on <http://localhost:1235> (port
+   may differ, see console output).
 
     ```bash
     cd /path/to/tamaro-configurations/configs/example-02-typical-customisations
@@ -69,7 +75,10 @@ npx -y @raisenow/tamaro-cli dev
 
 ### Use Transport Level Security (HTTPS)
 
-You might want to the local web server to serve Tamaro over HTTPS, for example for testing wallet payments over Google Pay. For that, you have to install [mkcert](https://mkcert.org/), then generate a local certificate and key file and install it into your local trust stores using this command in the root directory of the Tamaro configuration repository (or Tamaro Core):
+You might want to the local web server to serve Tamaro over HTTPS, for example for testing wallet payments over Google
+Pay. For that, you have to install [mkcert](https://mkcert.org/), then generate a local certificate and key file and
+install it into your local trust stores using this command in the root directory of the Tamaro configuration
+repository (or Tamaro Core):
 
 Install `mkcert`:
 
@@ -83,9 +92,11 @@ Generate certificate:
 mkcert -install -cert-file localhost.crt -key-file localhost.key localhost 127.0.0.1 0.0.0.0 ::1
 ```
 
-You will see that the certificate and key files are created. Keep them for yourself. Do not share them or commit them. (They should be ignored by Git.)
+You will see that the certificate and key files are created. Keep them for yourself. Do not share them or commit them. (
+They should be ignored by Git.)
 
-You can then use the flag `--https` with the CLI. If you are using the local Tamaro Core, you also have to serve that over HTTPS. Certificate and key files must be copied to Tamaro Core folder as well.
+You can then use the flag `--https` with the CLI. If you are using the local Tamaro Core, you also have to serve that
+over HTTPS. Certificate and key files must be copied to Tamaro Core folder as well.
 
 ## `build`
 
@@ -115,7 +126,8 @@ As a result, the bundle should be deployed to: <https://tamaro.raisenow.com/exam
 
 ### Build and deploy a customer configuration with a specific tag
 
-Build and deploy an optimised (minified) bundle of the _example-02-typical-customisations_ customer configuration with the tag _WEB-123_.
+Build and deploy an optimised (minified) bundle of the _example-02-typical-customisations_ customer configuration with
+the tag _WEB-123_.
 
 ```bash
 cd /path/to/tamaro-configurations/configs/example-02-typical-customisations
@@ -128,7 +140,14 @@ As a result, the bundle should be deployed to: <https://tamaro.raisenow.com/exam
 
 Build and serve an optimised (minified) bundle of the _example-02-typical-customisations_ customer configuration.
 
-After running this command, a local web server should be running on <http://localhost:1234> (port may differ, see console output).
+After running this command, a local web server should be running on <http://localhost:1234> (port may differ, see
+console output).
+
+### Build and test locally with a Tamaro configuration
+
+1. Build with `pnpm build` (or `pnpm build:watch` for convince).
+2. Navigate to the Tamaro configuration directory you want to use.
+3. Run by specifying the relative path, e.g. `../../tools/tamaro-cli/dist/cli.js dev --https`
 
 ```bash
 cd /path/to/tamaro-configurations/configs/example-02-typical-customisations
@@ -148,7 +167,8 @@ Run a local web server for pre-built bundle.
     npx -y @raisenow/tamaro-cli build
     ```
 
-2. Serve it. After running this command, web-server should be running on <http://localhost:1234> (port may differ, see console output).
+2. Serve it. After running this command, web-server should be running on <http://localhost:1234> (port may differ, see
+   console output).
 
     ```bash
     npx -y @raisenow/tamaro-cli serve
@@ -162,7 +182,8 @@ Deploy a pre-built _Tamaro Core_ or customer configuration bundle to AWS S3.
 
 - `--tag <tag>` – Tag which should be used for the deployment of the bundle (default: "latest")
 
-Make sure you have built the bundle before deploying it with this command, otherwise you may mistakenly deploy the bundle from a previous build.
+Make sure you have built the bundle before deploying it with this command, otherwise you may mistakenly deploy the
+bundle from a previous build.
 
 ### Example
 
@@ -232,7 +253,8 @@ Link package source to be able to run its local version:
 npm link .
 ```
 
-Run the `build:watch` script to watch source files and automatically rebuild on changes. It must be running during the _Tamaro CLI_ development process.
+Run the `build:watch` script to watch source files and automatically rebuild on changes. It must be running during the
+_Tamaro CLI_ development process.
 
 ```bash
 npm run build:watch

package/bitbucket-pipelines.yml

@@ -0,0 +1,43 @@
+image: node:20.18
+
+definitions:
+  caches:
+    node:
+      key:
+        files:
+          - pnpm-lock.yaml
+          - package.json
+      path: node_modules
+    pnpm:
+      key:
+        files:
+          - pnpm-lock.yaml
+          - package.json
+      path: $BITBUCKET_CLONE_DIR/.pnpm-store
+  scripts:
+    initialize: &initialize |-
+      corepack enable pnpm
+      corepack prepare --activate
+  steps:
+    - step: &install
+        name: Install dependencies
+        caches:
+          - node
+          - pnpm
+        script:
+          - *initialize
+          - pnpm install --prefer-offline
+    - step: &check
+        name: Check
+        caches:
+          - node
+          - pnpm
+        script:
+          - *initialize
+          - pnpm lint
+          - pnpm tscheck
+
+pipelines:
+  default:
+    - step: *install
+    - step: *check

package/dist/{chunk-NJVU7WR2.js → chunk-KVWFHWZD.js}

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/tsup@8.3.5_jiti@1.21.0_postcss@8.4.47_tsx@4.19.1_typescript@5.6.3/node_modules/tsup/assets/esm_shims.js
+// node_modules/.pnpm/tsup@8.3.5_jiti@1.21.0_postcss@8.4.49_tsx@4.19.1_typescript@5.7.2/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -151,14 +151,13 @@ var getIfCoreFns = () => {
 import { createRequire as createRequire2 } from "module";
 import { basename as basename2 } from "path";
 import { config as dotenvConfig } from "dotenv";
-import { expand as dotenvExpand } from "dotenv-expand";
 import { globSync } from "glob";
 import stripIndent3 from "strip-indent";
 var require3 = createRequire2(import.meta.url);
 var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
   const filePath = files.find((file) => basename2(file) === ".env");
   if (filePath) {
-    dotenvExpand(dotenvConfig({ path: filePath }));
+    dotenvConfig({ path: filePath });
   }
   process.env.NODE_ENV ??= ifMin("production", "development");
   process.env.BABEL_ENV ??= ifMin("production", "development");
@@ -185,7 +184,7 @@ var getEnvVars = (files, ifMin, ifCore, ifLocalCore, ifHttps) => {
     } else {
       let version = process.env.CORE_VERSION;
       version = version ? `@${version}` : "";
-      process.env.CORE_URL ??= `https://fastly.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`;
+      process.env.CORE_URL ??= `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`;
     }
   }
   const varNames = [
@@ -263,7 +262,7 @@ var applyEnv = (env) => {
   const files = globSync(paths.appEnv);
   const filePath = files.find((file) => basename2(file) === `.env.${env}`);
   if (filePath) {
-    dotenvExpand(dotenvConfig({ path: filePath }));
+    dotenvConfig({ path: filePath });
   }
 };
 

package/dist/cli.js

@@ -22,11 +22,42 @@ import {
   resolveBin,
   resolveOwn,
   runCommandSync
-} from "./chunk-NJVU7WR2.js";
+} from "./chunk-KVWFHWZD.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
 
+// src/commands/validate.ts
+import { glob } from "glob";
+
+// src/lib/validators/validateEmailTemplates.ts
+import fs from "node:fs/promises";
+import handlebars from "handlebars";
+var { compile } = handlebars;
+var validateEmailTemplates = async (templateFiles) => {
+  const errors = [];
+  for (const templateFile of templateFiles) {
+    try {
+      const compiled = compile(await fs.readFile(templateFile, "utf-8"));
+      compiled({});
+      console.log(`${templateFile} is a valid email template`);
+    } catch (e) {
+      errors.push(`${templateFile} is invalid`);
+      errors.push(e);
+    }
+  }
+  return errors;
+};
+
+// src/commands/validate.ts
+var validate = async () => {
+  const errors = await validateEmailTemplates(await glob("email-config/templates/**/*.hbs"));
+  if (errors.length) {
+    halt(errors.map((el) => el.toString()).join("\n"));
+  }
+  logTitle("Valid. Bye.");
+};
+
 // src/lib/aws.ts
 import { execaCommandSync } from "execa";
 import prompts from "prompts";
@@ -151,6 +182,7 @@ var build = async (options) => {
     options.profile = await promptProfile();
   }
   assertOptionsValid(options);
+  await validate();
   const flags = prepareFlags2(options);
   const { ifCore } = getIfCoreFns();
   const paths = getPaths(ifCore);
@@ -228,6 +260,7 @@ var deploy = async (options) => {
     options.profile = await promptProfile();
   }
   assertOptionsValid2(options);
+  await validate();
   awsAuthenticate(options);
   const flags = prepareFlags(options);
   const { tag } = options;
@@ -335,6 +368,7 @@ var deployEmailConfig = async (options) => {
     options.bucket = options.ci ? AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD : await promptBucketTamaroEmailConfig();
   }
   assertOptionsValid3(options);
+  await validate();
   awsAuthenticate(options);
   const flags = prepareFlags(options);
   const configName = getWidgetUuid();
@@ -577,14 +611,14 @@ var prepareFlags4 = async (options) => {
 // package.json
 var package_default = {
   name: "@raisenow/tamaro-cli",
-  version: "1.1.7",
+  version: "1.1.9",
   author: {
     name: "RaiseNow",
     email: "development@raisenow.com"
   },
   type: "module",
   bin: "dist/cli.js",
-  packageManager: "pnpm@9.12.3",
+  packageManager: "pnpm@9.14.2",
   engines: {
     node: ">=20",
     pnpm: ">= 9.12",
@@ -612,10 +646,10 @@ var package_default = {
     "@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",
+    "@statoscope/webpack-plugin": "^5.28.3",
     "@types/columnify": "^1.5.4",
     "@types/lodash": "^4.17.13",
-    "@types/node": "^20.17.6",
+    "@types/node": "^22.9.3",
     "@types/node-notifier": "^8.0.5",
     "@types/prompts": "^2.4.9",
     "@types/resolve-bin": "^0.4.3",
@@ -635,7 +669,6 @@ var package_default = {
     "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.1",
     "eslint-config-prettier": "^9.1.0",
@@ -651,6 +684,8 @@ var package_default = {
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     glob: "^11.0.0",
+    handlebars: "^4.7.8",
+    "handlebars-helpers": "^0.10.0",
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.3",
     "json-loader": "^0.5.7",
@@ -658,21 +693,21 @@ var package_default = {
     "mini-css-extract-plugin": "^2.9.2",
     "node-notifier": "^10.0.1",
     portfinder: "^1.0.32",
-    postcss: "^8.4.47",
+    postcss: "^8.4.49",
     "postcss-custom-properties": "^14.0.4",
     "postcss-loader": "^8.1.1",
     prettier: "^3.3.3",
     prompts: "^2.4.2",
     "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
-    sass: "^1.80.6",
+    sass: "^1.81.0",
     "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",
+    "tsconfig-paths-webpack-plugin": "^4.2.0",
     tsup: "^8.3.5",
-    typescript: "^5.6.3",
+    typescript: "^5.7.2",
     "url-loader": "^4.1.1",
     webpack: "^5.96.1",
     "webpack-cli": "^5.1.4",
@@ -757,6 +792,9 @@ cli.command("list-deployed").description(
 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) => {
   await deployEmailConfig(options);
 });
+cli.command("validate").description("Validate the current Tamaro configuration to avoid common errors").action(async () => {
+  await validate();
+});
 (async () => {
   try {
     logTitle(`${package_default.name} ${package_default.version}

package/dist/webpack.config.js

@@ -10,7 +10,7 @@ import {
   logTitle,
   moduleFileExtensions,
   resolveApp
-} from "./chunk-NJVU7WR2.js";
+} from "./chunk-KVWFHWZD.js";
 
 // src/webpack.config.ts
 import { existsSync } from "fs";
@@ -81,17 +81,20 @@ var getWebpackConfig = (env) => {
   logDataTable(getRelativePaths(paths));
   logTitle("Environment variables:");
   logDataTable(envVars.raw);
-  const getCssLoaders = (cssOptions = {}) => {
+  const getCssLoaders = ({
+    styleLoader = true,
+    ...cssOptions
+  }) => {
     return removeEmpty([
-      ifMin({ loader: MiniCssExtractPlugin.loader }),
-      ifNotMin({
+      styleLoader ? ifMin({ loader: MiniCssExtractPlugin.loader }) : void 0,
+      styleLoader ? ifNotMin({
         loader: require2.resolve("style-loader"),
         options: {
           attributes: {
             "data-widget": process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET
           }
         }
-      }),
+      }) : void 0,
       {
         loader: require2.resolve("css-loader"),
         options: {
@@ -235,19 +238,22 @@ var getWebpackConfig = (env) => {
             {
               test: /\.(js|mjs)$/
             },
-            // Styles (not modules)
+            // Styles (extracted)
             {
               test: /\.s?css$/,
-              exclude: /\.module\.s?css$/,
+              resourceQuery: { not: [/inline/] },
               use: getCssLoaders({
-                modules: false
+                styleLoader: true
               })
             },
-            // Styles (modules)
+            // Styles (as string)
             {
-              test: /\.module\.s?css$/,
+              test: /\.s?css$/,
+              resourceQuery: /inline/,
               use: getCssLoaders({
-                modules: { localIdentName: "[local]__[hash:base64]" }
+                styleLoader: false,
+                exportType: "string",
+                sourceMap: false
               })
             },
             // Images and fonts

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
   },
   "type": "module",
   "bin": "dist/cli.js",
-  "packageManager": "pnpm@9.12.3",
+  "packageManager": "pnpm@9.14.2",
   "engines": {
     "node": ">=20",
     "pnpm": ">= 9.12",
@@ -35,10 +35,10 @@
     "@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",
+    "@statoscope/webpack-plugin": "^5.28.3",
     "@types/columnify": "^1.5.4",
     "@types/lodash": "^4.17.13",
-    "@types/node": "^20.17.6",
+    "@types/node": "^22.9.3",
     "@types/node-notifier": "^8.0.5",
     "@types/prompts": "^2.4.9",
     "@types/resolve-bin": "^0.4.3",
@@ -58,7 +58,6 @@
     "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.1",
     "eslint-config-prettier": "^9.1.0",
@@ -74,6 +73,8 @@
     "file-loader": "^6.2.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "glob": "^11.0.0",
+    "handlebars": "^4.7.8",
+    "handlebars-helpers": "^0.10.0",
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.3",
     "json-loader": "^0.5.7",
@@ -81,21 +82,21 @@
     "mini-css-extract-plugin": "^2.9.2",
     "node-notifier": "^10.0.1",
     "portfinder": "^1.0.32",
-    "postcss": "^8.4.47",
+    "postcss": "^8.4.49",
     "postcss-custom-properties": "^14.0.4",
     "postcss-loader": "^8.1.1",
     "prettier": "^3.3.3",
     "prompts": "^2.4.2",
     "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.80.6",
+    "sass": "^1.81.0",
     "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",
+    "tsconfig-paths-webpack-plugin": "^4.2.0",
     "tsup": "^8.3.5",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "url-loader": "^4.1.1",
     "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4",