npm - @common-stack/generate-plugin - Versions diffs - 6.0.1-alpha.9 → 6.0.2-alpha.10 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (265) hide show

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

@@ -0,0 +1,117 @@
+import 'reflect-metadata';
+import * as React from 'react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useLoaderData, useRouteError, json } from '@remix-run/react';
+import type { LinksFunction } from "@remix-run/node";
+// @ts-ignore
+import publicEnv from '@src/config/public-config';
+import { PluginArea } from '@common-stack/client-react';
+import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
+// @ts-ignore
+import clientModules, { plugins } from '@app/frontend-stack-react/modules.js';
+// @ts-ignore
+import { useChangeLanguage } from 'remix-i18next/react';
+import { useTranslation } from 'react-i18next';
+// @ts-ignore
+import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
+import stylesheet from "./tailwind.css?url";
+export const links: LinksFunction = () => [
+    { rel: "stylesheet", href: stylesheet },
+];
+export const loader = async ({ request }) => {
+    const locale = await i18next.getLocale(request);
+    return json({
+        __ENV__: publicEnv,
+        locale,
+    });
+};
+export const handle = {
+    i18n: 'common',
+};
+export function shouldRevalidate(params: any) {
+    return params.defaultShouldRevalidate && params.currentUrl.pathname !== params.nextUrl.pathname;
+}
+export function Layout({ children }: { children: React.ReactNode }) {
+    const data = useLoaderData<{ locale: any }>();
+    const locale = data?.locale;
+    const { i18n } = useTranslation();
+    useChangeLanguage(locale);
+    React.useEffect(() => {
+        subscribeReduxRouter({ store: (window as any).__remixStore, router: window.__remixRouter } as any);
+    }, []);
+    const getConstants = () => {
+        if (typeof window === 'undefined') {
+            return (
+                <>
+                    <script
+                        dangerouslySetInnerHTML={{
+                            __html: `window.__ENV__ = ${JSON.stringify((data as any)?.__ENV__)}`,
+                        }}
+                    />
+                    <script
+                        src="https://cdnjs.cloudflare.com/ajax/libs/reflect-metadata/0.1.13/Reflect.min.js"
+                        integrity="sha512-jvbPH2TH5BSZumEfOJZn9IV+5bSwwN+qG4dvthYe3KCGC3/9HmxZ4phADbt9Pfcp+XSyyfc2vGZ/RMsSUZ9tbQ=="
+                        crossOrigin="anonymous"
+                        referrerPolicy="no-referrer"
+                    ></script>
+                    <script>window.__APOLLO_STATE__=[__APOLLO_STATE__]</script>
+                    <script>window.__PRELOADED_STATE__=[__PRELOADED_STATE__]</script>
+                    <script>window.__SLOT_FILLS__=[__SLOT_FILLS__]</script>
+                    <script
+                        dangerouslySetInnerHTML={{
+                            __html: `if (global === undefined) { var global = window; }`,
+                        }}
+                    />
+                </>
+            );
+        }
+        return null;
+    };
+    return (
+        <html lang={locale} dir={i18n.dir()}>
+            <head>
+                <meta charSet="utf-8" />
+                <meta name="viewport" content="width=device-width, initial-scale=1" />
+                <Meta />
+                <Links />
+                {typeof window === 'undefined' ? `[__STYLESHEET__]` : ''}
+            </head>
+            <body>
+                <PluginArea />
+                {clientModules.getWrappedRoot(children)}
+                <ScrollRestoration />
+                <Scripts />
+                {getConstants()}
+            </body>
+        </html>
+    );
+}
+const TestComponent = () => {
+    return (
+        <div className="min-h-screen flex items-center justify-center bg-gray-100">
+            <div className="p-6 max-w-sm mx-auto bg-white rounded-xl shadow-md space-y-4">
+                <h1 className="text-2xl font-bold text-center">Hello, Tailwind CSS!</h1>
+                <p className="text-gray-500 text-center">This is a test page using React and Tailwind CSS.</p>
+            </div>
+        </div>
+    );
+}
+export default function App() {
+    return (
+        // <Outlet />
+        <TestComponent />
+    );
+}
+// export { ErrorBoundary };

package/src/generators/add-frontend/frameworks/tailwindui/tailwind.css ADDED Viewed

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

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

@@ -1,14 +1,22 @@
 import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
 import * as path from 'path';
+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 } from '../../constants';
+import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI, FRAMEWORK_TAILWINDUI } from '../../constants';
 const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 export async function addFrontendGenerator(tree: Tree, options: AddFrontendGeneratorSchema) {
-    // const basePath = process.cwd();
     const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+    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';
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
@@ -32,10 +40,19 @@ export async function addFrontendGenerator(tree: Tree, options: AddFrontendGener
             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']["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']["@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";
+            packageJson['devDependencies']["autoprefixer"] = "^10.4.20";
         }
         return packageJson;
@@ -48,6 +65,11 @@ export async function addFrontendGenerator(tree: Tree, options: AddFrontendGener
             configJson['modules'].push("@admin-layout/chakra-design-pro");
         }
+        if (options['config.json']) {
+            const addtionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, addtionalConfigs);
+        }
         return configJson;
     });

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

@@ -17,7 +17,7 @@
         "framework": {
             "type": "string",
             "description": "",
-            "x-prompt": "What UI framework would you like to use in [antui, chakraui]?"
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?"
         }
     },
     "required": ["ns", "directory", "framework"]

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

@@ -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/jest-mongodb-config.js CHANGED Viewed

@@ -1,10 +1,11 @@
 module.exports = {
     mongodbMemoryServerOptions: {
       instance: {
-        dbName: 'jest'
+        dbName: 'jest',
+        storageEngine: 'wiredTiger',
       },
       binary: {
-        version: '4.0.12', // Version of MongoDB
+        version: '4.0.27', // Version of MongoDB
         skipMD5: true
       },
       autoStart: false

package/src/generators/add-fullstack/files/jest.config.base.js CHANGED Viewed

@@ -2,6 +2,45 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { defaults } = require('jest-config');
+const packagesToTransform = [
+    '@apollo/client',
+    '@common-stack/client-core',
+    '@common-stack/client-react',
+    '@common-stack/core',
+    '@admin-layout/client',
+    '@common-stack/components-pro',
+    '@common-stack/server-core',
+    '@common-stack/cache-api-server',
+    '@common-stack/remix-router-redux',
+    '@cdmbase/redux-auth-wrapper',
+    '@cdmbase/remix-redis-session',
+    '@cdm-logger/server',
+    '@cdm-logger/core',
+    '@cdm-logger/client',
+    '@files-stack/server-core',
+    '@vscode-alt/monaco-editor',
+    '@workbench-stack/core',
+    '@workbench-stack/platform-server',
+    'abortable-rx',
+    'lodash-es',
+    'sort-keys',
+    'is-plain-obj',
+    'query-string',
+    'decode-uri-component',
+    'split-on-first',
+    'filter-obj',
+    'react-dnd-html5-backend',
+    'react-sortable-tree',
+    'react-dnd',
+    'dnd-core',
+];
+const generateTransformIgnorePattern = (packages) => {
+    const escapedPackages = packages.map((pkg) => pkg.replace(/\//g, '\\/'));
+    return `/node_modules/(?!(${escapedPackages.join('|')})/).+\\.js$`;
+};
+const transformIgnorePattern = generateTransformIgnorePattern(packagesToTransform);
 module.exports = {
     testEnvironment: 'node',
     setupFiles: [
@@ -10,11 +49,11 @@ module.exports = {
     ],
     preset: 'ts-jest',
     testMatch: null,
-    testRegex: '.*test*\\.(ts|tsx|js)$',
-    testPathIgnorePatterns: ['/node_modules/', '/dist/'],
+    testRegex: '.*test\\.(ts|tsx|js)$',
+    testPathIgnorePatterns: ['/node_modules/', '/lib', '/dist/'],
     transform: {
         '\\.(gql)$': 'jest-transform-graphql',
-        '\\.(graphql|graphqls)$': 'jest-raw-loader',
+        '\\.(graphql|graphqls)$': '@glen/jest-raw-loader',
         '\\.(ts|tsx)$': 'ts-jest',
         // Use our custom transformer only for the *.js and *.jsx files
         '\\.(js|jsx)?$': './transform.js',
@@ -39,7 +78,7 @@ module.exports = {
         // because we don't need to use any kind of tree shaking right?!
         '^lodash-es$': '<rootDir>/node_modules/lodash/index.js',
     },
-    transformIgnorePatterns: ['/node_modules/(?!(babel-runtime|antd)).*/', '<rootDir>/node_modules/(?!lodash-es/.*)'],
+    transformIgnorePatterns: [transformIgnorePattern],
     clearMocks: true,
     verbose: true,
     // projects: ['<rootDir>'], // TODO need to test with it https://github.com/bryan-hunter/yarn-workspace-lerna-monorepo/blob/master/jest.config.base.js

package/src/generators/add-fullstack/files/jest.config.base.mjs ADDED Viewed

@@ -0,0 +1,99 @@
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable @typescript-eslint/no-var-requires */
+import { defaults } from 'jest-config';
+const packagesToTransform = [
+    '@apollo/client',
+    '@apollo/server',
+    '@graphql-tools/schema',
+    '@graphql-tools/mock',
+    '@common-stack/client-core',
+    '@common-stack/client-react',
+    '@common-stack/core',
+    '@common-stack/server-core',
+    '@common-stack/cache-api-server',
+    '@common-stack/remix-router-redux',
+    '@common-stack/graphql-api',
+    '@cdmbase/graphql-type-uri',
+    '@cdm-logger/server',
+    '@cdm-logger/core',
+    '@cdm-logger/client',
+    '@files-stack/core',
+    '@files-stack/server-core',
+    '@vscode-alt/monaco-editor',
+    '@workbench-stack/core',
+    '@workbench-stack/platform-server',
+    'graphql',
+    'abortable-rx',
+    'lodash-es',
+    'sort-keys',
+    'is-plain-obj',
+    'query-string',
+    'decode-uri-component',
+    'split-on-first',
+    'filter-obj',
+    'react-dnd-html5-backend',
+    'react-sortable-tree',
+    'react-dnd',
+    'dnd-core',
+];
+const generateTransformIgnorePattern = (packages) => {
+    const escapedPackages = packages.map((pkg) => pkg.replace(/\//g, '\\/'));
+    return `/node_modules/(?!(${escapedPackages.join('|')})/).+\\.js$`;
+};
+const transformIgnorePattern = generateTransformIgnorePattern(packagesToTransform);
+export default {
+    testEnvironment: 'node',
+    setupFiles: [
+        // needed for UI to mock canvas load
+        // "jest-canvas-mock"
+    ],
+    extensionsToTreatAsEsm: ['.ts', '.tsx'],
+    preset: 'ts-jest',
+    testMatch: null,
+    testRegex: '.*test\\.(ts|tsx|js)$',
+    testPathIgnorePatterns: ['/node_modules/', '/lib', '/dist/'],
+    transform: {
+        '\\.(gql)$': 'jest-transform-graphql',
+        '\\.(graphql|graphqls)$': '@glen/jest-raw-loader',
+        '\\.(ts|tsx)$': 'ts-jest',
+        // // Use our custom transformer only for the *.js and *.jsx files
+        '\\.(js|jsx)?$': './transform.mjs',
+        // future need to test with
+        //  "^.+\\.(js|jsx|ts|tsx)$": "./transform.js",
+        '.+\\.(css|styl|less|sass|scss)$': 'jest-css-modules-transform',
+    },
+    roots: ['packages', 'packages-modules', 'servers'],
+    moduleFileExtensions: [
+        ...defaults.moduleFileExtensions,
+        'json',
+        'gql',
+        'graphql',
+    ],
+    moduleNameMapper: {
+        '^__mocks__/(.*)$': '<rootDir>/../../__mocks__/$1',
+        // we'll use commonjs version of lodash for tests 👌
+        // because we don't need to use any kind of tree shaking right?!
+        '^lodash-es$': '<rootDir>/node_modules/lodash/index.js',
+    },
+    transformIgnorePatterns: [transformIgnorePattern],
+    clearMocks: true,
+    verbose: true,
+    // projects: ['<rootDir>'], // TODO need to test with it https://github.com/bryan-hunter/yarn-workspace-lerna-monorepo/blob/master/jest.config.base.js
+    coverageDirectory: '<rootDir>/coverage/',
+    coveragePathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/lib/', '<rootDir>/dist/', '<rootDir>/node_modules/'],
+    globals: {
+        __BACKEND_URL__: 'http://localhost:3010',
+        __GRAPHQL_URL__: 'http://localhost:8085/graphql',
+        'ts-jest': {
+            // tsConfig: "<rootDir>/src/__tests__/tsconfig.json",
+            // https://github.com/kulshekhar/ts-jest/issues/766
+            diagnostics: {
+                warnOnly: true,
+            },
+            // "skipBabel": true
+        },
+    },
+};

package/src/generators/add-fullstack/files/jest.config.mongodb.mjs ADDED Viewed

@@ -0,0 +1,3 @@
+export default {
+    preset: '@shelf/jest-mongodb',
+};

package/src/generators/add-fullstack/files/lint-staged.config.js CHANGED Viewed

@@ -1,4 +1,7 @@
 module.exports = {
     '*.{js,jsx,ts,tsx,json,md}': ['prettier --write', 'git add'],
     // '*.{ts,tsx}': ['eslint --fix'], // this can be tested
-};
+    'package.json': ['sort-package-json', 'prettier --write'],
+    '*/**/package.json': ['sort-package-json', 'prettier --write'],
+    '**/**/*/package.json': ['sort-package-json', 'prettier --write'],
+};

package/src/generators/add-fullstack/files/nx.json CHANGED Viewed

@@ -1,20 +1,25 @@
 {
   "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build"],
-        "runtimeCacheInputs": ["node --version"]
+      "default": {
+          "runner": "@nx-aws-plugin/nx-aws-cache",
+          "options": {
+              "runtimeCacheInputs": ["node --version"],
+              "awsAccessKeyId": "xxxx",
+              "awsSecretAccessKey": "xxxx",
+              "awsRegion": "ca-central-1",
+              "awsBucket": "clockbook-screenshot"
+          }
       }
-    }
   },
   "targetDefaults": {
-    "build": {
-      "dependsOn": ["^build"],
-      "inputs": ["default", "^default", "{projectRoot}/src/**/*"]
-    },
-    "test": {
-      "dependsOn": ["build"]
-    }
+      "build": {
+          "dependsOn": ["^build"],
+          "inputs": ["default", "^default", "{projectRoot}/src/**/*"],
+          "cache": true,
+          "outputs": ["{projectRoot}/lib"]
+      },
+      "test": {
+          "dependsOn": ["^test"]
+      }
   }
 }

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

@@ -37,15 +37,12 @@
         "clean:install": "yarn clean:force && yarn git:pull && yarn bootstrap",
         "cli": "node tools/cli",
         "commit": "git cz",
-        "prepare": "husky",
         "compile": "lerna exec -- yarn compile",
         "coverage": "jest --coverage",
         "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info",
         "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",
-        "sort-packages": "node tools/sortPackageJson.mjs",
-        "setBranchEnv": "cross-env REPOSITORY_BRANCH=${1:-$REPOSITORY_BRANCH} PUBLISH_BRANCH=${2:-$PUBLISH_BRANCH}",
         "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",
         "devpublish": "lerna publish prerelease --ignore-scripts --exact",
         "postdevpublish": "git checkout $REPOSITORY_BRANCH",
@@ -63,7 +60,6 @@
         "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
         "jest": "./node_modules/.bin/jest",
         "lerna": "lerna bootstrap",
-        "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",
         "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",
@@ -72,23 +68,27 @@
         "lint:fix": "yarn lint -- --fix",
         "lint:md": "markdownlint",
         "lintx": "yarn lint ./packages/**/src/**/*.ts ./packages-modules/**/src/**/*.ts",
+        "prepare": "husky",
         "prodBuild": "cross-env NODE_ENV=production babel-node --presets es2015 tools/webpack.run",
         "publish": "yarn lernapublish",
         "publish:auto": "yarn lernapublish --yes",
         "publish:force": "yarn publish:forceManual --yes",
         "publish:forceManual": "yarn lernapublish --force-publish=*",
         "publish:push": "yarn prelernapublish && git push origin publish && yarn postlernapublish",
-        "startWeb": "lerna run --scope='{*frontend-server,*backend-server}' --parallel watch --stream",
+        "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",
-        "start:devSSR": "concurrently --names \"BACKEND,FRONTEND\" -c \"bgBlue.bold,bgMagenta.bold\" \"lerna run --scope='*backend-server' watch\" \"lerna run --scope='*frontend-server' start:devSSR\"",
         "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\"",
         "start:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env yarn startWeb",
+        "startWeb": "lerna run --scope='{*frontend-server,*backend-server}' --parallel watch --stream",
         "test": "cross-env ENV_FILE=config/test/test.env jest",
         "posttest": "yarn lint",
         "test:watch": "npm test -- --watch",
         "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",
         "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",
@@ -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",
@@ -324,10 +312,10 @@
         "shelljs": "^0.8.5",
         "simple-git": "^3.14.1",
         "sinon": "^14.0.2",
+        "sort-package-json": "^2.10.0",
         "source-list-map": "^2.0.1",
         "source-map-loader": "^4.0.1",
         "source-map-support": "^0.5.21",
-        "sort-package-json": "^2.10.0",
         "standard-version": "^9.5.0",
         "stream-browserify": "^3.0.0",
         "style-loader": "^3.3.1",

package/src/generators/add-fullstack/files/tools/cli/helpers/util.js CHANGED Viewed

@@ -1,7 +1,7 @@
 const shell = require('shelljs');
 const fs = require('fs');
 const { pascalize, decamelize } = require('humps');
-const { startCase } = require('lodash');
+const { startCase } = require('lodash-es');
 const { BASE_PATH } = require('../config');
 /**

package/src/generators/add-fullstack/files/tools/deploy-cli/updateLernaVersion.js CHANGED Viewed

@@ -24,7 +24,7 @@ function updateLernaJson(filePath, versionArg) {
         lernaConfig.version = `${majorVersion}.${minorVersion}.0`;
         // Update the allowBranch fields
-        const branchName = `devpublish${majorVersion}${minorVersion !== '0' ? '.' + minorVersion : ''}`;
+        const branchName = `devpublish${majorVersion}${minorVersion !== '0' ? '_' + minorVersion : ''}`;
         lernaConfig.command.publish.allowBranch.push(branchName);
         lernaConfig.command.version.allowBranch.push(branchName);