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

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

@@ -36,8 +36,10 @@ import config from '@app/cde-webconfig.json';
 
 import { Head } from './root';
 import type { IAppLoadContext } from '@common-stack/client-core';
-import { ServerStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
+// import { ServerStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
+import { ServerStyleContext } from './context';
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
+
 const { extractCriticalToChunks } = createEmotionServer(defaultCache);
 
 const ABORT_DELAY = 5000;
@@ -124,12 +126,7 @@ async function handleBrowserRequest(
     // And here we detect what namespaces the routes about to render want to use
     const ns = i18next.getRouteNamespaces(remixContext);
     const slotFillContext = { fills: {} };
-    const {
-        modules: clientModules,
-        container,
-        apolloClient: client,
-        store,
-    }: IAppLoadContext = loadContext;
+    const { modules: clientModules, container, apolloClient: client, store }: IAppLoadContext = loadContext;
 
     // First, we create a new instance of i18next so every request will have a
     // completely unique instance and not share any state.
@@ -145,7 +142,7 @@ async function handleBrowserRequest(
                 lng, // The locale we detected above
                 ns, // The namespaces the routes about to render want to use
                 backend: {
-                    loadPath: resolve(config.i18n.backend.loadServerPath),
+                    loadPath: config.i18n.backend.loadServerPath,
                 },
             });
     }

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

@@ -79,8 +79,8 @@ export function shouldRevalidate(params: any) {
 }
 
 export default function App() {
-    let { locale } = useLoaderData();
-
+    // const { locale } = useLoaderData();
+    const locale = 'en';
     useChangeLanguage(locale);
 
     React.useEffect(() => {
@@ -94,4 +94,4 @@ export default function App() {
     );
 }
 
-export { ErrorBoundary };
+export { ErrorBoundary };

package/src/generators/add-fullstack/files/Jenkinsfile

@@ -30,7 +30,7 @@ pipeline {
     choice choices: ['auto', 'force'], description: 'Choose merge strategy', name: 'NPM_PUBLISH_STRATEGY'
     choice choices: ['yarn', 'npm'], description: 'Choose build strategy', name: 'BUILD_STRATEGY'
     choice choices: ['0.7.9','0.7.7', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
-    choice choices: ['nodejs18', 'nodejs16', 'nodejs14'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'    
+    choice choices: ['nodejs20', 'nodejs18', 'nodejs22'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'    
     choice choices: ['buildOnly', 'buildAndTest', 'buildAndPublish',  'mobileBuild', 'mobilePreview', 'mobilePreviewLocal', 'mobilePreviewSubmit', 'mobileProd', 'mobileProdSubmit', 'devDeployOnly', 'stageDeploy', 'stageDeployOnly', 'prodDeploy', 'prodDeployOnly', 'allenv'], description: 'Where to deploy micro services?', name: 'ENV_CHOICE'
     choice choices: ['all', 'ios', 'android' ], description: 'Mobile type if it is mobile build?', name: 'MOBILE_CHOICE'
     booleanParam (defaultValue: false, description: 'Skip production release approval', name: 'SKIP_RELEASE_APPROVAL')
@@ -38,7 +38,7 @@ pipeline {
     string(name: 'BUILD_TIME_OUT', defaultValue: '120', description: 'Build timeout in minutes', trim: true)
   }
 
- // Setup common + secret key variables for pipeline.
+  // Setup common + secret key variables for pipeline.
   environment {
     BUILD_COMMAND = getBuildCommand()
     NAMESPACE = "${params.BASE_NAMESPACE}-${params.VERSION}"
@@ -86,7 +86,6 @@ pipeline {
         sh """
           echo "what is docker git version $GIT_BRANCH_NAME -- ${params.ENV_CHOICE}"
           ${params.BUILD_STRATEGY} install
-          ${params.BUILD_STRATEGY} run lerna
         """
       }
     }
@@ -99,7 +98,7 @@ pipeline {
         sshagent(credentials: [params.GIT_CREDENTIAL_ID]) {
           sh """
             rm .npmrc
-            lerna exec --scope=*mobile-device ${params.BUILD_STRATEGY} ${env.BUILD_COMMAND}
+            npx lerna exec --scope=*mobile-device ${params.BUILD_STRATEGY} ${env.BUILD_COMMAND}
             git checkout -- .npmrc
             yarn gitcommit
             git pull origin ${params.REPOSITORY_BRANCH}
@@ -145,7 +144,6 @@ pipeline {
           git merge ${env.GIT_PR_BRANCH_NAME} -m 'auto merging ${params.GIT_PR_BRANCH_NAME} \r\n[skip ci]'
           git push origin ${params.DEVELOP_BRANCH}
           ${params.BUILD_STRATEGY} install
-          ${params.BUILD_STRATEGY} run lerna
           ${params.BUILD_STRATEGY} run build
         """
         script {
@@ -278,7 +276,6 @@ pipeline {
           git checkout ${params.REPOSITORY_BRANCH}
           git merge origin/${params.DEVELOP_BRANCH} -m 'auto merging ${params.DEVELOP_BRANCH} \r\n[skip ci]'
           ${params.BUILD_STRATEGY} install
-          ${params.BUILD_STRATEGY} run lerna
         """
         script {
           GIT_BRANCH_NAME = params.REPOSITORY_BRANCH
@@ -648,7 +645,7 @@ def buildAndPushDockerImage(server, name, version) {
     echo "Docker image ${REPOSITORY_SERVER}/${name}:${version} already exists. Skipping build."
   } else {
     sh """
-      lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run docker:${env.BUILD_COMMAND};
+      npx lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run docker:${env.BUILD_COMMAND};
       docker tag ${name}:${version} ${REPOSITORY_SERVER}/${name}:${version}
       docker push ${REPOSITORY_SERVER}/${name}:${version}
       docker rmi ${REPOSITORY_SERVER}/${name}:${version}

package/src/generators/add-fullstack/files/package.json

@@ -76,7 +76,7 @@
         "publish:forceManual": "yarn lernapublish --force-publish=*",
         "publish:push": "yarn prelernapublish && git push origin publish && yarn postlernapublish",
         "setBranchEnv": "cross-env REPOSITORY_BRANCH=${1:-$REPOSITORY_BRANCH} PUBLISH_BRANCH=${2:-$PUBLISH_BRANCH}",
-        "sort-packages": "node tools/sortPackageJson.mjs",
+        "sort-packages": "node tools/sortPackageJson.mjs && prettier --write package.json **/**/*/package.json **/*/package.json",
         "start": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env yarn startWeb",
         "start:SSR": "concurrently --names \"BACKEND,FRONTEND\" -c \"bgBlue.bold,bgMagenta.bold\" \"lerna run --scope='*backend-server' start\" \"lerna run --scope='*frontend-server' start:SSR\"",
         "start:devSSR": "concurrently --names \"BACKEND,FRONTEND\" -c \"bgBlue.bold,bgMagenta.bold\" \"lerna run --scope='*backend-server' watch\" \"lerna run --scope='*frontend-server' start:devSSR\"",
@@ -102,27 +102,15 @@
             "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
         }
     },
-    "lint-staged": {
-        "*.md": [
-            "yarn format:md",
-            "git add"
-        ],
-        "*.{js,jsx,ts,tsx}": [
-            "eslint --fix",
-            "git add"
-        ],
-        "package.json": "sort-package-json  --check package.json */**/package.json "
-    },
     "resolutions": {
         "@apollo/client": "^3.9.0",
         "@types/react": "^18.0.25",
         "@types/react-dom": "^18.0.8",
-        "chokidar": "^3.5.3",
         "html-to-text": "^8.0.0",
-        "react": "18.2.0",
-        "react-dom": "18.2.0",
-        "react-native": "0.71.14",
-        "react-native-gesture-handler": "~2.9.0"
+        "react": "18.3.0-canary-c3048aab4-20240326",
+        "react-dom": "18.3.0-canary-c3048aab4-20240326",
+        "react-native": "0.72.10",
+        "react-native-gesture-handler": "~2.12.0"
     },
     "dependencies": {
         "dataloader": "^2.1.0",
@@ -159,7 +147,7 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.1-alpha.0",
+        "@common-stack/env-list-loader": "6.0.2-alpha.2",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",

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);
 }
 

package/src/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/src/generators/add-fullstack/generator.ts

@@ -1,11 +1,14 @@
-import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable import/no-cycle */
+import { addProjectConfiguration, formatFiles, generateFiles, Tree } from '@nx/devkit';
 import * as path from 'path';
-import fs from 'fs';
+import * as fs from 'fs';
 import { AddFullstackGeneratorSchema } from './schema';
 import { getValid, isValid } from '../../utils';
-import { 
-    generateBackend, 
-    generateFrontend, 
+import { updateJenkinsFile, updatePackageJson } from './updates';
+import {
+    generateBackend,
+    generateFrontend,
     generateMoleculer,
     generateBrowserPackage,
     generateClientPackage,
@@ -14,22 +17,24 @@ import {
 } from '../../index';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
-    const projectRoot = getValid(options.name) ?? 'fullstack-pro';
-    // addProjectConfiguration(tree, projectRoot, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: `${projectRoot}/src`,
-    //     targets: {},
-    // });
+    const basePath = options.path || '';
+    const projectRoot = path.join(basePath, getValid(options.name) ?? '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));
+
     await 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));
@@ -37,30 +42,21 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
                 configs.parent = projectRoot;
 
                 await processConfigs(tree, configs);
-            } catch(error) {
+            } catch (error) {
                 console.error('Error while reading config.', error);
             }
         }
     }
 }
 
-const processConfigs = async (tree: Tree, configs: any) => {
-    if (configs.servers) {
-        await generateServers(tree, configs.parent, configs.servers);
-    }
-
-    if (configs.packages && configs.packages.modules) {
-        await generatePackages(tree, configs.parent, configs.packages.modules);
-    }
-}
 
 const generateServers = async (tree: Tree, parent: string, servers: any) => {
     for (const [serverName, serverConfig] of Object.entries(servers)) {
         const configs: any = serverConfig;
         configs.name = serverName;
-        configs.directory = `${parent}/servers`;
-        
-        switch(configs?.type) {
+        configs.directory = path.join(parent, 'servers');
+
+        switch (configs?.type) {
             case 'frontend':
                 await generateFrontend(tree, configs);
                 break;
@@ -74,15 +70,15 @@ const generateServers = async (tree: Tree, parent: string, servers: any) => {
                 break;
         }
     }
-}
+};
 
 const generatePackages = async (tree: Tree, parent: string, packages: any) => {
     for (const [packageName, packageConfig] of Object.entries(packages)) {
         const configs: any = packageConfig;
         configs.name = packageName;
-        configs.directory = `${parent}/packages`;
-        
-        switch((packageConfig as any)?.type) {
+        configs.directory = path.join(parent, 'packages');
+
+        switch ((packageConfig as any)?.type) {
             case 'packages-core':
                 await generateCorePackage(tree, configs);
                 break;
@@ -99,6 +95,16 @@ const generatePackages = async (tree: Tree, parent: string, packages: any) => {
                 break;
         }
     }
-}
+};
+
+const processConfigs = async (tree: Tree, configs: any) => {
+    if (configs.servers) {
+        await generateServers(tree, configs.parent, configs.servers);
+    }
+
+    if (configs.packages && configs.packages.modules) {
+        await generatePackages(tree, configs.parent, configs.packages.modules);
+    }
+};
 
 export default addFullstackGenerator;

package/src/generators/add-fullstack/schema.d.ts

@@ -1,4 +1,5 @@
 export interface AddFullstackGeneratorSchema {
     name: string;
     config?: string;
-}
+    path?: string;  // Optional path property for specifying the base path
+}

package/src/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/src/generators/add-fullstack/updates/index.ts

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

package/src/generators/add-fullstack/updates/jenkinsfileUpdate.ts

@@ -0,0 +1,47 @@
+import fs from 'fs';
+import * as path from 'path';
+
+export function updateJenkinsFile(filePath: string, name: string) {
+    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');
+    }
+}

package/src/generators/add-fullstack/updates/packageJsonUpdate.ts

@@ -0,0 +1,11 @@
+import { Tree, updateJson } from '@nx/devkit';
+import * as path from 'path';
+
+export function updatePackageJson(tree: Tree, projectRoot: string, name: string) {
+    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;
+    });
+}

package/src/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/src/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"
     },