@common-stack/generate-plugin 5.0.6-alpha.5 → 5.0.6-alpha.8

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

@@ -52,114 +52,55 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@admin-layout/assets": "7.3.8-alpha.0",
-        "@admin-layout/icons": "7.3.8-alpha.0",
-        "@adminide-stack/account-api-browser": "7.3.8-alpha.0",
-        "@adminide-stack/billing-api-browser": "7.2.6-alpha.13",
-        "@adminide-stack/core": "7.2.6-alpha.13",
-        "@adminide-stack/extension-api": "7.2.6-alpha.13",
-        "@adminide-stack/extension-module-browser": "7.2.6-alpha.13",
-        "@adminide-stack/git-api-browser": "7.2.6-alpha.13",
-        "@adminide-stack/integration-api-client": "7.2.6-alpha.13",
-        "@adminide-stack/marketplace-module-browser": "7.2.6-alpha.13",
-        "@adminide-stack/platform-browser": "7.2.6-alpha.13",
-        "@adminide-stack/project-mgmt-browser": "7.2.6-alpha.13",
-        "@adminide-stack/react-shared-components": "7.2.6-alpha.13",
-        "@adminide-stack/registry-api-browser": "7.2.6-alpha.13",
-        "@adminide-stack/user-auth0-browser": "7.2.6-alpha.13",
-        "@adminide-stack/user-auth0-server": "7.2.6-alpha.13",
-        "@ant-design/pro-layout": "^7.6.1",
-        "@ant-design/static-style-extract": "^1.0.2",
-        "@apollo/client": "^3.9.0",
-        "@cdm-logger/client": "^9.0.3",
-        "@cdm-logger/server": "^9.0.3",
-        "@cdmbase/redux-data-router": "^1.0.10",
-        "@common-stack/client-core": "5.0.6-alpha.3",
-        "@common-stack/client-react": "5.0.6-alpha.3",
-        "@common-stack/components-pro": "5.0.6-alpha.3",
-        "@common-stack/core": "5.0.6-alpha.3",
-        "@common-stack/remix-router-redux": "5.0.6-alpha.3",
-        "@common-stack/server-core": "5.0.6-alpha.3",
-        "@container-stack/ssh-keygen-server-module": "0.0.36-alpha.23",
+        "@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/css": "^11.10.0",
         "@emotion/react": "^11.10.4",
         "@emotion/server": "^11.10.0",
-        "@emotion/styled": "^11.10.4",
         "@files-stack/core": "3.0.2",
-        "@loadable/component": "^5.15.2",
-        "@loadable/server": "^5.15.2",
         "@react-icons/all-files": "^4.1.0",
-        "@reduxjs/toolkit": "^2.2.1",
-        "@remix-run/express": "^2.8.1",
-        "@remix-run/node": "^2.8.1",
-        "@remix-run/react": "^2.8.1",
-        "@sentry/browser": "~5.11.2",
-        "antd": "^5.14.0",
-        "apollo-link-debounce": "^3.0.0",
-        "apollo-link-logger": "^2.0.0",
-        "apollo-server-errors": "^3.3.1",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
-        "cookie-parser": "^1.4.6",
-        "cors": "^2.8.5",
-        "cross-fetch": "^4.0.0",
-        "dotenv": "^8.2.0",
-        "envalid": "~7.2.2",
-        "error-stack-parser": "^2.0.4",
-        "express": "^4.18.2",
         "glob-all": "^3.3.1",
-        "graphql": "^15.0.0",
-        "graphql-tag": "^2.11.0",
-        "graphql-ws": "^5.11.2",
-        "history": "^5.0.0",
-        "i18next": "^23.10.1",
         "immutability-helper": "^3.0.1",
-        "inversify": "^6.0.2",
-        "ioredis": "^5.4.1",
         "is-plain-obj": "^3.0.0",
-        "isbot": "^4.1.0",
         "isomorphic-fetch": "^2.2.1",
-        "js-cookie": "^2.2.1",
         "lodash": "^4.17.15",
         "lodash-es": "^4.17.21",
         "minimatch": "^5.0.0",
         "moment": "2.29.1",
-        "prettysize": "^0.1.0",
-        "prop-types": "^15.8.1",
         "ramda": "^0.29.1",
-        "react": "18.2.0",
-        "react-cookie": "^4.0.1",
-        "react-device-detect": "^2.2.2",
-        "react-dom": "18.2.0",
         "react-ga4": "^2.1.0",
         "react-helmet": "^6.1.0",
         "react-helmet-async": "^1.3.0",
-        "react-i18next": "^14.1.0",
         "react-icons": "~4.3.1",
         "react-icons-converter": "^1.1.4",
-        "react-redux": "^9.1.1",
         "react-transition-group": "^4.3.0",
         "react-use": "^17.2.4",
-        "redux-logger": "^3.0.6",
-        "redux-observable": "^1.2.0",
-        "redux-persist": "^6.0.0",
-        "redux-persist-transform-filter": "^0.0.20",
-        "reflect-metadata": "^0.1.13",
         "reselect": "^4.0.0",
         "rxjs": "^6.5.3",
         "rxjs-compat": "^6.5.3",
         "rxjs-hooks": "^0.5.2",
-        "serialize-javascript": "^6.0.0",
-        "ts-deepmerge": "^7.0.0",
-        "ts-invariant": "^0.10.3",
-        "universal-cookie-express": "^4.0.1",
         "vite-env-only": "^2.2.1"
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/frontend-stack-react": "5.0.6-alpha.4",
-        "@common-stack/rollup-vite-utils": "5.0.6-alpha.3",
+        "@common-stack/frontend-stack-react": "5.0.6-alpha.7",
+        "@common-stack/rollup-vite-utils": "5.0.6-alpha.7",
         "@remix-run/dev": "^2.8.1",
         "@remix-run/serve": "^2.8.1",
         "cross-env": "^7.0.3",

package/lib/generators/add-frontend/templates/postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

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

@@ -0,0 +1,12 @@
+import type { Config } from 'tailwindcss'
+
+export default {
+  content: [
+    "./src/**/{**,.client,.server}/**/*.{js,jsx,ts,tsx}",
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+} satisfies Config
+

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

@@ -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/lib/generators/add-fullstack/files/jest-mongodb-config.js

@@ -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/lib/generators/add-fullstack/files/jest.config.base.js

@@ -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/lib/generators/add-fullstack/files/jest.config.base.mjs

@@ -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/lib/generators/add-fullstack/files/jest.config.mongodb.mjs

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

package/lib/generators/add-fullstack/files/lint-staged.config.js

@@ -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/lib/generators/add-fullstack/files/nx.json

@@ -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/lib/generators/add-fullstack/files/package.json

@@ -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,32 +102,20 @@
             "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",
         "framer-motion": "^6.2.6",
-        "graphql": "^15.0.0",
+        "graphql": "^16.0.0",
         "graphql-tag": "^2.12.6"
     },
     "devDependencies": {
@@ -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/lib/generators/add-fullstack/files/tools/cli/helpers/util.js

@@ -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/lib/generators/add-fullstack/files/tools/deploy-cli/updateLernaVersion.js

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

package/lib/generators/add-fullstack/files/tools/deploy-cli/updateYamlSettings.js

@@ -3,6 +3,9 @@ const fs = require('fs');
 
 // Function to update the configuration file
 function updateConfiguration(filePath, newVersion) {
+    // Convert the version from vMajor.Minor to vMajor-Minor for URL
+    const versionForUrl = newVersion.replace('.', '-');
+
     // Read the configuration file
     fs.readFile(filePath, 'utf8', (err, data) => {
         if (err) {
@@ -10,24 +13,20 @@ function updateConfiguration(filePath, newVersion) {
             return;
         }
 
-        // Replace VERSION and CONNECTION_ID with newVersion
+        // Replace only the specific VERSION and CONNECTION_ID fields, preserving leading whitespace
         let updatedData = data
-            .replace(/VERSION: v\d+(\.\d+)?/g, `VERSION: ${newVersion}`)
-            .replace(/CONNECTION_ID: v\d+(\.\d+)?/g, `CONNECTION_ID: ${newVersion}`);
+            .replace(/^(\s*)VERSION:\s*v\d+(\.\d+)?/gm, `$1VERSION: ${newVersion}`)
+            .replace(/^(\s*)CONNECTION_ID:\s*v\d+(\.\d+)?/gm, `$1CONNECTION_ID: ${newVersion}`);
 
-        // Update CLIENT_URL
+        // Update CLIENT_URL, preserving leading whitespace, and replacing the version with the hyphenated version
         updatedData = updatedData.replace(
-            /CLIENT_URL: "https:\/\/[\w-]+-v\d+(\.\d+)?\.[\w-]+(\.\w+)?\/?"/g,
-            (match) => {
-                const domainParts = match.match(/https:\/\/[\w-]+-v\d+(\.\d+)?(\.[\w-]+)+/g);
-                if (domainParts && domainParts.length > 0) {
-                    const domain = domainParts[0];
-                    const newDomain = domain.replace(/-v\d+(\.\d+)?/, `-${newVersion}`);
-                    return match.replace(domain, newDomain);
-                }
-                return match;
+            /^(\s*)CLIENT_URL:\s*"https:\/\/([\w-]+)-v\d+(-\d+)?(\.[\w-]+(\.\w+)?)\/?"/gm,
+            (match, p1, p2, p3, p4) => {
+                const newDomain = `${p2}-${versionForUrl}${p4}`;
+                return `${p1}CLIENT_URL: "https://${newDomain}"`;
             },
         );
+
         // Write the updated configuration back to the file
         fs.writeFile(filePath, updatedData, 'utf8', (err) => {
             if (err) {
@@ -35,7 +34,7 @@ function updateConfiguration(filePath, newVersion) {
                 return;
             }
             console.log(`Configuration file updated successfully.`);
-            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`)
+            console.log(`Manually update CLIENT_URL in values-dev.yaml and values-prod.yaml`);
         });
     });
 }
@@ -45,7 +44,7 @@ const filePath = process.argv[2];
 const versionArg = process.argv[3];
 
 if (!filePath || !versionArg || !versionArg.match(/^v\d+(\.\d+)?$/)) {
-    console.error('Usage: node updateConfiguration.js v[Major].[Minor]');
+    console.error('Usage: node updateConfiguration.js <path-to-config> v[Major].[Minor]');
     process.exit(1);
 }
 

package/lib/generators/add-fullstack/files/tools/prettier.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+    bracketSpacing: true,
+    printWidth: 120,
+    singleQuote: true,
+    tabWidth: 4,
+    trailingComma: 'all',
+    endOfLine: 'lf',
+};