@common-stack/generate-plugin 6.0.2-alpha.1 → 6.0.2-alpha.10

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/lib/generators/add-fullstack/files/tools/sortPackageJson.mjs

@@ -11,23 +11,28 @@ const sortPackageJson = await import('sort-package-json').then(module => module.
 
 // Directories to process
 const directories = [
+  path.join(__dirname, '../'),
+  path.join(__dirname, '../packages-modules'),
   path.join(__dirname, '../packages'),
   path.join(__dirname, '../servers'),
   path.join(__dirname, '../portable-devices')
 ];
 
+// Function to sort a single package.json file
 async function sortPackageJsonFile(filePath) {
   const packageJson = JSON.parse(await fsPromises.readFile(filePath, 'utf8'));
   const sortedPackageJson = sortPackageJson(packageJson);
   await fsPromises.writeFile(filePath, JSON.stringify(sortedPackageJson, null, 2) + '\n');
 }
 
+// Recursive function to sort all package.json files in a directory, skipping node_modules
 async function sortAllPackageJsonFiles(dir) {
   const files = await fsPromises.readdir(dir);
   for (const file of files) {
     const fullPath = path.join(dir, file);
     const stat = await fsPromises.lstat(fullPath);
-    if (stat.isDirectory()) {
+    
+    if (stat.isDirectory() && file !== 'node_modules') {
       await sortAllPackageJsonFiles(fullPath);
     } else if (file === 'package.json') {
       await sortPackageJsonFile(fullPath);
@@ -36,10 +41,12 @@ async function sortAllPackageJsonFiles(dir) {
   }
 }
 
+// Function to process all directories
 async function processDirectories(dirs) {
   for (const dir of dirs) {
     await sortAllPackageJsonFiles(dir);
   }
 }
 
+// Execute the sorting process
 await processDirectories(directories);

package/lib/generators/add-fullstack/generator.cjs

@@ -1,24 +1,21 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),index=require('../../utils/index.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$5=require('../add-browser-package/generator.cjs'),generator$4=require('../add-client-package/generator.cjs'),generator$6=require('../add-core-package/generator.cjs'),generator$3=require('../add-server-package/generator.cjs');require('../../executors/update-deploy-version/executor.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function addFullstackGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),fs=require('fs'),index=require('../../utils/index.cjs'),jenkinsfileUpdate=require('./updates/jenkinsfileUpdate.cjs'),packageJsonUpdate=require('./updates/packageJsonUpdate.cjs'),generator$2=require('../add-frontend/generator.cjs'),generator$1=require('../add-backend/generator.cjs'),generator=require('../add-moleculer/generator.cjs'),generator$5=require('../add-browser-package/generator.cjs'),generator$4=require('../add-client-package/generator.cjs'),generator$6=require('../add-core-package/generator.cjs'),generator$3=require('../add-server-package/generator.cjs');require('../../executors/update-deploy-version/executor.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);var fs__namespace=/*#__PURE__*/_interopNamespaceDefault(fs);function addFullstackGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         var _a;
-        const projectRoot = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
-        // addProjectConfiguration(tree, projectRoot, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
+        const basePath = options.path || '';
+        const projectRoot = path__namespace.join(basePath, (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        console.log(`basePath: ${basePath}`);
         devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
-        devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectRoot;
-            return packageJson;
-        });
+        // Update Jenkinsfile with dynamic values
+        const jenkinsFilePath = path__namespace.join(projectRoot, 'Jenkinsfile');
+        jenkinsfileUpdate.updateJenkinsFile(jenkinsFilePath, options.name);
+        // Update package.json with the project name
+        packageJsonUpdate.updatePackageJson(tree, projectRoot, index.getValid(options.name));
         yield devkit.formatFiles(tree);
         if (index.isValid(options.config)) {
-            const configPath = index.getValid(options.config);
-            if (fs.existsSync(configPath)) {
+            const configPath = path__namespace.resolve(basePath, index.getValid(options.config));
+            if (fs__namespace.existsSync(configPath)) {
                 try {
-                    const content = String(fs.readFileSync(configPath));
+                    const content = String(fs__namespace.readFileSync(configPath));
                     const configs = JSON.parse(content);
                     configs.parent = projectRoot;
                     yield processConfigs(tree, configs);
@@ -30,19 +27,11 @@
         }
     });
 }
-const processConfigs = (tree, configs) => tslib.__awaiter(void 0, void 0, void 0, function* () {
-    if (configs.servers) {
-        yield generateServers(tree, configs.parent, configs.servers);
-    }
-    if (configs.packages && configs.packages.modules) {
-        yield generatePackages(tree, configs.parent, configs.packages.modules);
-    }
-});
 const generateServers = (tree, parent, servers) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     for (const [serverName, serverConfig] of Object.entries(servers)) {
         const configs = serverConfig;
         configs.name = serverName;
-        configs.directory = `${parent}/servers`;
+        configs.directory = path__namespace.join(parent, 'servers');
         switch (configs === null || configs === void 0 ? void 0 : configs.type) {
             case 'frontend':
                 yield generator$2.generateFrontend(tree, configs);
@@ -60,7 +49,7 @@ const generatePackages = (tree, parent, packages) => tslib.__awaiter(void 0, voi
     for (const [packageName, packageConfig] of Object.entries(packages)) {
         const configs = packageConfig;
         configs.name = packageName;
-        configs.directory = `${parent}/packages`;
+        configs.directory = path__namespace.join(parent, 'packages');
         switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
             case 'packages-core':
                 yield generator$6.generateCorePackage(tree, configs);
@@ -76,4 +65,12 @@ const generatePackages = (tree, parent, packages) => tslib.__awaiter(void 0, voi
                 break;
         }
     }
+});
+const processConfigs = (tree, configs) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+    if (configs.servers) {
+        yield generateServers(tree, configs.parent, configs.servers);
+    }
+    if (configs.packages && configs.packages.modules) {
+        yield generatePackages(tree, configs.parent, configs.packages.modules);
+    }
 });exports.addFullstackGenerator=addFullstackGenerator;exports.default=addFullstackGenerator;//# sourceMappingURL=generator.cjs.map

package/lib/generators/add-fullstack/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["getValid","generateFiles","path","updateJson","formatFiles","isValid","__awaiter","generateFrontend","generateBackend","generateMoleculer","generateCorePackage","generateBrowserPackage","generateClientPackage","generateServerPackage"],"mappings":"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"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":["path","getValid","generateFiles","updateJenkinsFile","updatePackageJson","formatFiles","isValid","fs","__awaiter","generateFrontend","generateBackend","generateMoleculer","generateCorePackage","generateBrowserPackage","generateClientPackage","generateServerPackage"],"mappings":"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"}

package/lib/generators/add-fullstack/generator.mjs

@@ -1,21 +1,18 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import fs from'fs';import {getValid,isValid}from'../../utils/index.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generateBrowserPackage}from'../add-browser-package/generator.mjs';import {generateClientPackage}from'../add-client-package/generator.mjs';import {generateCorePackage}from'../add-core-package/generator.mjs';import {generateServerPackage}from'../add-server-package/generator.mjs';import'../../executors/update-deploy-version/executor.mjs';function addFullstackGenerator(tree, options) {
+import {__awaiter}from'tslib';import {generateFiles,formatFiles}from'@nx/devkit';import*as path from'path';import*as fs from'fs';import {getValid,isValid}from'../../utils/index.mjs';import {updateJenkinsFile}from'./updates/jenkinsfileUpdate.mjs';import {updatePackageJson}from'./updates/packageJsonUpdate.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generateBrowserPackage}from'../add-browser-package/generator.mjs';import {generateClientPackage}from'../add-client-package/generator.mjs';import {generateCorePackage}from'../add-core-package/generator.mjs';import {generateServerPackage}from'../add-server-package/generator.mjs';import'../../executors/update-deploy-version/executor.mjs';function addFullstackGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const projectRoot = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
-        // addProjectConfiguration(tree, projectRoot, {
-        //     root: projectRoot,
-        //     projectType: 'library',
-        //     sourceRoot: `${projectRoot}/src`,
-        //     targets: {},
-        // });
+        const basePath = options.path || '';
+        const projectRoot = path.join(basePath, (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro');
+        console.log(`basePath: ${basePath}`);
         generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
-        updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-            packageJson['name'] = projectRoot;
-            return packageJson;
-        });
+        // Update Jenkinsfile with dynamic values
+        const jenkinsFilePath = path.join(projectRoot, 'Jenkinsfile');
+        updateJenkinsFile(jenkinsFilePath, options.name);
+        // Update package.json with the project name
+        updatePackageJson(tree, projectRoot, getValid(options.name));
         yield formatFiles(tree);
         if (isValid(options.config)) {
-            const configPath = getValid(options.config);
+            const configPath = path.resolve(basePath, getValid(options.config));
             if (fs.existsSync(configPath)) {
                 try {
                     const content = String(fs.readFileSync(configPath));
@@ -30,19 +27,11 @@ import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'
         }
     });
 }
-const processConfigs = (tree, configs) => __awaiter(void 0, void 0, void 0, function* () {
-    if (configs.servers) {
-        yield generateServers(tree, configs.parent, configs.servers);
-    }
-    if (configs.packages && configs.packages.modules) {
-        yield generatePackages(tree, configs.parent, configs.packages.modules);
-    }
-});
 const generateServers = (tree, parent, servers) => __awaiter(void 0, void 0, void 0, function* () {
     for (const [serverName, serverConfig] of Object.entries(servers)) {
         const configs = serverConfig;
         configs.name = serverName;
-        configs.directory = `${parent}/servers`;
+        configs.directory = path.join(parent, 'servers');
         switch (configs === null || configs === void 0 ? void 0 : configs.type) {
             case 'frontend':
                 yield generateFrontend(tree, configs);
@@ -60,7 +49,7 @@ const generatePackages = (tree, parent, packages) => __awaiter(void 0, void 0, v
     for (const [packageName, packageConfig] of Object.entries(packages)) {
         const configs = packageConfig;
         configs.name = packageName;
-        configs.directory = `${parent}/packages`;
+        configs.directory = path.join(parent, 'packages');
         switch (packageConfig === null || packageConfig === void 0 ? void 0 : packageConfig.type) {
             case 'packages-core':
                 yield generateCorePackage(tree, configs);
@@ -76,4 +65,12 @@ const generatePackages = (tree, parent, packages) => __awaiter(void 0, void 0, v
                 break;
         }
     }
+});
+const processConfigs = (tree, configs) => __awaiter(void 0, void 0, void 0, function* () {
+    if (configs.servers) {
+        yield generateServers(tree, configs.parent, configs.servers);
+    }
+    if (configs.packages && configs.packages.modules) {
+        yield generatePackages(tree, configs.parent, configs.packages.modules);
+    }
 });export{addFullstackGenerator,addFullstackGenerator as default};//# sourceMappingURL=generator.mjs.map

package/lib/generators/add-fullstack/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/generators/add-fullstack/schema.json

@@ -12,6 +12,11 @@
         "config": {
             "type": "string",
             "description": "The absolute path of config file"
+        },
+        "path": {
+            "type": "string",
+            "description": "The base path where the project will be created or updated",
+            "x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
         }
     },
     "required": ["name"]

package/lib/generators/add-fullstack/updates/index.d.ts

@@ -0,0 +1,2 @@
+export * from './jenkinsfileUpdate';
+export * from './packageJsonUpdate';

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.cjs

@@ -0,0 +1,36 @@
+'use strict';var fs=require('fs');function updateJenkinsFile(filePath, name) {
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+    let jenkinsFileContent = '';
+    if (fs.existsSync(filePath)) {
+        jenkinsFileContent = fs.readFileSync(filePath, 'utf-8');
+    }
+    let labelExists = false;
+    const updatedContent = jenkinsFileContent.split('\n').map(line => {
+        // Check if the label is already defined and skip modifying it
+        if (line.includes('label') && line.includes('kubernetes')) {
+            labelExists = true;
+        }
+        // Update only the specified parameters
+        for (const param in paramsToUpdate) {
+            if (line.includes(`string(name: '${param}'`)) {
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+            }
+        }
+        return line;
+    }).join('\n');
+    // Add missing parameters if they don't exist
+    Object.keys(paramsToUpdate).forEach(param => {
+        if (!updatedContent.includes(`string(name: '${param}'`)) {
+            updatedContent.concat(`string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`);
+        }
+    });
+    // Only write back to the file if we have made changes
+    if (!labelExists || Object.keys(paramsToUpdate).some(param => !updatedContent.includes(`string(name: '${param}'`))) {
+        fs.writeFileSync(filePath, updatedContent, 'utf-8');
+    }
+}exports.updateJenkinsFile=updateJenkinsFile;//# sourceMappingURL=jenkinsfileUpdate.cjs.map

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"jenkinsfileUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/jenkinsfileUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"kCAGgB,SAAA,iBAAiB,CAAC,QAAgB,EAAE,IAAY,EAAA;AAC5D,IAAA,MAAM,cAAc,GAAG;AACnB,QAAA,cAAc,EAAE,IAAI;AACpB,QAAA,aAAa,EAAE,IAAI;AACnB,QAAA,YAAY,EAAE,IAAI;AAClB,QAAA,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAC5B,IAAA,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QACzB,kBAAkB,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,IAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;;AAE7D,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvD,WAAW,GAAG,IAAI,CAAC;SACtB;;AAGD,QAAA,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;YAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;AAC1C,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,cAAc,CAAC,KAAK,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACzF;SACJ;AACD,QAAA,OAAO,IAAI,CAAC;AAChB,KAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;IAGd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;QACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;YACrD,cAAc,CAAC,MAAM,CACjB,CAAiB,cAAA,EAAA,KAAK,qBAAqB,cAAc,CAAC,KAAK,CAAC,CAAoB,iBAAA,EAAA,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAM,IAAA,CAAA,CACnI,CAAC;SACL;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAiB,cAAA,EAAA,KAAK,CAAG,CAAA,CAAA,CAAC,CAAC,EAAE;QAChH,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;KACvD;AACL"}

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.d.ts

@@ -0,0 +1 @@
+export declare function updateJenkinsFile(filePath: string, name: string): void;

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.mjs

@@ -0,0 +1,36 @@
+import fs__default from'fs';function updateJenkinsFile(filePath, name) {
+    const paramsToUpdate = {
+        BASE_NAMESPACE: name,
+        CONNECTION_ID: name,
+        WORKSPACE_ID: name,
+        UNIQUE_NAME: name,
+    };
+    let jenkinsFileContent = '';
+    if (fs__default.existsSync(filePath)) {
+        jenkinsFileContent = fs__default.readFileSync(filePath, 'utf-8');
+    }
+    let labelExists = false;
+    const updatedContent = jenkinsFileContent.split('\n').map(line => {
+        // Check if the label is already defined and skip modifying it
+        if (line.includes('label') && line.includes('kubernetes')) {
+            labelExists = true;
+        }
+        // Update only the specified parameters
+        for (const param in paramsToUpdate) {
+            if (line.includes(`string(name: '${param}'`)) {
+                return line.replace(/defaultValue: '.*'/, `defaultValue: '${paramsToUpdate[param]}'`);
+            }
+        }
+        return line;
+    }).join('\n');
+    // Add missing parameters if they don't exist
+    Object.keys(paramsToUpdate).forEach(param => {
+        if (!updatedContent.includes(`string(name: '${param}'`)) {
+            updatedContent.concat(`string(name: '${param}', defaultValue: '${paramsToUpdate[param]}', description: '${param.replace(/_/g, ' ').toLowerCase()}')\n`);
+        }
+    });
+    // Only write back to the file if we have made changes
+    if (!labelExists || Object.keys(paramsToUpdate).some(param => !updatedContent.includes(`string(name: '${param}'`))) {
+        fs__default.writeFileSync(filePath, updatedContent, 'utf-8');
+    }
+}export{updateJenkinsFile};//# sourceMappingURL=jenkinsfileUpdate.mjs.map

package/lib/generators/add-fullstack/updates/jenkinsfileUpdate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"jenkinsfileUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/jenkinsfileUpdate.ts"],"sourcesContent":[null],"names":["fs"],"mappings":"4BAGgB,SAAA,iBAAiB,CAAC,QAAgB,EAAE,IAAY,EAAA;AAC5D,IAAA,MAAM,cAAc,GAAG;AACnB,QAAA,cAAc,EAAE,IAAI;AACpB,QAAA,aAAa,EAAE,IAAI;AACnB,QAAA,YAAY,EAAE,IAAI;AAClB,QAAA,WAAW,EAAE,IAAI;KACpB,CAAC;IAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;AAC5B,IAAA,IAAIA,WAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QACzB,kBAAkB,GAAGA,WAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC3D;IAED,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB,IAAA,MAAM,cAAc,GAAG,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,IAAG;;AAE7D,QAAA,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;YACvD,WAAW,GAAG,IAAI,CAAC;SACtB;;AAGD,QAAA,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE;YAChC,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;AAC1C,gBAAA,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAkB,eAAA,EAAA,cAAc,CAAC,KAAK,CAAC,CAAA,CAAA,CAAG,CAAC,CAAC;aACzF;SACJ;AACD,QAAA,OAAO,IAAI,CAAC;AAChB,KAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;;IAGd,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,IAAG;QACxC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAA,CAAA,CAAG,CAAC,EAAE;YACrD,cAAc,CAAC,MAAM,CACjB,CAAiB,cAAA,EAAA,KAAK,qBAAqB,cAAc,CAAC,KAAK,CAAC,CAAoB,iBAAA,EAAA,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAM,IAAA,CAAA,CACnI,CAAC;SACL;AACL,KAAC,CAAC,CAAC;;IAGH,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAiB,cAAA,EAAA,KAAK,CAAG,CAAA,CAAA,CAAC,CAAC,EAAE;QAChHA,WAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;KACvD;AACL"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs

@@ -0,0 +1,8 @@
+'use strict';var devkit=require('@nx/devkit'),path=require('path');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);function updatePackageJson(tree, projectRoot, name) {
+    const packageJsonPath = path__namespace.join(projectRoot, 'package.json');
+    devkit.updateJson(tree, packageJsonPath, (packageJson) => {
+        packageJson['name'] = name;
+        // You can add more custom logic here if needed
+        return packageJson;
+    });
+}exports.updatePackageJson=updatePackageJson;//# sourceMappingURL=packageJsonUpdate.cjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageJsonUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":["path","updateJson"],"mappings":"0aAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAY,EAAA;IAC3E,MAAM,eAAe,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC/DC,iBAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAW,KAAI;AAC9C,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;;AAE3B,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-fullstack/updates/packageJsonUpdate.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function updatePackageJson(tree: Tree, projectRoot: string, name: string): void;

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs

@@ -0,0 +1,8 @@
+import {updateJson}from'@nx/devkit';import*as path from'path';function updatePackageJson(tree, projectRoot, name) {
+    const packageJsonPath = path.join(projectRoot, 'package.json');
+    updateJson(tree, packageJsonPath, (packageJson) => {
+        packageJson['name'] = name;
+        // You can add more custom logic here if needed
+        return packageJson;
+    });
+}export{updatePackageJson};//# sourceMappingURL=packageJsonUpdate.mjs.map

package/lib/generators/add-fullstack/updates/packageJsonUpdate.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageJsonUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/packageJsonUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"uEAGgB,iBAAiB,CAAC,IAAU,EAAE,WAAmB,EAAE,IAAY,EAAA;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC/D,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,CAAC,WAAW,KAAI;AAC9C,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;;AAE3B,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACP"}

package/lib/generators/add-moleculer/files/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.20-alpine
+FROM node:20:16-alpine
 
 # Copy package.json only to temp folder, install its dependencies,
 # set workdir and copy the dependnecies there

package/lib/generators/add-moleculer/files/package.json

@@ -25,33 +25,14 @@
         "watch": "npm run start:dev"
     },
     "dependencies": {
-        "@casl/ability": "^4.1.5",
-        "@cdm-logger/client": "^9.0.3",
-        "@cdm-logger/server": "^9.0.3",
-        "@common-stack/client-core": "6.0.1-alpha.0",
-        "@common-stack/core": "6.0.1-alpha.0",
-        "@common-stack/server-core": "6.0.1-alpha.0",
-        "@common-stack/server-stack": "6.0.1-alpha.0",
-        "@common-stack/store-mongo": "6.0.1-alpha.0",
+        "@common-stack/client-core": "6.0.2-alpha.2",
+        "@common-stack/core": "6.0.2-alpha.2",
+        "@common-stack/server-core": "6.0.2-alpha.2",
+        "@common-stack/server-stack": "6.0.2-alpha.2",
+        "@common-stack/store-mongo": "6.0.2-alpha.2",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
-        "app-root-path": "^3.0.0",
-        "body-parser": "^1.19.0",
-        "cors": "^2.8.5",
-        "dataloader": "^2.0.0",
-        "dotenv": "^7.0.0",
-        "envalid": "~7.2.2",
-        "esm": "^3.2.25",
-        "graphql-tools": "^9.0.0",
         "helmet": "^3.21.2",
-        "inversify": "^6.0.2",
-        "ioredis": "^4.14.1",
-        "lodash": "^4.17.15",
-        "moleculer": "^0.14.2",
-        "mongoose": "^6.3.3",
-        "mongoose-execution-time": "^1.1.0",
-        "react": "18.0.0",
-        "redux": "^4.0.1",
-        "reflect-metadata": "^0.1.13",
+        "react": "18.2.0",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3"
     },

package/lib/generators/add-server-package/files/package.json

@@ -62,9 +62,9 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@cdm-logger/server": ">=9.0.3",
-        "@common-stack/core": "6.0.1-alpha.0",
-        "@common-stack/server-core": "6.0.1-alpha.0",
-        "@common-stack/store-mongo": "6.0.1-alpha.0",
+        "@common-stack/core": "6.0.2-alpha.2",
+        "@common-stack/server-core": "6.0.2-alpha.2",
+        "@common-stack/store-mongo": "6.0.2-alpha.2",
         "@container-stack/mailing-api": ">=0.0.35-alpha.1",
         "@vscode-alt/monaco-editor": "^0.21.4",
         "inversify": "^5.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.2-alpha.1",
+    "version": "6.0.2-alpha.10",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -17,7 +17,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "6.0.2-alpha.1",
+        "@common-stack/rollup-vite-utils": "6.0.2-alpha.2",
         "@nx/devkit": "19.5.1",
         "tslib": "^2.3.0"
     },
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "c13fa6b22a45926ce70f69b5d1215bad58bf40bb"
+    "gitHead": "221a1452444ac422b694b7e3225e529fe513a6e3"
 }

package/src/generators/add-frontend/frameworks/chakraui/entry.client.tsx.template

@@ -1,4 +1,4 @@
-import React, { useState, startTransition, StrictMode } from 'react';
+import React, { useState, startTransition, StrictMode, useMemo, createContext, useContext } from 'react';
 import 'reflect-metadata';
 import { RemixBrowser } from '@remix-run/react';
 import { hydrateRoot } from 'react-dom/client';
@@ -27,7 +27,8 @@ import Backend from 'i18next-http-backend';
 import { getInitialNamespaces } from 'remix-i18next/client';
 import config from '@app/cde-webconfig.json';
 // @ts-ignore
-import { ClientStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
+// import { ClientStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
+import { ClientStyleContext } from './context';
 
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
@@ -40,16 +41,21 @@ interface ClientCacheProviderProps {
     children: React.ReactNode;
 }
 
+export function useClientStyleContext() {
+    return useContext(ClientStyleContext);
+}
+
 function ClientCacheProvider({ children }: ClientCacheProviderProps) {
-    const [cache, setCache] = useState(defaultCache);
+    const [count, setCount] = useState(0);
+    const defaultCache = useMemo(() => createEmotionCache(), [count]);
 
-    function reset() {
-        setCache(createEmotionCache());
-    }
+    const reset = () => {
+        setCount((prev) => prev + 1);
+    };
 
     return (
         <ClientStyleContext.Provider value={{ reset }}>
-            <CacheProvider value={cache}>{children}</CacheProvider>
+            <CacheProvider value={defaultCache}>{children}</CacheProvider>
         </ClientStyleContext.Provider>
     );
 }
@@ -75,23 +81,23 @@ async function hydrate() {
     }
     hydrateRoot(
         document.getElementById('root')!,
-        <StrictMode>
-            <I18nextProvider i18n={i18next}>
-                <ClientCacheProvider>
-                    <ApolloProvider client={client}>
-                        <ReduxProvider store={store}>
-                            <SlotFillProvider>
-                                <InversifyProvider container={container} modules={clientModules}>
-                                    <PersistGate loading={null} persistor={persistor}>
-                                        {() => <RemixBrowser />}
-                                    </PersistGate>
-                                </InversifyProvider>
-                            </SlotFillProvider>
-                        </ReduxProvider>
-                    </ApolloProvider>
-                </ClientCacheProvider>
-            </I18nextProvider>
-        </StrictMode>,
+        // <StrictMode>
+        <I18nextProvider i18n={i18next}>
+            <ClientCacheProvider>
+                <ApolloProvider client={client}>
+                    <ReduxProvider store={store}>
+                        <SlotFillProvider>
+                            <InversifyProvider container={container} modules={clientModules}>
+                                <PersistGate loading={null} persistor={persistor}>
+                                    {() => <RemixBrowser />}
+                                </PersistGate>
+                            </InversifyProvider>
+                        </SlotFillProvider>
+                    </ReduxProvider>
+                </ApolloProvider>
+            </ClientCacheProvider>
+        </I18nextProvider>,
+        // </StrictMode>,
     );
     // });
 }