@common-stack/generate-plugin 6.0.2-alpha.6 → 6.0.2-alpha.7

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.2-alpha.7](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.6...v6.0.2-alpha.7) (2024-08-23)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [6.0.2-alpha.6](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.5...v6.0.2-alpha.6) (2024-08-23)
 
 **Note:** Version bump only for package @common-stack/generate-plugin

package/lib/generators/add-fullstack/files/jest.config copy.js

@@ -0,0 +1,27 @@
+const merge = require('merge')
+const baseConfig = require('./jest.config.base');
+const mongodbConfig = require('./jest.config.mongodb')
+module.exports = merge.recursive(
+    baseConfig,
+    mongodbConfig,
+    {
+        globals: {
+
+        }
+    }, {
+    moduleDirectories: [
+        "node_modules",
+        "packages/adminide-core",
+    ],
+}
+    // https://baltuta.eu/posts/typescript-lerna-monorepo-more-tools 
+    // {
+    //     roots: ['<rootDir>'],
+    //     projects: [
+    //         '<rootDir>/packages/ui',
+    //         '<rootDir>/packages/api',
+    //         '<rootDir>/packages/diceroll'
+    //     ],
+    // }
+
+);

package/lib/generators/add-fullstack/files/tools/deploy-cli/updateYamlSettings.js

@@ -3,6 +3,9 @@ const fs = require('fs');
 
 // Function to update the configuration file
 function updateConfiguration(filePath, newVersion) {
+    // Convert the version from vMajor.Minor to vMajor-Minor for URL
+    const versionForUrl = newVersion.replace('.', '-');
+
     // Read the configuration file
     fs.readFile(filePath, 'utf8', (err, data) => {
         if (err) {
@@ -10,24 +13,20 @@ function updateConfiguration(filePath, newVersion) {
             return;
         }
 
-        // Replace VERSION and CONNECTION_ID with newVersion
+        // Replace only the specific VERSION and CONNECTION_ID fields, preserving leading whitespace
         let updatedData = data
-            .replace(/VERSION: v\d+(\.\d+)?/g, `VERSION: ${newVersion}`)
-            .replace(/CONNECTION_ID: v\d+(\.\d+)?/g, `CONNECTION_ID: ${newVersion}`);
+            .replace(/^(\s*)VERSION:\s*v\d+(\.\d+)?/gm, `$1VERSION: ${newVersion}`)
+            .replace(/^(\s*)CONNECTION_ID:\s*v\d+(\.\d+)?/gm, `$1CONNECTION_ID: ${newVersion}`);
 
-        // Update CLIENT_URL
+        // Update CLIENT_URL, preserving leading whitespace, and replacing the version with the hyphenated version
         updatedData = updatedData.replace(
-            /CLIENT_URL: "https:\/\/[\w-]+-v\d+(\.\d+)?\.[\w-]+(\.\w+)?\/?"/g,
-            (match) => {
-                const domainParts = match.match(/https:\/\/[\w-]+-v\d+(\.\d+)?(\.[\w-]+)+/g);
-                if (domainParts && domainParts.length > 0) {
-                    const domain = domainParts[0];
-                    const newDomain = domain.replace(/-v\d+(\.\d+)?/, `-${newVersion}`);
-                    return match.replace(domain, newDomain);
-                }
-                return match;
+            /^(\s*)CLIENT_URL:\s*"https:\/\/([\w-]+)-v\d+(-\d+)?(\.[\w-]+(\.\w+)?)\/?"/gm,
+            (match, p1, p2, p3, p4) => {
+                const newDomain = `${p2}-${versionForUrl}${p4}`;
+                return `${p1}CLIENT_URL: "https://${newDomain}"`;
             },
         );
+
         // Write the updated configuration back to the file
         fs.writeFile(filePath, updatedData, 'utf8', (err) => {
             if (err) {
@@ -35,7 +34,7 @@ function updateConfiguration(filePath, newVersion) {
                 return;
             }
             console.log(`Configuration file updated successfully.`);
-            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`)
+            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`);
         });
     });
 }
@@ -45,7 +44,7 @@ const filePath = process.argv[2];
 const versionArg = process.argv[3];
 
 if (!filePath || !versionArg || !versionArg.match(/^v\d+(\.\d+)?$/)) {
-    console.error('Usage: node updateConfiguration.js v[Major].[Minor]');
+    console.error('Usage: node updateConfiguration.js <path-to-config> v[Major].[Minor]');
     process.exit(1);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.2-alpha.6",
+    "version": "6.0.2-alpha.7",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "835ce01a9673173684b1e890c4256c1118054433"
+    "gitHead": "38f2f3a7c7ea7574e36d31ce9e4cb71920cfb520"
 }

package/src/generators/add-fullstack/files/tools/deploy-cli/updateYamlSettings.js

@@ -3,6 +3,9 @@ const fs = require('fs');
 
 // Function to update the configuration file
 function updateConfiguration(filePath, newVersion) {
+    // Convert the version from vMajor.Minor to vMajor-Minor for URL
+    const versionForUrl = newVersion.replace('.', '-');
+
     // Read the configuration file
     fs.readFile(filePath, 'utf8', (err, data) => {
         if (err) {
@@ -10,24 +13,20 @@ function updateConfiguration(filePath, newVersion) {
             return;
         }
 
-        // Replace VERSION and CONNECTION_ID with newVersion
+        // Replace only the specific VERSION and CONNECTION_ID fields, preserving leading whitespace
         let updatedData = data
-            .replace(/VERSION: v\d+(\.\d+)?/g, `VERSION: ${newVersion}`)
-            .replace(/CONNECTION_ID: v\d+(\.\d+)?/g, `CONNECTION_ID: ${newVersion}`);
+            .replace(/^(\s*)VERSION:\s*v\d+(\.\d+)?/gm, `$1VERSION: ${newVersion}`)
+            .replace(/^(\s*)CONNECTION_ID:\s*v\d+(\.\d+)?/gm, `$1CONNECTION_ID: ${newVersion}`);
 
-        // Update CLIENT_URL
+        // Update CLIENT_URL, preserving leading whitespace, and replacing the version with the hyphenated version
         updatedData = updatedData.replace(
-            /CLIENT_URL: "https:\/\/[\w-]+-v\d+(\.\d+)?\.[\w-]+(\.\w+)?\/?"/g,
-            (match) => {
-                const domainParts = match.match(/https:\/\/[\w-]+-v\d+(\.\d+)?(\.[\w-]+)+/g);
-                if (domainParts && domainParts.length > 0) {
-                    const domain = domainParts[0];
-                    const newDomain = domain.replace(/-v\d+(\.\d+)?/, `-${newVersion}`);
-                    return match.replace(domain, newDomain);
-                }
-                return match;
+            /^(\s*)CLIENT_URL:\s*"https:\/\/([\w-]+)-v\d+(-\d+)?(\.[\w-]+(\.\w+)?)\/?"/gm,
+            (match, p1, p2, p3, p4) => {
+                const newDomain = `${p2}-${versionForUrl}${p4}`;
+                return `${p1}CLIENT_URL: "https://${newDomain}"`;
             },
         );
+
         // Write the updated configuration back to the file
         fs.writeFile(filePath, updatedData, 'utf8', (err) => {
             if (err) {
@@ -35,7 +34,7 @@ function updateConfiguration(filePath, newVersion) {
                 return;
             }
             console.log(`Configuration file updated successfully.`);
-            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`)
+            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`);
         });
     });
 }
@@ -45,7 +44,7 @@ const filePath = process.argv[2];
 const versionArg = process.argv[3];
 
 if (!filePath || !versionArg || !versionArg.match(/^v\d+(\.\d+)?$/)) {
-    console.error('Usage: node updateConfiguration.js v[Major].[Minor]');
+    console.error('Usage: node updateConfiguration.js <path-to-config> v[Major].[Minor]');
     process.exit(1);
 }