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

package/lib/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/lib/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/lib/generators/add-frontend/templates/Dockerfile

@@ -1,5 +1,5 @@
 # The official nodejs docker image
-FROM node:18.20-bullseye
+FROM node:20:16-bullseye
 ENV PYTHON /usr/bin/python
 
 # Copy package.json only to temp folder, install its dependencies,

package/lib/generators/add-frontend/templates/package.json

@@ -17,13 +17,13 @@
     "main": "index.js",
     "scripts": {
         "prebuild": "yarn build:clean && yarn genconfig",
-        "build": "cross-env SSR=true NODE_OPTIONS='--max_old_space_size=6096' NODE_ENV=production remix vite:build",
+        "build": "cross-env SSR=true NODE_OPTIONS='--max_old_space_size=4096' NODE_ENV=production remix vite:build",
         "build:SSR": "cross-env SSR=true NODE_ENV=production remix vite:build",
         "build:clean": "rimraf dist build node_modules/.vite",
         "build:debug": "cross-env DEBUGGING=true NODE_ENV=production remix vite:build",
         "build:debug:verbose": "yarn build:debug -- -v",
         "build:dev": "cross-env ENV_FILE=../../config/development/dev.env yarn build",
-        "build:devSSR": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env  NODE_OPTIONS='--max_old_space_size=6096'  remix vite:build",
+        "build:devSSR": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env  yarn build",
         "build:stats": "cross-env BUNDLE_STATS=true yarn build:debug",
         "dev:vite:ssr": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env node ./server.js",
         "docker:build": "cross-env yarn build && docker build . -t $npm_package_name:$npm_package_version",
@@ -52,23 +52,6 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@admin-layout/assets": "8.5.3-alpha.0",
-        "@admin-layout/icons": "8.5.3-alpha.0",
-        "@adminide-stack/account-api-browser": "8.5.2-alpha.0",
-        "@adminide-stack/billing-api-browser": "8.5.2-alpha.0",
-        "@adminide-stack/core": "8.5.2-alpha.0",
-        "@adminide-stack/extension-api": "8.5.2-alpha.0",
-        "@adminide-stack/extension-module-browser": "8.5.2-alpha.0",
-        "@adminide-stack/git-api-browser": "8.5.2-alpha.0",
-        "@adminide-stack/integration-api-client": "8.5.2-alpha.0",
-        "@adminide-stack/marketplace-module-browser": "8.5.2-alpha.0",
-        "@adminide-stack/platform-browser": "8.5.2-alpha.0",
-        "@adminide-stack/project-mgmt-browser": "8.5.2-alpha.0",
-        "@adminide-stack/react-shared-components": "8.5.2-alpha.0",
-        "@adminide-stack/registry-api-browser": "8.5.2-alpha.0",
-        "@adminide-stack/user-auth0-browser": "8.5.2-alpha.0",
-        "@adminide-stack/user-auth0-server": "8.5.2-alpha.0",
-        "@container-stack/territory": "5.1.2",
         "@emotion/react": "^11.10.4",
         "@emotion/server": "^11.10.0",
         "@files-stack/core": "3.0.2",
@@ -81,7 +64,6 @@
         "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.15",
         "lodash-es": "^4.17.21",
-        "minimatch": "^5.0.0",
         "moment": "2.29.1",
         "ramda": "^0.29.1",
         "react-ga4": "^2.1.0",
@@ -99,8 +81,8 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/frontend-stack-react": "6.0.1-alpha.0",
-        "@common-stack/rollup-vite-utils": "6.0.1-alpha.0",
+        "@common-stack/frontend-stack-react": "6.0.2-alpha.2",
+        "@common-stack/rollup-vite-utils": "6.0.2-alpha.2",
         "@remix-run/dev": "^2.8.1",
         "@remix-run/serve": "^2.8.1",
         "cross-env": "^7.0.3",

package/lib/generators/add-frontend/templates/src/config/public-config.ts.template

@@ -63,12 +63,18 @@ if (isBrowser) {
     process[lowerCase('env')] = env; // to avoid webpack to replace `process` with actual value.
     process.APP_ENV = env;
     window.process = process;
+    // @ts-ignore
     window.__CLIENT__ = true;
+    // @ts-ignore
     window.__SERVER__ = false;
 } else {
+    // @ts-ignore
     global.__CLIENT__ = false;
+    // @ts-ignore
     global.__SERVER__ = true;
+    // @ts-ignore
     __CLIENT__ = false;
+    // @ts-ignore
     __SERVER__ = true;
 }
 try {

package/lib/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}