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

package/CHANGELOG.md

@@ -3,82 +3,142 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [6.0.2-alpha.9](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.8...v6.0.2-alpha.9) (2024-08-23)
+## [6.0.6-alpha.1](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.0...v6.0.6-alpha.1) (2024-08-26)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.8](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.7...v6.0.2-alpha.8) (2024-08-23)
+## [6.0.6-alpha.0](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.8...v6.0.6-alpha.0) (2024-08-26)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.7](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.6...v6.0.2-alpha.7) (2024-08-23)
+## [6.0.1-alpha.0](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.8...v6.0.1-alpha.0) (2024-08-26)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.6](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.5...v6.0.2-alpha.6) (2024-08-23)
+## [5.0.6-alpha.8](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.7...v5.0.6-alpha.8) (2024-08-23)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.5](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.4...v6.0.2-alpha.5) (2024-08-23)
+## [5.0.6-alpha.7](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.6...v5.0.6-alpha.7) (2024-08-22)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.4](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.3...v6.0.2-alpha.4) (2024-08-23)
+## [5.0.6-alpha.5](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.4...v5.0.6-alpha.5) (2024-08-18)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.3](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.2...v6.0.2-alpha.3) (2024-08-23)
+## [5.0.6-alpha.4](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.3...v5.0.6-alpha.4) (2024-08-18)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.2](https://github.com/cdmbase/common-stack/compare/v6.0.2-alpha.1...v6.0.2-alpha.2) (2024-08-22)
+## [5.0.6-alpha.3](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.2...v5.0.6-alpha.3) (2024-08-16)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.2-alpha.1](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.9...v6.0.2-alpha.1) (2024-08-22)
+## [5.0.6-alpha.2](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.1...v5.0.6-alpha.2) (2024-08-16)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.0](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.9...v6.0.1-alpha.0) (2024-08-22)
+## [5.0.6-alpha.1](https://github.com/cdmbase/common-stack/compare/v5.0.6-alpha.0...v5.0.6-alpha.1) (2024-08-15)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.9](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.8...v6.0.1-alpha.9) (2024-08-18)
+## [5.0.6-alpha.0](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.10...v5.0.6-alpha.0) (2024-08-15)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.8](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.7...v6.0.1-alpha.8) (2024-08-17)
+## [5.0.5-alpha.0](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.10...v5.0.5-alpha.0) (2024-08-15)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.7](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.6...v6.0.1-alpha.7) (2024-08-17)
+## [5.0.5-alpha.10](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.9...v5.0.5-alpha.10) (2024-08-15)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.6](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.5...v6.0.1-alpha.6) (2024-08-17)
+## [5.0.5-alpha.9](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.8...v5.0.5-alpha.9) (2024-08-13)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.5](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.4...v6.0.1-alpha.5) (2024-08-16)
+## [5.0.5-alpha.7](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.6...v5.0.5-alpha.7) (2024-08-12)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.4](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.3...v6.0.1-alpha.4) (2024-08-16)
+## [5.0.5-alpha.1](https://github.com/cdmbase/common-stack/compare/v5.0.5-alpha.0...v5.0.5-alpha.1) (2024-08-11)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.3](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.2...v6.0.1-alpha.3) (2024-08-16)
+## [5.0.5-alpha.0](https://github.com/cdmbase/common-stack/compare/v0.0.251...v5.0.5-alpha.0) (2024-08-11)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.2](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.1...v6.0.1-alpha.2) (2024-08-16)
+## [5.0.4-alpha.21](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.20...v5.0.4-alpha.21) (2024-08-11)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.1](https://github.com/cdmbase/common-stack/compare/v6.0.1-alpha.0...v6.0.1-alpha.1) (2024-08-16)
+## [5.0.4-alpha.19](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.18...v5.0.4-alpha.19) (2024-08-10)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
 
-## [6.0.1-alpha.0](https://github.com/cdmbase/common-stack/compare/v0.0.251...v6.0.1-alpha.0) (2024-08-15)
+## [5.0.4-alpha.18](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.17...v5.0.4-alpha.18) (2024-08-10)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.17](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.16...v5.0.4-alpha.17) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.16](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.15...v5.0.4-alpha.16) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.15](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.14...v5.0.4-alpha.15) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.14](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.13...v5.0.4-alpha.14) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.13](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.12...v5.0.4-alpha.13) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.12](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.11...v5.0.4-alpha.12) (2024-08-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.11](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.10...v5.0.4-alpha.11) (2024-08-08)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.10](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.9...v5.0.4-alpha.10) (2024-08-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.9](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.8...v5.0.4-alpha.9) (2024-08-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.5](https://github.com/cdmbase/common-stack/compare/v5.0.4-alpha.4...v5.0.4-alpha.5) (2024-08-01)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.4-alpha.0](https://github.com/cdmbase/common-stack/compare/v0.0.251...v5.0.4-alpha.0) (2024-07-24)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.3-alpha.0](https://github.com/cdmbase/common-stack/compare/v0.0.251...v5.0.3-alpha.0) (2024-07-24)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.2-alpha.4](https://github.com/cdmbase/common-stack/compare/v5.0.2-alpha.3...v5.0.2-alpha.4) (2024-07-23)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.2-alpha.3](https://github.com/cdmbase/common-stack/compare/v5.0.2-alpha.2...v5.0.2-alpha.3) (2024-07-23)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [5.0.2-alpha.2](https://github.com/cdmbase/common-stack/compare/v5.0.2-alpha.1...v5.0.2-alpha.2) (2024-07-20)
+
+**Note:** Version bump only for package modal-ui

package/lib/generators/add-backend/files/config.json

@@ -1,6 +1,5 @@
 {
   "modules": [
-    "@container-stack/notification-api-server"
   ],
   "devModules": [
     "@container-stack/mailing-api-server"

package/lib/generators/add-backend/files/package.json

@@ -58,44 +58,13 @@
         "zen:watch": "zen watch -x"
     },
     "resolutions": {
-        "apollo-upload-client": "^16.0.0",
-        "extract-files": "^10.0.0",
         "html-to-text": "^8.0.0"
     },
     "dependencies": {
-        "@adminide-stack/account-api-server": "7.2.6-alpha.13",
-        "@adminide-stack/billing-api-server": "7.2.6-alpha.13",
-        "@adminide-stack/core": "7.2.6-alpha.13",
-        "@adminide-stack/extension-module-server": "7.2.6-alpha.13",
-        "@adminide-stack/git-api-server": "7.2.6-alpha.13",
-        "@adminide-stack/integration-api-server": "7.2.6-alpha.13",
-        "@adminide-stack/marketplace-module-server": "7.2.6-alpha.13",
-        "@adminide-stack/platform-server": "7.2.6-alpha.13",
-        "@adminide-stack/project-mgmt-server": "7.2.6-alpha.13",
-        "@adminide-stack/registry-api-server": "7.2.6-alpha.13",
-        "@adminide-stack/user-auth0-server": "7.2.6-alpha.13",
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@container-stack/core": "5.1.2",
-        "@container-stack/mailing-api": "5.1.2",
-        "@container-stack/notification-api-core": "5.1.2",
-        "@container-stack/notification-api-server": "5.1.2",
-        "@container-stack/territory": "5.1.2",
+        "@common-stack/server-stack": "6.0.6-alpha.0",
         "@remix-run/node": "^2.8.1",
-        "@sentry/node": "~7.24.2",
-        "app-root-path": "^3.0.0",
-        "body-parser": "^1.19.0",
-        "cors": "^2.8.5",
-        "dataloader": "^2.0.0",
-        "dotenv": "^8.2.0",
-        "dotenv-esm": "^16.0.3-4",
-        "envalid": "~7.2.2",
-        "esm": "^3.2.25",
-        "express": "^4.17.1",
-        "graphql-tools": "^9.0.0",
-        "inversify": "^6.0.2",
-        "ioredis": "^5.4.1",
-        "isomorphic-fetch": "^2.2.1",
         "lodash": "^4.17.15",
         "react": "18.2.0",
         "rxjs": "^6.5.3",
@@ -103,13 +72,11 @@
     },
     "devDependencies": {
         "cross-env": "^7.0.3",
+        "esbuild-loader": "^4.2.2",
         "pm2": "^5.2.2",
         "rimraf": "^3.0.2",
         "tsx": "^4.7.0"
     },
-    "engines": {
-        "vscode": "^1.52.1"
-    },
     "typescript": {
         "definition": "dist/main.d.ts"
     }

package/lib/generators/add-backend/files/src/api/root-schema.graphqls

@@ -2,6 +2,7 @@ scalar AnyObject
 scalar Date
 scalar Time
 scalar DateTime
+scalar Timestamp
 scalar URI
 scalar URIInput
 scalar Observable
@@ -83,11 +84,29 @@ interface IResourceUtilizationSettings {
     adminApiNamespace: String
 }
 
+""" 
+ Input geometry of the location.
+ List the `longitude` first and then `latitude`
+  - Validate longitude values are between `-180` and `180`
+  - Validate latitude values are between `-90` and `90`
+"""
+input GeoLocation_Input {
+    type: String  = "Point"
+    coordinates: [Float]
+}
 
 type GeoLocation {
     coordinates: [Float]
 }
 
+enum MailTemplateId {
+    dummy
+}
+
+enum MoleculerCronServiceName {
+    dummy
+}
+
 schema {
     query: Query
     mutation: Mutation

package/lib/generators/add-backend/files/src/config/env-config.ts.template

@@ -1,34 +1,12 @@
 /// <reference path='../../../../typings/index.d.ts' />
-import { str, bool, num, json, cleanEnv } from 'envalid';
+import { str, cleanEnv } from 'envalid';
 
 export const config = cleanEnv(process.env, {
     NODE_ENV: str({ default: 'production', choices: ['production', 'staging', 'development', 'test'] }),
-    NATS_URL: str({ devDefault: 'nats://localhost:4222/' }),
-    NATS_USER: str({ devDefault: 'test' }),
-    NATS_PW: str({ devDefault: 'test' }),
-    MONGO_URL: str({ devDefault: 'mongodb://localhost:27017/sample-stack' }),
-    MONGO_OPTIONS: str({ default: '{}' }),
-    LOG_LEVEL: str({ default: 'info', devDefault: 'trace', choices: ['info', 'debug', 'trace'] }),
-    REDIS_CLUSTER_URL: json({
-        devDefault: '[{"port":6379,"host":"localhost"}]',
-        example: '[{"port":6379,"host":"localhost"}]',
-    }),
-    REDIS_URL: str({ devDefault: 'localhost' }),
-    REDIS_CLUSTER_ENABLED: bool({ devDefault: false }),
-    REDIS_SENTINEL_ENABLED: bool({ devDefault: true }),
-    HEMERA_LOG_LEVEL: str({
-        default: 'info',
-        devDefault: 'info',
-        choices: ['fatal', 'error', 'warn', 'info', 'debug', 'trace'],
-    }),
-    BACKEND_URL: str({ devDefault: __BACKEND_URL__ }),
-    GRAPHQL_URL: str({ devDefault: __GRAPHQL_URL__ }),
-    CLIENT_URL: str({ devDefault: __BACKEND_URL__ }),
     CONNECTION_ID: str({ devDefault: 'CONNECTION_ID' }),
-    MAILGUN_KEY: str(),
-    MAILGUN_DOMAIN: str(),
     NAMESPACE: str({ default: 'default' }),
     ACTIVITY_NAMESPACE: str({ devDefault: 'default' }),
     API_NAMESPACE: str({ devDefault: 'default' }),
     ADMIN_API_NAMESPACE: str({ devDefault: 'default' }),
+    BACKEND_URL: str({ devDefault: __BACKEND_URL__ }),
 });

package/lib/generators/add-backend/files/src/service.ts.template

@@ -1,17 +1,16 @@
 import { logger } from '@cdm-logger/server';
 import * as url from 'url';
-import { StackServer } from './stack-server';
+import modules, { settings } from './modules';
+import { MainStackServer } from '@common-stack/server-stack';
 import { config } from './config';
 
 const { port: serverPort, pathname, hostname } = url.parse(config.BACKEND_URL);
 
 export class Service {
-
-    private app: StackServer;
+    private app: MainStackServer;
 
     public async initialize() {
-
-        this.app = new StackServer();
+        this.app = new MainStackServer(modules, settings);
         await this.app.initialize();
     }
 

package/lib/generators/add-backend/files/tsconfig.json

@@ -1,19 +1,13 @@
 {
-  "extends": "./tsconfig.base.json",
   "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+        "@src/*": ["src/*"]
+    },
     "sourceMap": true,
     "declaration": false,
     "allowSyntheticDefaultImports": true,
-    "rootDirs": ["./src"],
+    "rootDirs": ["./src", "../knexfile.ts"],
     "outDir": "./dist"
-  },
-  "include": [
-    "../../typings/*.d.ts",
-  ],
-  "exclude": [
-    "node_modules",
-    "lib",
-    "dist",
-    "webpack.config.js"
-  ]
+},
 }

package/lib/generators/add-backend/files/webpack.config.js

@@ -5,6 +5,8 @@ const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const nodeExternals = require('webpack-node-externals');
 const NodemonPlugin = require('nodemon-webpack-plugin'); // Ding
 const EnvListPlugin = require('@common-stack/env-list-loader');
+const { writeBackendModuleFile } = require('@common-stack/rollup-vite-utils/lib/utils/utils.cjs');
+const packageConfig = require('./config.json');
 const buildConfig = require('./build.config');
 
 const modulenameExtra = process.env.BUILD_MODULE_TO_INCLUDE ? `${process.env.BUILD_MODULE_TO_INCLUDE}|` : '';
@@ -25,6 +27,12 @@ if (process.env.BUILD_MODULE_TO_INCLUDE) {
     console.log('BUILD_MODULE_TO_INCLUDE is not set.');
 }
 
+try {
+    writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig);
+} catch (e) {
+    console.error(e);
+}
+
 const config = {
     entry: {
         index: (process.env.NODE_ENV !== 'production' ? ['webpack/hot/poll?200'] : []).concat([

package/lib/generators/add-backend/files/webpack.config.mjs

@@ -8,6 +8,7 @@ import nodeExternals from 'webpack-node-externals';
 import Dotenv from 'dotenv-webpack';
 import NodemonPlugin from 'nodemon-webpack-plugin';
 import EnvListPlugin from '@common-stack/env-list-loader';
+import { writeBackendModuleFile } from '@common-stack/rollup-vite-utils/lib/utils/utils.cjs';
 import buildConfig from './build.config.mjs';
 
 const modulenameExtra = process.env.BUILD_MODULE_TO_INCLUDE ? `${process.env.BUILD_MODULE_TO_INCLUDE}|` : '';
@@ -32,6 +33,12 @@ if (process.env.BUILD_MODULE_TO_INCLUDE) {
     console.log('BUILD_MODULE_TO_INCLUDE is not set.');
 }
 
+try {
+    writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig);
+} catch (e) {
+    console.error(e);
+}
+
 const config = {
     entry: {
         // index: (process.env.NODE_ENV !== 'production' ? ['webpack/hot/poll?200'] : []).concat([

package/lib/generators/add-browser-package/files/package.json

@@ -29,7 +29,7 @@
     },
     "peerDependencies": {
         "@cdm-logger/client": "*",
-        "@common-stack/client-react": "6.0.2-alpha.2",
+        "@common-stack/client-react": "6.0.6-alpha.0",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",

package/lib/generators/add-frontend/templates/Dockerfile

@@ -1,5 +1,5 @@
 # The official nodejs docker image
-FROM node:20:16-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

@@ -81,8 +81,8 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/frontend-stack-react": "6.0.2-alpha.2",
-        "@common-stack/rollup-vite-utils": "6.0.2-alpha.2",
+        "@common-stack/frontend-stack-react": "6.0.6-alpha.0",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.0",
         "@remix-run/dev": "^2.8.1",
         "@remix-run/serve": "^2.8.1",
         "cross-env": "^7.0.3",

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

@@ -9,7 +9,7 @@ import { i18nInternationalizationPlugin } from '@common-stack/rollup-vite-utils/
 import { performCopyOperations } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/configLoader.js';
 import { loadEnvConfig } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/envLoader.js';
 import { cjsInterop } from 'vite-plugin-cjs-interop';
-import { merge } from 'lodash-es';
+import { mergeWith } from 'lodash-es';
 import config from './app/cde-webconfig.json' assert { type: 'json' };
 
 // This installs globals such as "fetch", "Response", "Request" and "Headers".
@@ -73,5 +73,5 @@ export default defineConfig(({ isSsrBuild }) => {
     };
 
     // Deep merge custom Vite config from config.json
-    return merge(viteConfig, config.viteConfig);
+    return mergeWith(viteConfig, config.viteConfig);
 });

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

@@ -2,6 +2,4 @@ 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/package.json

@@ -113,8 +113,6 @@
         "react-native-gesture-handler": "~2.12.0"
     },
     "dependencies": {
-        "dataloader": "^2.1.0",
-        "framer-motion": "^6.2.6",
         "graphql": "^16.0.0",
         "graphql-tag": "^2.12.6"
     },
@@ -147,7 +145,8 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.2-alpha.2",
+        "@common-stack/env-list-loader": "5.0.6-alpha.3",
+        "@common-stack/generate-plugin": "6.0.6-alpha.0",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -161,8 +160,8 @@
         "@graphql-codegen/typescript-resolvers": "^4.0.6",
         "@loadable/babel-plugin": "^5.13.2",
         "@loadable/webpack-plugin": "^5.15.2",
-        "@open-wc/building-rollup": "^2.0.2",
-        "@pmmmwh/react-refresh-webpack-plugin": "^0.5.8",
+        "@nx-aws-plugin/nx-aws-cache": "^3.2.2",
+        "@nx/workspace": "^19.5.1",
         "@redux-devtools/core": "^3.13.1",
         "@redux-devtools/dock-monitor": "^3.0.1",
         "@redux-devtools/log-monitor": "^4.0.1",
@@ -256,7 +255,7 @@
         "html-loader": "^4.2.0",
         "html-webpack-plugin": "^5.5.0",
         "http-proxy-middleware": "^2.0.6",
-        "husky": "^8.0.2",
+        "husky": "^9.1.5",
         "ignore-loader": "^0.1.2",
         "ip": "^1.1.8",
         "isomorphic-style-loader": "^5.3.2",

package/lib/generators/add-fullstack/files/rollup.config.base.mjs

@@ -7,8 +7,12 @@ import { copy } from '@web/rollup-plugin-copy';
 import modifyLibFilesPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginModifyLibFiles.js';
 import generateJsonFromObject from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginGenerateJson.js';
 import addJsExtensionToImportsPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginAddJsExtension.js';
-// Define any additional plugins specific to this bundle
-const additionalPlugins = [copy({ patterns: '**/cdm-locales/**/*', rootDir: './src' })];
+import { ignoreCssUrlPlugin } from '@common-stack/rollup-vite-utils/lib/rollup/pluginIgnore.js';
+
+// Define any additional plugins specific to this bundle 
+const additionalPlugins = [
+    copy({ patterns: ['**/cdm-locales/**/*', '**/styles/**/*'], rootDir: './src' }),
+];
 
 function deepMergeConfigs(baseConfig, specificConfig) {
     const mergedConfig = { ...baseConfig, ...specificConfig };
@@ -35,6 +39,7 @@ const baseConfig = {
             excludeImports: ['@emotion/react/jsx-runtime'],
         }),
         typescript(), // TypeScript at the top as per best practices
+        ignoreCssUrlPlugin(),
         modifyLibFilesPlugin({
             include: ['**/**/compute.js'], // Adjust to target specific files or patterns
             outputDir: 'lib', // Ensure this matches your actual output directory

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

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const { exec } = require('child_process');
 
 function updateLernaJson(filePath, versionArg) {
     // Read the existing lerna.json file
@@ -23,18 +24,36 @@ function updateLernaJson(filePath, versionArg) {
         const minorVersion = versionComponents.length > 1 ? versionComponents[1] : '0';
         lernaConfig.version = `${majorVersion}.${minorVersion}.0`;
 
-        // Update the allowBranch fields
-        const branchName = `devpublish${majorVersion}${minorVersion !== '0' ? '_' + minorVersion : ''}`;
+        // Update the allowBranch fields with dash instead of dot
+        const branchName = `devpublish${majorVersion}${minorVersion !== '0' ? '-' + minorVersion : ''}`;
+        const branchDevelopName = `develop${majorVersion}${minorVersion !== '0' ? '-' + minorVersion : ''}`;
+
         lernaConfig.command.publish.allowBranch.push(branchName);
         lernaConfig.command.version.allowBranch.push(branchName);
+        lernaConfig.command.version.allowBranch.push(branchDevelopName);
 
         // Write the updated lerna.json file
-        fs.writeFile(filePath, JSON.stringify(lernaConfig, null, 2), 'utf8', writeErr => {
+        fs.writeFile(filePath, JSON.stringify(lernaConfig, null, 2), 'utf8', (writeErr) => {
             if (writeErr) {
                 console.error(`Error writing file: ${writeErr}`);
                 return;
             }
-            console.log(`lerna.json updated successfully to version ${lernaConfig.version} with branch ${branchName}`);
+            console.log(
+                `lerna.json updated successfully to version ${lernaConfig.version} with branches ${branchName} and ${branchDevelopName}`,
+            );
+
+            // Run prettier to format the updated lerna.json file
+            exec(`npx prettier --write ${filePath}`, (execErr, stdout, stderr) => {
+                if (execErr) {
+                    console.error(`Error running prettier: ${execErr}`);
+                    return;
+                }
+                if (stderr) {
+                    console.error(`Prettier stderr: ${stderr}`);
+                }
+                console.log(`Prettier stdout: ${stdout}`);
+                console.log('lerna.json formatted successfully.');
+            });
         });
     });
 }
@@ -48,4 +67,4 @@ if (!filePath || !versionArg || !versionArg.match(/^v\d+(\.\d+)?$/)) {
     process.exit(1);
 }
 
-updateLernaJson(filePath, versionArg);
+updateLernaJson(filePath, versionArg);

package/lib/generators/add-fullstack/files/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "ES2020",
+    "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "node",
     "esModuleInterop": true,
@@ -16,7 +16,7 @@
     "pretty": true,
     "removeComments": false,
     "lib": [
-      "ES2020",
+      "ES2022",
       "dom",
       "esnext.asynciterable"
     ]

package/lib/generators/add-moleculer/files/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20:16-alpine
+FROM node:20.16-alpine
 
 # Copy package.json only to temp folder, install its dependencies,
 # set workdir and copy the dependnecies there

package/lib/generators/add-moleculer/files/package.json

@@ -25,11 +25,11 @@
         "watch": "npm run start:dev"
     },
     "dependencies": {
-        "@common-stack/client-core": "6.0.2-alpha.2",
-        "@common-stack/core": "6.0.2-alpha.2",
-        "@common-stack/server-core": "6.0.2-alpha.2",
-        "@common-stack/server-stack": "6.0.2-alpha.2",
-        "@common-stack/store-mongo": "6.0.2-alpha.2",
+        "@common-stack/client-core": "5.0.6-alpha.3",
+        "@common-stack/core": "5.0.6-alpha.3",
+        "@common-stack/server-core": "6.0.6-alpha.0",
+        "@common-stack/server-stack": "6.0.6-alpha.0",
+        "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/lib/generators/add-server-package/files/package.json

@@ -62,9 +62,9 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@cdm-logger/server": ">=9.0.3",
-        "@common-stack/core": "6.0.2-alpha.2",
-        "@common-stack/server-core": "6.0.2-alpha.2",
-        "@common-stack/store-mongo": "6.0.2-alpha.2",
+        "@common-stack/core": "5.0.6-alpha.3",
+        "@common-stack/server-core": "6.0.6-alpha.0",
+        "@common-stack/store-mongo": "5.0.6-alpha.3",
         "@container-stack/mailing-api": ">=0.0.35-alpha.1",
         "@vscode-alt/monaco-editor": "^0.21.4",
         "inversify": "^5.0.1",