@raisenow/tamaro-cli 1.8.0-dev.1 → 1.8.0-dev.2

package/.husky/pre-commit

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+corepack enable pnpm
+corepack prepare --activate
+
+pnpm lint-staged

package/bitbucket-pipelines.yml

@@ -18,15 +18,9 @@ definitions:
     initialize: &initialize |-
       corepack enable pnpm
       corepack prepare --activate
+      npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN_READ_ONLY
+      pnpm install --prefer-offline
   steps:
-    - step: &install
-        name: Install dependencies
-        caches:
-          - node
-          - pnpm
-        script:
-          - *initialize
-          - pnpm install --prefer-offline
     - step: &check
         name: Check
         caches:
@@ -43,5 +37,4 @@ definitions:
 
 pipelines:
   default:
-    - step: *install
     - step: *check

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as promptConfirmation, D as logError, E as logDataTable, O as logSuccess, S as halt, T as logCommand, _ as getWidgetUuid, a as AWS_S3_BUCKET_TAMARO, c as CORE_CONFIG_NAME, d as HTTPS_CRT_FILE, f as HTTPS_KEY_FILE, h as getPaths, i as AWS_CLOUDFRONT_DISTRIBUTION_ID, k as logTitle, l as DEFAULT_PORT, m as getIfCoreFns, n as assertEnvValid, o as AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD, s as AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE, t as applyEnv, u as DEFAULT_TAG, w as runCommandSync, x as resolveOwn, y as resolveBin } from "./env-BrLTVK6y.js";
+import { C as promptConfirmation, D as logError, E as logDataTable, O as logSuccess, S as halt, T as logCommand, _ as getWidgetUuid, a as AWS_S3_BUCKET_TAMARO, c as CORE_CONFIG_NAME, d as HTTPS_CRT_FILE, f as HTTPS_KEY_FILE, h as getPaths, i as AWS_CLOUDFRONT_DISTRIBUTION_ID, k as logTitle, l as DEFAULT_PORT, m as getIfCoreFns, n as assertEnvValid, o as AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_PROD, s as AWS_S3_BUCKET_TAMARO_EMAIL_CONFIG_STAGE, t as applyEnv, u as DEFAULT_TAG, w as runCommandSync, x as resolveOwn, y as resolveBin } from "./env-B20cxmcB.js";
 import { createCommand } from "commander";
 import fs, { existsSync, mkdirSync, renameSync } from "node:fs";
 import path from "node:path";
@@ -621,13 +621,7 @@ const unarchive = (options) => {
 	assertIsArchived();
 	const configName = getWidgetUuid();
 	const cwd = process.cwd();
-	/**
-	* _archived/
-	*/
 	const archivedDir = path.dirname(cwd);
-	/**
-	* parent of _archived/
-	*/
 	const configsDir = path.dirname(archivedDir);
 	const restoreTarget = path.resolve(configsDir, configName);
 	assertRestoreTargetDoesNotExist(restoreTarget);
@@ -795,7 +789,7 @@ const promptBucketTamaroEmailConfig = async () => {
 //#endregion
 //#region package.json
 var name = "@raisenow/tamaro-cli";
-var version = "1.8.0-dev.1";
+var version = "1.8.0-dev.2";
 //#endregion
 //#region src/cli.ts
 /**

package/dist/{env-BrLTVK6y.js → env-B20cxmcB.js}

@@ -68,9 +68,6 @@ const TAMARO_CORE_PACKAGE_NAMES = ["@raisenow/tamaro-core"];
 const TAMARO_CONFIGURATIONS_PACKAGE_NAMES = ["@raisenow/tamaro-configurations"];
 const TAMARO_SELF_SERVICE_PACKAGE_NAMES = ["@raisenow/tamaro-self-service"];
 const resolveApp = (relativePath) => path.resolve(realpathSync(process.cwd()), relativePath);
-/**
-* __dirname is "dist" in runtime
-*/
 const resolveOwn = (relativePath) => path.resolve(__dirname, "..", relativePath);
 const resolveModule = (resolveFn, filePath) => {
 	const extension = moduleFileExtensions.find((extension) => existsSync(resolveFn(`${filePath}.${extension}`)));
@@ -107,6 +104,27 @@ const resolveBin = (name) => {
 	return path.join(dir, binPath);
 };
 const getWidgetUuid = () => path.basename(resolveApp("."));
+/**
+* Get the appropriate tsconfig file.
+* Prefers tsconfig.app.json (composite config structure) but falls back to
+* tsconfig.json for backwards compatibility with older versions.
+*/
+const getTsConfigPath = () => {
+	const appTsConfig = resolveApp("tsconfig.app.json");
+	if (existsSync(appTsConfig)) return appTsConfig;
+	return resolveApp("tsconfig.json");
+};
+/**
+* Get the appropriate tailwind config file.
+* Prefers tailwind.config.cjs (for ESM compatibility) but falls back to
+* tailwind.config.js for backwards compatibility.
+*/
+const getTailwindConfigPath = () => {
+	const cjsConfig = resolveApp("tailwind.config.cjs");
+	if (existsSync(cjsConfig)) return cjsConfig;
+	const jsConfig = resolveApp("tailwind.config.js");
+	if (existsSync(jsConfig)) return jsConfig;
+};
 const getPaths = (ifCore) => {
 	return ifCore({
 		root: resolveApp("."),
@@ -114,10 +132,10 @@ const getPaths = (ifCore) => {
 		appEntry: resolveModule(resolveApp, "src/index"),
 		appDist: resolveApp("dist"),
 		appNodeModules: resolveApp("node_modules"),
-		appTsConfig: resolveApp("tsconfig.json"),
+		appTsConfig: getTsConfigPath(),
 		appHtml: resolveApp("src/*.html"),
 		appEnv: resolveApp(".env*"),
-		appTailwindConfig: resolveApp("tailwind.config.js")
+		appTailwindConfig: getTailwindConfigPath()
 	}, {
 		root: resolveApp("../.."),
 		app: resolveApp("."),

package/dist/webpack.config.js

@@ -1,4 +1,4 @@
-import { E as logDataTable, b as resolveEslintPluginConfig, d as HTTPS_CRT_FILE, f as HTTPS_KEY_FILE, g as getRelativePaths, h as getPaths, k as logTitle, m as getIfCoreFns, p as extensions, r as getEnvVars, v as resolveApp } from "./env-BrLTVK6y.js";
+import { E as logDataTable, b as resolveEslintPluginConfig, d as HTTPS_CRT_FILE, f as HTTPS_KEY_FILE, g as getRelativePaths, h as getPaths, k as logTitle, m as getIfCoreFns, p as extensions, r as getEnvVars, v as resolveApp } from "./env-B20cxmcB.js";
 import { createRequire } from "node:module";
 import { existsSync } from "node:fs";
 import path from "node:path";

package/eslint.config.ts

@@ -0,0 +1,30 @@
+import {
+  baseConfig,
+  defineConfig,
+  GLOB_MARKDOWN,
+  GLOB_SRC,
+  OFF,
+} from '@rnw-npm/eslint-config'
+
+export default defineConfig([
+  ...baseConfig,
+
+  /**
+   * "tamaro-cli" specific overrides.
+   */
+  {
+    files: [GLOB_SRC],
+    name: 'tamaro-cli/overrides/ts',
+    rules: {
+      'jsdoc/convert-to-jsdoc-comments': OFF,
+      'no-useless-assignment': OFF,
+    },
+  },
+  {
+    files: [GLOB_MARKDOWN],
+    name: 'tamaro-cli/overrides/md',
+    rules: {
+      'markdown/no-multiple-h1': OFF,
+    },
+  },
+])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raisenow/tamaro-cli",
-  "version": "1.8.0-dev.1",
+  "version": "1.8.0-dev.2",
   "author": {
     "name": "RaiseNow",
     "email": "development@raisenow.com"
@@ -54,7 +54,7 @@
     "html-loader": "^5.1.0",
     "html-webpack-plugin": "^5.6.6",
     "json-loader": "^0.5.7",
-    "lodash": "^4.17.23",
+    "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.10.2",
     "node-notifier": "^10.0.1",
     "portfinder": "^1.0.38",
@@ -82,12 +82,20 @@
     "yaml-loader": "^0.9.0"
   },
   "devDependencies": {
-    "@rnw-npm/eslint-config": "^1.0.1",
+    "@rnw-npm/eslint-config": "2.0.0-dev.1",
     "@rnw-npm/prettier-config": "^1.0.0",
-    "eslint": "^9.39.4",
+    "eslint": "^10.1.0",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.4.0",
     "prettier": "^3.8.1"
   },
   "prettier": "@rnw-npm/prettier-config",
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx,json,css,scss,md,yml,yaml}": [
+      "eslint --fix",
+      "prettier --write"
+    ]
+  },
   "scripts": {
     "typecheck": "tsc --noEmit",
     "build": "tsdown",

package/vitest.config.ts

@@ -4,9 +4,9 @@ export default defineConfig({
   test: {
     coverage: {
       exclude: [
+        //
         'dist/**',
-        '.eslintrc.cjs',
-        '.prettierrc.cjs',
+        'eslint.config.js',
         'vitest.config.ts',
       ],
       provider: 'v8',

package/eslint.config.js

@@ -1,17 +0,0 @@
-// @ts-check
-import baseConfig from '@rnw-npm/eslint-config'
-import {defineConfig} from 'eslint/config'
-
-export default defineConfig([
-  ...baseConfig,
-
-  /**
-   * "tamaro-cli" specific overrides.
-   */
-  {
-    name: 'tamaro-cli/overrides',
-    rules: {
-      'markdown/no-multiple-h1': 0,
-    },
-  },
-])