@common-stack/generate-plugin 6.0.6-alpha.7 → 6.0.6-alpha.71

package/lib/utils/syncConfig.mjs

@@ -0,0 +1,116 @@
+import {updateJson}from'@nx/devkit';import*as path from'path';import {parse}from'@babel/parser';import traverse from'@babel/traverse';import {set}from'lodash';import {getValid,readDir}from'./index.mjs';const DEFAULT_PACKAGE = 'core';
+const syncConfig = (tree, projectRoot, options) => {
+    var _a, _b;
+    // synchronize package in package.json and lerna.json
+    syncPackage(tree, options);
+    const configPath = 'cde-config.json';
+    if (tree.exists(configPath)) {
+        try {
+            const directory = (_a = getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+            const type = (_b = getValid(options.type)) !== null && _b !== void 0 ? _b : DEFAULT_PACKAGE;
+            const moduleName = options.name; // name should not be null
+            const envConfigContent = getEnvConfigFileContent(tree, projectRoot);
+            const localesContent = getLocalesFileContent(tree, projectRoot);
+            const packageContent = {
+                type: `packages-${type}`,
+                files: {
+                    "config/env-config.ts": envConfigContent !== null && envConfigContent !== void 0 ? envConfigContent : {},
+                    "cdm-locales": localesContent !== null && localesContent !== void 0 ? localesContent : {},
+                },
+            };
+            updateJson(tree, configPath, (config) => {
+                set(config, [directory, 'modules', moduleName, type], packageContent);
+                return config;
+            });
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', path.join(tree.root, configPath));
+    }
+};
+const getEnvConfigFileContent = (tree, projectRoot) => {
+    const filePath = path.join(projectRoot, 'src/config/env-config.ts');
+    if (tree.exists(filePath)) {
+        try {
+            const result = {};
+            let fileContent = tree.read(filePath).toString();
+            const ast = parse(fileContent, {
+                sourceType: 'module',
+                plugins: ['typescript', 'dynamicImport'],
+            });
+            traverse.default(ast, {
+                enter(astroPath) {
+                    if (astroPath.node.type === "VariableDeclarator" && astroPath.node.id.name === "config") {
+                        astroPath.node.init.arguments[1].properties.forEach(prop => {
+                            const key = prop.key.name;
+                            const callee = prop.value.callee.name;
+                            let value;
+                            if (prop.value.arguments && prop.value.arguments.length > 0) {
+                                value = {};
+                                prop.value.arguments[0].properties.forEach(p => {
+                                    if (p.value.elements && p.value.elements.length > 0) {
+                                        value[p.key.name] = [];
+                                        p.value.elements.forEach(ele => value[p.key.name].push(ele.value));
+                                    }
+                                    else {
+                                        value[p.key.name] = callee == 'json' ? JSON.parse(p.value.value) : p.value.value;
+                                    }
+                                });
+                            }
+                            else {
+                                value = '';
+                            }
+                            console.log(`${key}:`, `${callee}(${JSON.stringify(value)})`);
+                            result[key] = { type: callee, value: value };
+                        });
+                    }
+                },
+            });
+            return result;
+        }
+        catch (e) {
+            console.error('Failed to change env-config', e);
+        }
+    }
+    else {
+        console.log('No exist env-config file at ', filePath);
+    }
+    return null;
+};
+const getLocalesFileContent = (tree, projectRoot) => {
+    const dirPath = path.join(projectRoot, 'src/cdm-locales');
+    if (tree.exists(dirPath)) {
+        try {
+            return readDir(tree, dirPath);
+        }
+        catch (e) {
+            console.error(e);
+        }
+    }
+    else {
+        console.log('No exist cdm-locales directory at ', dirPath);
+    }
+    return null;
+};
+const syncPackage = (tree, options) => {
+    var _a;
+    const directory = (_a = getValid(options.directory)) !== null && _a !== void 0 ? _a : 'packages';
+    updateJson(tree, 'package.json', (packageJson) => {
+        var _a;
+        const packages = ((_a = packageJson.workspaces) === null || _a === void 0 ? void 0 : _a.packages) || [];
+        if (!packages.includes(`${directory}/*`)) {
+            packageJson.workspaces.packages.push(`${directory}/*`);
+        }
+        return packageJson;
+    });
+    updateJson(tree, 'lerna.json', (lernaJson) => {
+        const packages = lernaJson.packages || [];
+        if (!packages.includes(`${directory}/*`)) {
+            lernaJson.packages.push(`${directory}/*`);
+        }
+        return lernaJson;
+    });
+};export{syncConfig,syncPackage};//# sourceMappingURL=syncConfig.mjs.map

package/lib/utils/syncConfig.mjs.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.6-alpha.7",
+    "version": "6.0.6-alpha.71",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -17,8 +17,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "6.0.6-alpha.5",
-        "@nx/devkit": "19.5.1",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.71",
         "tslib": "^2.3.0"
     },
     "publishConfig": {
@@ -26,5 +25,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "054c57aa81115c5f531c5677e1e7933f8464df16"
+    "gitHead": "e0f6b946505a8a33198ca7423679f8f93c79a5bf"
 }

package/rollup.config.mjs

@@ -33,14 +33,8 @@ const baseConfig = {
         { src: 'src/generators/add-fullstack/files/*', dest: 'lib/generators/add-fullstack/files' },
         { src: 'src/generators/add-moleculer/schema.json', dest: 'lib/generators/add-moleculer' },
         { src: 'src/generators/add-moleculer/files/*', dest: 'lib/generators/add-moleculer/files' },
-        { src: 'src/generators/add-browser-package/schema.json', dest: 'lib/generators/add-browser-package' },
-        { src: 'src/generators/add-browser-package/files/*', dest: 'lib/generators/add-browser-package/files' },
-        { src: 'src/generators/add-client-package/schema.json', dest: 'lib/generators/add-client-package' },
-        { src: 'src/generators/add-client-package/files/*', dest: 'lib/generators/add-client-package/files' },
-        { src: 'src/generators/add-core-package/schema.json', dest: 'lib/generators/add-core-package' },
-        { src: 'src/generators/add-core-package/files/*', dest: 'lib/generators/add-core-package/files' },
-        { src: 'src/generators/add-server-package/schema.json', dest: 'lib/generators/add-server-package' },
-        { src: 'src/generators/add-server-package/files/*', dest: 'lib/generators/add-server-package/files' },
+        { src: 'src/generators/add-package/schema.json', dest: 'lib/generators/add-package' },
+        { src: 'src/generators/add-package/files/*', dest: 'lib/generators/add-package/files' },
         { src: 'src/executors/update-deploy-version/schema.json', dest: 'lib/executors/update-deploy-version' },
         { src: 'src/executors/sort-package-json/schema.json', dest: 'lib/executors/sort-package-json' },
       ],

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

@@ -1,18 +1,22 @@
 import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
 import * as path from 'path';
+import { deepMerge } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';
 import { AddBackendGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 
+const DEFAULT_SERVER_NAME = 'backend-server';
+
 export async function addBackendGenerator(tree: Tree, options: AddBackendGeneratorSchema) {
-    const projectName = isValid(options.ns) ? `backend-${getValid(options.ns)}-server` : 'backend-server';
+    const projectName = isValid(options.name) ? `backend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
     const configs: any = {...options, name: projectName};
 
     return await generateBackend(tree, configs);
 }
 
 export const generateBackend = async (tree: Tree, options: any) => {
-    const projectName = getValid(options.name) ?? 'backend-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;
     // resetProject(`${basePath}/${projectRoot}`);
     
     // addProjectConfiguration(tree, framework, {
@@ -27,7 +31,14 @@ export const generateBackend = async (tree: Tree, options: any) => {
         packageJson['name'] = projectName;
         return packageJson;
     });
-    
+    if (options['config.json']) {
+        updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
+            const addtionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, addtionalConfigs);
+        
+            return configJson;
+        });
+    }
     await formatFiles(tree);
 }
 

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

@@ -1,4 +1,5 @@
 export interface AddBackendGeneratorSchema {
     ns: string;
     directory: string;
+    name?: string;
 }

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,15 +40,17 @@ 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']["@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";
 

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'
@@ -100,9 +100,9 @@ pipeline {
             rm .npmrc
             npx lerna exec --scope=*mobile-device ${params.BUILD_STRATEGY} ${env.BUILD_COMMAND}
             git checkout -- .npmrc
+            yarn git:pull
             yarn gitcommit
-            git pull origin ${params.REPOSITORY_BRANCH}
-            git push origin ${params.REPOSITORY_BRANCH}
+            yarn git:push
           """
         }
       }

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

@@ -43,7 +43,7 @@
         "db:migrate": "knex migrate:latest --cwd . --knexfile ./servers/backend-server/knexfile.js",
         "db:migrate:rollback": "knex migrate:rollback  --cwd . --knexfile ./servers/backend-server/knexfile.js",
         "db:seed": "yarn db:migrate && knex seed:run  --cwd . --knexfile ./servers/backend-server/knexfile.js",
-        "predevpublish": "if ! git show-ref --verify --quiet refs/remotes/origin/$PUBLISH_BRANCH; then git checkout -b $PUBLISH_BRANCH && git push -u origin $PUBLISH_BRANCH; fi && git fetch origin $PUBLISH_BRANCH && git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $REPOSITORY_BRANCH -m \"merge from $REPOSITORY_BRANCH\" && yarn gitcommit && node tools/update-dependency-version.js && yarn gitcommit",
+        "predevpublish": "if ! git show-ref --verify --quiet refs/remotes/origin/$PUBLISH_BRANCH; then git checkout -b $PUBLISH_BRANCH && git push -u origin $PUBLISH_BRANCH; fi && git fetch origin $PUBLISH_BRANCH && git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $REPOSITORY_BRANCH -m \"merge from $REPOSITORY_BRANCH\" && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
         "devpublish": "lerna publish prerelease --ignore-scripts --exact",
         "postdevpublish": "git checkout $REPOSITORY_BRANCH",
         "devpublish:auto": "yarn devpublish -- --yes",
@@ -60,10 +60,10 @@
         "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
         "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",
+        "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.mjs && yarn gitcommit",
+        "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,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.6-alpha.5",
-        "@common-stack/generate-plugin": "6.0.6-alpha.6",
+        "@common-stack/env-list-loader": "6.0.6-alpha.50",
+        "@common-stack/generate-plugin": "6.0.6-alpha.70",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.70",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -165,15 +167,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": "^6.1.0",
-        "@rollup/plugin-typescript": "^9.0.2",
+        "@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": "^16.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 +195,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 +206,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",
@@ -256,6 +259,7 @@
         "html-webpack-plugin": "^5.5.0",
         "http-proxy-middleware": "^2.0.6",
         "husky": "^9.1.5",
+        "glob": "^11.0.0",
         "ignore-loader": "^0.1.2",
         "ip": "^1.1.8",
         "isomorphic-style-loader": "^5.3.2",
@@ -265,6 +269,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 +330,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>