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

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

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

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

@@ -0,0 +1,27 @@
+const merge = require('merge')
+const baseConfig = require('./jest.config.base');
+const mongodbConfig = require('./jest.config.mongodb')
+module.exports = merge.recursive(
+    baseConfig,
+    mongodbConfig,
+    {
+        globals: {
+
+        }
+    }, {
+    moduleDirectories: [
+        "node_modules",
+        "packages/adminide-core",
+    ],
+}
+    // https://baltuta.eu/posts/typescript-lerna-monorepo-more-tools 
+    // {
+    //     roots: ['<rootDir>'],
+    //     projects: [
+    //         '<rootDir>/packages/ui',
+    //         '<rootDir>/packages/api',
+    //         '<rootDir>/packages/diceroll'
+    //     ],
+    // }
+
+);

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

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

package/src/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/src/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/src/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",
         "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",
@@ -159,7 +159,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.1",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -324,10 +324,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

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

@@ -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/src/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',
+};

package/src/generators/add-fullstack/files/tools/rollup/rollupPluginGenerateJson.mjs

@@ -0,0 +1,48 @@
+import { promisify } from 'util';
+import glob from 'glob';
+import fs from 'fs';
+import path from 'path';
+
+const globPromise = promisify(glob.glob); // Make sure to call .glob here
+
+export default function generateJsonFromSpecificFiles(options = {}) {
+    const {
+        pattern = '**/**/compute.js', // Pattern to match files
+        dist = 'lib', // Default output directory
+        outputFile = 'routes.json', // Output filename
+    } = options;
+
+    return {
+        name: 'aggregate-compute-routes',
+        async writeBundle() { // Changed from generateBundle to writeBundle
+            const files = await globPromise(path.join(dist, pattern), { absolute: true }); // Ensure paths are absolute
+            let allFilteredRoutes = [];
+
+            for (const file of files) {
+                try {
+                    // Dynamically import the JS file assuming it exports filteredRoutes
+                    const module = await import(file); // file is already absolute
+                    if (module.filteredRoutes) {
+                        const newRoutes = module.filteredRoutes.map((filteredRoute) => {
+                            let routConfig = Object.values(filteredRoute)[0];
+                            return { [routConfig.path]: routConfig };
+                        });
+                        allFilteredRoutes.push(...newRoutes);
+                    }
+                } catch (error) {
+                    this.warn(`Error importing ${file}: ${error}`);
+                }
+            }
+
+            // Ensure the dist directory exists
+            if (!fs.existsSync(dist)) {
+                fs.mkdirSync(dist, { recursive: true });
+            }
+
+            // Specify the output file path and write the aggregated filteredRoutes to a JSON file
+            const outputPath = path.join(dist, outputFile);
+            fs.writeFileSync(outputPath, JSON.stringify(allFilteredRoutes, null, 2), 'utf8');
+            console.log(`Aggregated filtered routes have been written to ${outputPath}`);
+        },
+    };
+}