@common-stack/generate-plugin 6.0.6-alpha.2 → 6.0.6-alpha.21

package/src/generators/add-backend/schema.json

@@ -7,12 +7,17 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
+        },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this backend server module?(optional)"
         }
     },
     "required": ["ns", "directory"]

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
 // @ts-ignore
 import publicEnv from '@src/config/public-config';
 import { PluginArea } from '@common-stack/client-react';
@@ -34,7 +34,7 @@ export function shouldRevalidate(params: any) {
 }
 
 export function Layout({ children }: { children: React.ReactNode }) {
-    const data = useLoaderData<{ locale: any}>();
+    const data = useRouteLoaderData<{ locale: any }>('root');
     const locale = data?.locale;
 
     const { i18n } = useTranslation();

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

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import * as React from 'react';
 
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData } from '@remix-run/react';
 import { json } from '@remix-run/node';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
@@ -79,8 +79,9 @@ export function shouldRevalidate(params: any) {
 }
 
 export default function App() {
-    // const { locale } = useLoaderData();
-    const locale = 'en';
+    const data = useRouteLoaderData<{ locale: any }>('root');
+    const locale = data?.locale;
+    
     useChangeLanguage(locale);
 
     React.useEffect(() => {

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
 import type { LinksFunction } from "@remix-run/node";
 // @ts-ignore
 import publicEnv from '@src/config/public-config';
@@ -36,7 +36,7 @@ export function shouldRevalidate(params: any) {
 }
 
 export function Layout({ children }: { children: React.ReactNode }) {
-    const data = useLoaderData<{ locale: any }>();
+    const data = useRouteLoaderData<{ locale: any }>('root');
     const locale = data?.locale;
 
     const { i18n } = useTranslation();

package/src/generators/add-frontend/generator.ts

@@ -4,20 +4,22 @@ import * as fs from 'node:fs';
 import { deepMerge } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';
 import { AddFrontendGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
-import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI, FRAMEWORK_TAILWINDUI } from '../../constants';
+import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI, FRAMEWORK_TAILWINDUI } from '../../common/constants';
 
 const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+const DEFAULT_SERVER_NAME = 'frontend-server';
 
 export async function addFrontendGenerator(tree: Tree, options: AddFrontendGeneratorSchema) {
-    const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+    const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
     const configs: any = {...options, name: projectName};
 
     return await generateFrontend(tree, configs);
 }
 
 export const generateFrontend = async (tree: Tree, options: any) => {
-    const projectName = getValid(options.name) ?? 'frontend-server';
+    let projectName = getValid(options.name) ?? DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
     
     const framework = getValid(options.framework) ?? DEFAULT_FRAMEWORK;
@@ -38,17 +40,20 @@ export const generateFrontend = async (tree: Tree, options: any) => {
         packageJson['name'] = projectName;
         if (framework === FRAMEWORK_ANTUI) {
             packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
-            packageJson['dependencies']["@ant-design/pro-layout"] = "^7.6.1";
             packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0"; 
+            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
             packageJson['dependencies']["antd"] = "^5.14.0";
         } else if (framework === FRAMEWORK_CHAKRAUI) {
-            packageJson['dependencies']["@admin-layout/chakra-design-pro"] = "latest";
-            packageJson['dependencies']["@admin-layout/chakra-ui"] = "latest";
-            packageJson['dependencies']["@adminide-stack/user-auth0-browser-chakra"] = "latest";
+            packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
+            packageJson['dependencies']["framer-motion"] = "^11.5.4"; 
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0"; 
             packageJson['dependencies']["@emotion/css"] = "^11.10.0";
             packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
+
         } else if (framework === FRAMEWORK_TAILWINDUI) {
             packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
             packageJson['devDependencies']["postcss"] = "^8.4.41";

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

@@ -2,4 +2,5 @@ export interface AddFrontendGeneratorSchema {
     ns: string;
     directory: string;
     framework?: string;
+    name?: string;
 }

package/src/generators/add-frontend/schema.json

@@ -7,18 +7,23 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
         },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this frontend server module?(optional)"
+        },
         "framework": {
             "type": "string",
             "description": "",
-            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?"
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?(default: antui)"
         }
     },
-    "required": ["ns", "directory", "framework"]
+    "required": ["ns", "directory"]
 }

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

@@ -13,23 +13,23 @@ pipeline {
     string(name: 'CONNECTION_ID', defaultValue: 'test', description: 'connection id', trim: true)
     string(name: 'WORKSPACE_ID', defaultValue: 'fullstack-pro', description: 'workspace id', trim: true)
     string(name: 'UNIQUE_NAME', defaultValue: 'default', description: 'chart name', trim: true)
-    string(name: 'VERSION', defaultValue: 'v3', description: 'version of the deployment', trim: true)
+    string(name: 'VERSION', defaultValue: 'v1', description: 'version of the deployment', trim: true)
     string(name: 'HEMERA_LOG_LEVEL', defaultValue: 'info', description: 'log level for hemera')
     string(name: 'LOG_LEVEL', defaultValue: 'info', description: 'log level')
     string(name: 'DEPLOYMENT_PATH', defaultValue: '/servers', description: 'folder path to load helm charts')
-    string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish3', description: 'the publish branch for packages release')
+    string(name: 'PUBLISH_BRANCH', defaultValue: 'devpublish', description: 'the publish branch for packages release')
     string(name: 'EXCLUDE_SETTING_NAMESPACE_FILTER', defaultValue: 'brigade', description: 'exclude setting namespace that matches search string')
     string(name: 'GIT_CREDENTIAL_ID', defaultValue: 'fullstack-pro-github-deploy-key', description: 'jenkins credential id of git deploy secret')
     string(name: 'BUILD_MODULE_TO_INCLUDE', defaultValue: '@sample-stack*', description: 'build env')
     string(name: 'REPOSITORY_SSH_URL', defaultValue: 'git@github.com:CDEBase/fullstack-pro.git', description: 'ssh url of the git repository')
-    string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop3', description: 'the branch with changes')
-    string(name: 'DEVELOP_BRANCH', defaultValue: 'develop3', description: 'the branch for the development')
+    string(name: 'REPOSITORY_BRANCH', defaultValue: 'develop', description: 'the branch with changes')
+    string(name: 'DEVELOP_BRANCH', defaultValue: 'develop', description: 'the branch for the development')
     string(name: 'MASTER_BRANCH', defaultValue: 'master', description: 'Master branch as default branch for production.')
 
     // by default first value of the choice will be choosen
     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: ['0.7.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_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'

package/src/generators/add-fullstack/files/LICENSE-IST

@@ -0,0 +1,39 @@
+The CDEBase Enterprise license (the “Enterprise License”)
+Copyright (c) 2018 cdebase LLC.
+
+With regard to the CDEBase Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have agreed to,
+and are in compliance with, the CDEBase Terms of Service, available
+at https://about.cdebase.com/terms (the “Enterprise Terms”), or other
+agreement governing the use of the Software, as agreed by you and CDEBase,
+and otherwise have a valid CDEBase Enterprise subscription for the
+correct number of user seats. Subject to the foregoing sentence, you are free to
+modify this Software and publish patches to the Software. You agree that CDEBase
+and/or its licensors (as applicable) retain all right, title and interest in and
+to all such modifications and/or patches, and all such modifications and/or
+patches may only be used, copied, modified, displayed, distributed, or otherwise
+exploited with a valid CDEBase Enterprise subscription for the correct
+number of user seats. Notwithstanding the foregoing, you may copy and modify
+the Software for development and testing purposes, without requiring a
+subscription. You agree that CDEBase and/or its licensors (as applicable) retain
+all right, title and interest in and to all such modifications. You are not
+granted any other rights beyond what is expressly stated herein. Subject to the
+foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
+and/or sell the Software.
+
+The full text of this Enterprise License shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+For all third party components incorporated into the CDEBase Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.

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

@@ -61,9 +61,9 @@
         "jest": "./node_modules/.bin/jest",
         "lerna": "lerna bootstrap",
         "prelernapublish": "git checkout publish && git pull origin publish  && git merge -s recursive -X theirs master  -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.js && yarn gitcommit",
-        "lernapublish": "lerna publish --ignore-scripts --cd-version=patch && yarn update-lerna-on-develop",
-        "postlernapublish": "git checkout master",
-        "lint": "eslint --ext js --ext ts --ext md",
+        "lernapublish": "lerna publish patch --ignore-scripts",
+        "postlernapublish": "yarn update-lerna-on-develop && git checkout master",
+        "lint": "eslint --ext js --ext ts --ext tsx --ext md",
         "lint:ci": "yarn lint . --format junit",
         "lint:fix": "yarn lint -- --fix",
         "lint:md": "markdownlint",
@@ -75,6 +75,7 @@
         "publish:force": "yarn publish:forceManual --yes",
         "publish:forceManual": "yarn lernapublish --force-publish=*",
         "publish:push": "yarn prelernapublish && git push origin publish && yarn postlernapublish",
+        "push-develop": "git push origin develop",
         "setBranchEnv": "cross-env REPOSITORY_BRANCH=${1:-$REPOSITORY_BRANCH} PUBLISH_BRANCH=${2:-$PUBLISH_BRANCH}",
         "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",
@@ -88,7 +89,7 @@
         "pretravis": "yarn compile",
         "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --full-trace ./test/tests.js",
         "posttravis": "yarn lint",
-        "update-lerna-on-develop": "git checkout publish && git pull && cp lerna.json ../lerna-temp.json && git checkout develop && mv ../lerna-temp.json lerna.json && git commit -am 'Update lerna.json' && git push",
+        "update-lerna-on-develop": "git checkout publish && git pull origin publish && cp lerna.json ../lerna-temp.json && git checkout develop && mv ../lerna-temp.json lerna.json && git commit -am 'Update lerna.json' && yarn push-develop",
         "watch": "lerna exec --no-sort --ignore *server --ignore *device --ignore *browser-extension --stream --parallel -- webpack --watch",
         "watch-packages": "lerna exec --no-sort  --scope @sample-stack/platform* --scope @sample-stack/react-shared-components --scope @sample-stack/core --stream --parallel 'webpack --watch'",
         "zen:build": "cross-env NODE_ENV=production zen build",
@@ -145,8 +146,8 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "5.0.6-alpha.3",
-        "@common-stack/generate-plugin": "6.0.6-alpha.1",
+        "@common-stack/env-list-loader": "6.0.6-alpha.5",
+        "@common-stack/generate-plugin": "6.0.6-alpha.20",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -165,15 +166,16 @@
         "@redux-devtools/core": "^3.13.1",
         "@redux-devtools/dock-monitor": "^3.0.1",
         "@redux-devtools/log-monitor": "^4.0.1",
-        "@remix-run/dev": "^2.9.2",
-        "@remix-run/react": "^2.9.2",
+        "@rollup/plugin-alias": "^5.1.0",
+        "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-graphql": "2.0.2",
         "@rollup/plugin-image": "^3.0.1",
-        "@rollup/plugin-json": "^5.0.2",
-        "@rollup/plugin-typescript": "^9.0.2",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-typescript": "^11.1.5",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
-        "@testing-library/react": "^13.4.0",
+        "@testing-library/react": "^16.0.1",
         "@testing-library/react-hooks": "^8.0.1",
         "@types/async": "^3.2.15",
         "@types/body-parser": "1.19.2",
@@ -192,7 +194,6 @@
         "@types/react": "^18.2.20",
         "@types/react-dom": "^18.2.7",
         "@types/react-helmet": "^6.1.5",
-        "@types/react-redux": "^7.1.24",
         "@types/react-test-renderer": "^18.0.0",
         "@types/redux-logger": "^3.0.9",
         "@types/semver": "^7.3.13",
@@ -204,6 +205,7 @@
         "@typescript-eslint/parser": "^6.7.4",
         "@web/rollup-plugin-copy": "^0.5.1",
         "@webpack-cli/serve": "^1.7.0",
+        "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
         "autoprefixer": "^10.4.13",
         "babel-core": "^7.0.0-bridge.0",
         "babel-eslint": "^10.1.0",
@@ -265,6 +267,7 @@
         "jest-dom": "^4.0.0",
         "jest-junit": "^14.0.1",
         "jest-matcher-utils": "^29.2.2",
+        "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
         "lerna": "8",
@@ -325,7 +328,7 @@
         "ts-node": "^10.9.1",
         "tslib": "^2.4.1",
         "typedoc": "^0.23.20",
-        "typescript": "^5.1.6",
+        "typescript": "^5.5.4",
         "url-loader": "^4.1.1",
         "wait-on": "^6.0.1",
         "webpack": "^5.74.0",

package/src/generators/add-fullstack/files/tools/html-plugin-template.ejs

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <base href="/">
+    <meta charset="utf-8">
+    <title>
+        <@= htmlWebpackPlugin.options.title @>
+    </title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+
+<body>
+    <div class="demo">
+        <div id="root">
+            Try building the demo:
+            <pre>
+        </pre> ...and refreshing this page!
+        </div>
+    </div>
+    <footer class="dark">
+        <section class="container copyright">
+            CDMBase LLC
+        </section>
+    </footer>
+</body>
+
+</html>

package/src/generators/add-fullstack/generator.ts

@@ -5,31 +5,56 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { AddFullstackGeneratorSchema } from './schema';
 import { getValid, isValid } from '../../utils';
-import { updateJenkinsFile, updatePackageJson } from './updates';
+import { 
+    updateJenkinsFile,
+    updatePackageJson,
+    backupLernaJson,
+    restoreLernaJson,
+    updateHtmlPlugin,
+    updateLicense,
+    backupFiles,
+    restoreFiles,
+    updateRepository,
+} from './updates';
 import {
     generateBackend,
     generateFrontend,
     generateMoleculer,
-    generateBrowserPackage,
-    generateClientPackage,
-    generateCorePackage,
-    generateServerPackage,
+    generatePackage,
 } from '../../index';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
     const basePath = options.path || '';
-    const projectRoot = path.join(basePath, getValid(options.name) ?? 'fullstack-pro');
+    const projectName = getValid(options.name) ?? 'fullstack-pro';
+    const projectRoot = path.join(basePath, projectName);
 
     console.log(`basePath: ${basePath}`);
 
+    // backup existing lerna values
+    const lernaBackup = backupLernaJson(tree, projectRoot);
+
+    // backup files codegen.yaml
+    const filesToBackup = ['codegen.yml', 'values-dev.yaml', 'values-prod.yaml', 'values-stage.yaml'];
+    const filesBackup = backupFiles(tree, projectRoot, filesToBackup);
+
     generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
 
     // Update Jenkinsfile with dynamic values
-    const jenkinsFilePath = path.join(projectRoot, 'Jenkinsfile');
-    updateJenkinsFile(jenkinsFilePath, options.name);
+    updateJenkinsFile(tree, projectRoot, projectName);
 
     // Update package.json with the project name
-    updatePackageJson(tree, projectRoot, getValid(options.name));
+    updatePackageJson(tree, projectRoot, { name: projectName });
+
+    // Update tools/html-plugin-template
+    updateHtmlPlugin(tree, projectRoot);
+
+    if (lernaBackup) {
+        // When update the existing lerna.json, it shouldn't overwrite version, allowbranch, packages
+        restoreLernaJson(tree, projectRoot, lernaBackup);
+    }
+
+    // Restore files backup to ignore update
+    restoreFiles(tree, projectRoot, filesBackup);
 
     await formatFiles(tree);
 
@@ -37,9 +62,9 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
         const configPath = path.resolve(basePath, getValid(options.config));
         if (fs.existsSync(configPath)) {
             try {
-                const content = String(fs.readFileSync(configPath));
-                const configs = JSON.parse(content);
+                const configs = JSON.parse(fs.readFileSync(configPath).toString());
                 configs.parent = projectRoot;
+                configs.ns = projectName;
 
                 await processConfigs(tree, configs);
             } catch (error) {
@@ -47,14 +72,17 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
             }
         }
     }
-}
 
+    // Update license from package.json
+    updateLicense(tree, projectRoot);
+}
 
-const generateServers = async (tree: Tree, parent: string, servers: any) => {
-    for (const [serverName, serverConfig] of Object.entries(servers)) {
+const generateServers = async (tree: Tree, options: any) => {
+    for (const [serverName, serverConfig] of Object.entries(options.servers)) {
         const configs: any = serverConfig;
         configs.name = serverName;
-        configs.directory = path.join(parent, 'servers');
+        configs.directory = path.join(options.parent, 'servers');
+        configs.ns = options.ns;
 
         switch (configs?.type) {
             case 'frontend':
@@ -72,38 +100,36 @@ const generateServers = async (tree: Tree, parent: string, servers: any) => {
     }
 };
 
-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 = path.join(parent, 'packages');
-
-        switch ((packageConfig as any)?.type) {
-            case 'packages-core':
-                await generateCorePackage(tree, configs);
-                break;
-            case 'packages-browser':
-                await generateBrowserPackage(tree, configs);
-                break;
-            case 'packages-client':
-                await generateClientPackage(tree, configs);
-                break;
-            case 'packages-server':
-                await generateServerPackage(tree, configs);
-                break;
-            default:
-                break;
+const generateModules = async (tree: Tree, options: any) => {
+    for (const [moduleName, moduleConfig] of Object.entries(options.packages.modules)) {
+        for (const [packageName, packageConfig] of Object.entries(moduleConfig)) {
+            const configs: any = {
+                ...(packageConfig as any),
+                name: moduleName,
+                directory: path.join(options.parent, 'packages'),
+                ns: options.ns,
+                type: packageName,
+            };
+            await generatePackage(tree, configs, false);
         }
     }
 };
 
 const processConfigs = async (tree: Tree, configs: any) => {
     if (configs.servers) {
-        await generateServers(tree, configs.parent, configs.servers);
+        await generateServers(tree, configs);
     }
 
     if (configs.packages && configs.packages.modules) {
-        await generatePackages(tree, configs.parent, configs.packages.modules);
+        await generateModules(tree, configs);
+    }
+
+    if (configs.license) {
+        updatePackageJson(tree, configs.parent, { license: getValid(configs.license) });
+    }
+
+    if (configs.repository) {
+        updateRepository(tree, configs.parent, configs.repository);
     }
 };
 

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

@@ -0,0 +1,11 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+
+export function updateHtmlPlugin(tree: Tree, projectRoot: string) {
+    const filePath = path.join(projectRoot, 'tools', 'html-plugin-template.ejs');
+    if (tree.exists(filePath)) {
+        const contents = tree.read(filePath).toString();
+        const newContents = contents.replace('<@', '<%').replace('@>', '%>');
+        tree.write(filePath, newContents);
+    }
+}

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

@@ -0,0 +1,23 @@
+import { Tree } from '@nx/devkit';
+import * as path from 'path';
+
+export function backupFiles(tree: Tree, projectRoot: string, files: string[]) {
+    return files.map(file => {
+        const filePath = path.join(projectRoot, file);
+        const backup: any = { file };
+        if (tree.exists(filePath)) {
+            backup.content = tree.read(filePath).toString();
+        }
+        return backup;
+    });
+}
+
+export function restoreFiles(tree: Tree, projectRoot: string, files: any[]) {
+    files.forEach((backup: any) => {
+        const filePath = path.join(projectRoot, backup.file);
+        if (backup.content) {
+            tree.write(filePath, backup.content);
+            console.log('Restored file', filePath);
+        }
+    });
+}

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

@@ -1,2 +1,6 @@
 export * from './jenkinsfileUpdate';
 export * from './packageJsonUpdate';
+export * from './lernaJsonUpdate';
+export * from './htmlPluginUpdate';
+export * from './licenseUpdate';
+export * from './ignoreUpdate';

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

@@ -1,7 +1,9 @@
+import { Tree } from '@nx/devkit';
 import fs from 'fs';
 import * as path from 'path';
 
-export function updateJenkinsFile(filePath: string, name: string) {
+export function updateJenkinsFile(tree: Tree, projectRoot: string, name: string) {
+    const filePath = path.join(projectRoot, 'Jenkinsfile');
     const paramsToUpdate = {
         BASE_NAMESPACE: name,
         CONNECTION_ID: name,
@@ -10,8 +12,8 @@ export function updateJenkinsFile(filePath: string, name: string) {
     };
 
     let jenkinsFileContent = '';
-    if (fs.existsSync(filePath)) {
-        jenkinsFileContent = fs.readFileSync(filePath, 'utf-8');
+    if (tree.exists(filePath)) {
+        jenkinsFileContent = tree.read(filePath).toString();
     }
 
     let labelExists = false;
@@ -42,6 +44,6 @@ export function updateJenkinsFile(filePath: string, name: string) {
 
     // 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');
+        tree.write(filePath, updatedContent);
     }
 }