@raisenow/tamaro-cli 1.1.7 → 1.1.8

package/.nvmrc

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

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,7 +22,7 @@ import {
   resolveBin,
   resolveOwn,
   runCommandSync
-} from "./chunk-NJVU7WR2.js";
+} from "./chunk-KVWFHWZD.js";
 
 // src/cli.ts
 import { createCommand } from "commander";
@@ -577,14 +577,14 @@ var prepareFlags4 = async (options) => {
 // package.json
 var package_default = {
   name: "@raisenow/tamaro-cli",
-  version: "1.1.7",
+  version: "1.1.8",
   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 +612,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 +635,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",
@@ -658,21 +657,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",

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.8",
   "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",
@@ -81,21 +80,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",

package/src/lib/env.ts

@@ -1,7 +1,6 @@
 import {createRequire} from 'module'
 import {basename} from 'path'
 import {config as dotenvConfig} from 'dotenv'
-import {expand as dotenvExpand} from 'dotenv-expand'
 import {globSync} from 'glob'
 import stripIndent from 'strip-indent'
 import type {IfUtilsFn} from 'webpack-config-utils'
@@ -28,7 +27,7 @@ export const getEnvVars = (
   const filePath = files.find((file) => basename(file) === '.env')
 
   if (filePath) {
-    dotenvExpand(dotenvConfig({path: filePath}))
+    dotenvConfig({path: filePath})
   }
 
   process.env.NODE_ENV ??= ifMin('production', 'development')
@@ -63,8 +62,8 @@ export const getEnvVars = (
       let version = process.env.CORE_VERSION
       version = version ? `@${version}` : ''
 
-      // process.env.CORE_URL ??= `https://cdn.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
-      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`
+      // process.env.CORE_URL ??= `https://fastly.jsdelivr.net/npm/@raisenow/tamaro-core${version}/dist/index.js`
     }
   }
 
@@ -171,6 +170,6 @@ export const applyEnv = (env?: string) => {
   const filePath = files.find((file) => basename(file) === `.env.${env}`)
 
   if (filePath) {
-    dotenvExpand(dotenvConfig({path: filePath}))
+    dotenvConfig({path: filePath})
   }
 }

package/src/webpack.config.ts

@@ -60,17 +60,22 @@ const getWebpackConfig = (env: any): Configuration => {
   logTitle('Environment variables:')
   logDataTable(envVars.raw)
 
-  const getCssLoaders = (cssOptions: any = {}): RuleSetUseItem[] => {
+  const getCssLoaders = ({
+    styleLoader = true,
+    ...cssOptions
+  }: {styleLoader?: boolean} & Record<string, any>): RuleSetUseItem[] => {
     return removeEmpty([
-      ifMin({loader: MiniCssExtractPlugin.loader}),
-      ifNotMin({
-        loader: require.resolve('style-loader'),
-        options: {
-          attributes: {
-            'data-widget': process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET,
-          },
-        },
-      }),
+      styleLoader ? ifMin({loader: MiniCssExtractPlugin.loader}) : undefined,
+      styleLoader
+        ? ifNotMin({
+            loader: require.resolve('style-loader'),
+            options: {
+              attributes: {
+                'data-widget': process.env.ELEMENT_ATTRIBUTE_DATA_WIDGET,
+              },
+            },
+          })
+        : undefined,
       {
         loader: require.resolve('css-loader'),
         options: {
@@ -221,20 +226,23 @@ const getWebpackConfig = (env: any): Configuration => {
               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,
               }),
             },