@common-stack/generate-plugin 5.0.5-alpha.7 → 5.0.5-alpha.9

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [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
+
 ## [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

package/lib/constants/index.cjs

@@ -0,0 +1,2 @@
+'use strict';const FRAMEWORK_ANTUI = 'antui';
+const FRAMEWORK_CHAKRAUI = 'chakraui';exports.FRAMEWORK_ANTUI=FRAMEWORK_ANTUI;exports.FRAMEWORK_CHAKRAUI=FRAMEWORK_CHAKRAUI;//# sourceMappingURL=index.cjs.map

package/lib/constants/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../../src/constants/index.ts"],"sourcesContent":[null],"names":[],"mappings":"aAAO,MAAM,eAAe,GAAG,QAAQ;AAChC,MAAM,kBAAkB,GAAG"}

package/lib/constants/index.d.ts

@@ -0,0 +1,2 @@
+export declare const FRAMEWORK_ANTUI = "antui";
+export declare const FRAMEWORK_CHAKRAUI = "chakraui";

package/lib/constants/index.mjs

@@ -0,0 +1,2 @@
+const FRAMEWORK_ANTUI = 'antui';
+const FRAMEWORK_CHAKRAUI = 'chakraui';export{FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI};//# sourceMappingURL=index.mjs.map

package/lib/constants/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":["../../src/constants/index.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAO,MAAM,eAAe,GAAG,QAAQ;AAChC,MAAM,kBAAkB,GAAG"}

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

@@ -0,0 +1,11 @@
+{
+  "modules": [
+    "@container-stack/notification-api-server"
+  ],
+  "devModules": [
+    "@container-stack/mailing-api-server"
+  ],
+  "externalModules": [
+    "@container-stack/territory"
+  ]
+}

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

@@ -1,5 +1,5 @@
 {
-    "name": "adminide-stack-backend-server",
+    "name": "sample-stack-backend-server",
     "version": "3.1.1-alpha.5",
     "private": true,
     "description": "Starter kit for apollo server using webpack and typescript",

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

@@ -6,6 +6,8 @@ const nodeExternals = require('webpack-node-externals');
 const NodemonPlugin = require('nodemon-webpack-plugin'); // Ding
 const EnvListPlugin = require('@common-stack/env-list-loader');
 const buildConfig = require('./build.config');
+const { writeBackendModuleFile } = require('@common-stack/rollup-vite-utils/lib/utils/utils.cjs');
+const packageConfig = require('./config.json');
 
 const modulenameExtra = process.env.BUILD_MODULE_TO_INCLUDE ? `${process.env.BUILD_MODULE_TO_INCLUDE}|` : '';
 let modulenameRegex;
@@ -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-frontend/generator.cjs

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_FRAMEWORK = 'antui';
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),index$1=require('../../constants/index.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_FRAMEWORK = index$1.FRAMEWORK_ANTUI;
 function addFrontendGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const basePath = process.cwd();
@@ -18,10 +18,26 @@ function addFrontendGenerator(tree, options) {
         devkit.generateFiles(tree, path__namespace.join(__dirname, 'frameworks', framework), projectSrc, options);
         devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
             packageJson['name'] = projectName;
+            if (framework === index$1.FRAMEWORK_ANTUI) {
+                packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
+            }
+            else if (framework === index$1.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";
+            }
             return packageJson;
         });
         devkit.updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
             configJson['uiFramework'] = framework;
+            if (framework === index$1.FRAMEWORK_ANTUI) {
+                configJson['modules'].push("@admin-layout/ant-design-pro");
+            }
+            else if (framework === index$1.FRAMEWORK_CHAKRAUI) {
+                configJson['modules'].push("@admin-layout/chakra-design-pro");
+            }
             return configJson;
         });
         yield devkit.formatFiles(tree);

package/lib/generators/add-frontend/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["resetProject","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKA,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAEZ,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAAA,kBAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAAC,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACHA,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","resetProject","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","formatFiles"],"mappings":"qkBAMA,MAAM,iBAAiB,GAAGA,uBAAe,CAAC;AAEpB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAAC,kBAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAAC,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,IAAI,SAAS,KAAKJ,uBAAe,EAAE;gBAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;gBACvE,WAAW,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,GAAG,QAAQ,CAAC;gBAC/D,WAAW,CAAC,cAAc,CAAC,CAAC,wCAAwC,CAAC,GAAG,QAAQ,CAAC;aACpF;AAAM,iBAAA,IAAI,SAAS,KAAKK,0BAAkB,EAAE;gBACzC,WAAW,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,QAAQ,CAAC;gBAC1E,WAAW,CAAC,cAAc,CAAC,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC;gBAClE,WAAW,CAAC,cAAc,CAAC,CAAC,2CAA2C,CAAC,GAAG,QAAQ,CAAC;aACvF;AAED,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACHD,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,IAAI,SAAS,KAAKJ,uBAAe,EAAE;gBAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC9D;AAAM,iBAAA,IAAI,SAAS,KAAKK,0BAAkB,EAAE;gBACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;aACjE;AAED,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

package/lib/generators/add-frontend/generator.mjs

@@ -1,4 +1,4 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {resetProject}from'../../utils/index.mjs';const DEFAULT_FRAMEWORK = 'antui';
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {resetProject}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI}from'../../constants/index.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const basePath = process.cwd();
@@ -18,10 +18,26 @@ function addFrontendGenerator(tree, options) {
         generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectSrc, options);
         updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
             packageJson['name'] = projectName;
+            if (framework === FRAMEWORK_ANTUI) {
+                packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
+            }
+            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";
+            }
             return packageJson;
         });
         updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
             configJson['uiFramework'] = framework;
+            if (framework === FRAMEWORK_ANTUI) {
+                configJson['modules'].push("@admin-layout/ant-design-pro");
+            }
+            else if (framework === FRAMEWORK_CHAKRAUI) {
+                configJson['modules'].push("@admin-layout/chakra-design-pro");
+            }
             return configJson;
         });
         yield formatFiles(tree);

package/lib/generators/add-frontend/generator.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"uKAKA,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAEZ,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAA,YAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"kPAMA,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEpB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAA,YAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,IAAI,SAAS,KAAK,eAAe,EAAE;gBAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;gBACvE,WAAW,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,GAAG,QAAQ,CAAC;gBAC/D,WAAW,CAAC,cAAc,CAAC,CAAC,wCAAwC,CAAC,GAAG,QAAQ,CAAC;aACpF;AAAM,iBAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;gBACzC,WAAW,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,QAAQ,CAAC;gBAC1E,WAAW,CAAC,cAAc,CAAC,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC;gBAClE,WAAW,CAAC,cAAc,CAAC,CAAC,2CAA2C,CAAC,GAAG,QAAQ,CAAC;aACvF;AAED,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,IAAI,SAAS,KAAK,eAAe,EAAE;gBAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC9D;AAAM,iBAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;gBACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;aACjE;AAED,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

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

@@ -1,58 +1,50 @@
 {
-    "commonPaths": {
-    },
-    "copyOperations": [
+  "commonPaths": {
+    "appPath": "app",
+    "frontendStackPath": "frontend-stack-react"
+  },
+  "copyOperations": [
+    {
+      "packageName": "@common-stack/frontend-stack-react",
+      "destPath": "$.commonPaths.frontendStackPath",
+      "generateModule": true
+    }
+  ],
+  "i18n": {
+    "enabled": true,
+    "fallbackLng": "en",
+    "supportedLngs": [
+      "en",
+      "de",
+      "es"
     ],
-    "i18n": {
-      "enabled": true,
-      "fallbackLng": "en",
-      "supportedLngs": [
-        "en",
-        "de",
-        "es"
-      ],
-      "defaultNS": "common",
-      "react": {
-        "useSuspense": false
-      },
-      "backend": {
-        "loadPath": "/cdm-locales/{{lng}}/{{ns}}.json",
-        "loadServerPath": "./public/cdm-locales/{{lng}}/{{ns}}.json"
-      },
-      "packages": [
-      ]
+    "defaultNS": "common",
+    "react": {
+      "useSuspense": false
     },
-    "modules": [
-      "@admin-layout/ant-design-pro",
-      "@adminide-stack/account-api-browser",
-      "@adminide-stack/extension-module-browser",
-      "@adminide-stack/user-auth0-browser",
-      "@adminide-stack/user-auth0-browser-ant",
-      "@adminide-stack/billing-api-browser",
-      "@adminide-stack/registry-api-browser",
-      "@adminide-stack/git-api-browser",
-      "@adminide-stack/project-mgmt-browser",
-      "@adminide-stack/integration-api-client",
-      "@adminide-stack/marketplace-module-browser"
-    ],
-    "paths": {
-      "lifecycleMiddleware": "@adminide-stack/platform-client/lib/middleware/lifecycleMiddleware.js"
+    "backend": {
+      "loadPath": "/cdm-locales/{{lng}}/{{ns}}.json",
+      "loadServerPath": "./public/cdm-locales/{{lng}}/{{ns}}.json"
     },
-    "buildConfig": {
-      "__CLIENT__": false,
-      "__SERVER__": true,
-      "__DEV__": false,
-      "__TEST__": false,
-      "__CDN_URL__": "",
-      "__GRAPHQL_URL__": "http://localhost:8080/graphql",
-      "__DEBUGGING__": false,
-      "__SSR__": true,
-      "__API_URL__": "/graphql",
-      "__FRONTEND_BUILD_DIR__": "./dist/client",
-      "__WEB_DEV_SERVER_PORT__": 3000,
-      "__GRAPHQL_ENDPOINT__": "/graphql",
-      "__LOCAL_SERVER_HOST__": "localhost",
-      "__BACKEND_URL__": "http://localhost:3000"
-    }
+    "packages": [
+    ]
+  },
+  "modules": [
+  ],
+  "buildConfig": {
+    "__CLIENT__": false,
+    "__SERVER__": true,
+    "__DEV__": false,
+    "__TEST__": false,
+    "__CDN_URL__": "",
+    "__GRAPHQL_URL__": "http://localhost:8080/graphql",
+    "__DEBUGGING__": false,
+    "__SSR__": true,
+    "__API_URL__": "/graphql",
+    "__FRONTEND_BUILD_DIR__": "./dist/client",
+    "__WEB_DEV_SERVER_PORT__": 3000,
+    "__GRAPHQL_ENDPOINT__": "/graphql",
+    "__LOCAL_SERVER_HOST__": "localhost",
+    "__BACKEND_URL__": "http://localhost:3000"
   }
-  
+}

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

@@ -1,6 +1,6 @@
 {
-    "name": "adminide-stack-frontend-server",
-    "version": "3.1.1-alpha.6",
+    "name": "sample-stack-frontend-server",
+    "version": "1.0.0",
     "private": true,
     "description": "Sample Client server",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
@@ -52,8 +52,6 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@admin-layout/ant-design-pro": "7.3.8-alpha.29",
-        "@admin-layout/ant-ui": "7.3.8-alpha.28",
         "@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",

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

@@ -9,7 +9,8 @@ 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 config from './app/cde-webconfig.json'  assert { type: 'json' };
+import { merge } from 'lodash-es';
+import config from './app/cde-webconfig.json' assert { type: 'json' };
 
 // This installs globals such as "fetch", "Response", "Request" and "Headers".
 installGlobals();
@@ -20,7 +21,7 @@ export default defineConfig(({ isSsrBuild }) => {
 
     const dotEnvResult = loadEnvConfig(directoryName);
 
-    return {
+    const viteConfig = {
         define: {
             __ENV__: JSON.stringify(dotEnvResult?.parsed),
             ...Object.assign(
@@ -38,7 +39,7 @@ export default defineConfig(({ isSsrBuild }) => {
                 namespaceResolution: 'basename',
             }),
             cjsInterop({
-                dependencies:["@apollo/client"]
+                dependencies: ['@apollo/client'],
             }),
             remix({
                 appDirectory: 'src',
@@ -48,23 +49,29 @@ export default defineConfig(({ isSsrBuild }) => {
                     }
                     const metaJson = await import('./app/sync-meta.json').catch(() => null);
                     return defineRoutes((routeFn) => {
-                        defineRoutesConfig(routeFn, {
-                            routesFileName: 'routes.json',
-                            packages: config.modules,
-                            paths: config.paths,
-                            rootPath: resolve(directoryName, '../..'),
-                        }, metaJson);
+                        defineRoutesConfig(
+                            routeFn,
+                            {
+                                routesFileName: 'routes.json',
+                                packages: config.modules,
+                                paths: config.paths,
+                                rootPath: resolve(directoryName, '../..'),
+                            },
+                            metaJson,
+                        );
                     });
                 },
             }),
             tsconfigPaths({ ignoreConfigErrors: true }),
         ],
         resolve: {
-            // preserveSymlinks: true,
             alias: {
                 '@app': resolve(__dirname, 'app'),
                 '@src': resolve(__dirname, 'src'),
             },
         },
     };
+
+    // Deep merge custom Vite config from config.json
+    return merge(viteConfig, config.viteConfig);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "5.0.5-alpha.7",
+    "version": "5.0.5-alpha.9",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -24,5 +24,5 @@
         "access": "public"
     },
     "generators": "./generators.json",
-    "gitHead": "9e23ac985f134db9964886cec72cc8f6a6265ca5"
+    "gitHead": "d7d4bad490dc8927f3a740c24d3532fef22d31fc"
 }

package/src/constants/index.ts

@@ -0,0 +1,2 @@
+export const FRAMEWORK_ANTUI = 'antui';
+export const FRAMEWORK_CHAKRAUI = 'chakraui';

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

@@ -2,8 +2,9 @@ import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson }
 import * as path from 'path';
 import { AddFrontendGeneratorSchema } from './schema';
 import { resetProject } from '../../utils';
+import { FRAMEWORK_ANTUI, FRAMEWORK_CHAKRAUI } from '../../constants';
 
-const DEFAULT_FRAMEWORK = 'antui';
+const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 
 export async function addFrontendGenerator(tree: Tree, options: AddFrontendGeneratorSchema) {
     const basePath = process.cwd();
@@ -27,10 +28,26 @@ export async function addFrontendGenerator(tree: Tree, options: AddFrontendGener
     generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectSrc, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
         packageJson['name'] = projectName;
+        if (framework === FRAMEWORK_ANTUI) {
+            packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
+            packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
+            packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
+        } 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";
+        }
+        
         return packageJson;
     });
     updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
         configJson['uiFramework'] = framework;
+        if (framework === FRAMEWORK_ANTUI) {
+            configJson['modules'].push("@admin-layout/ant-design-pro");
+        } else if (framework === FRAMEWORK_CHAKRAUI) {
+            configJson['modules'].push("@admin-layout/chakra-design-pro");
+        }
+
         return configJson;
     });
 

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

@@ -1,78 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { TaggedType } from '@common-stack/core';
-import { Feature } from '@common-stack/server-core';
-import GitModule from '@adminide-stack/git-api-server';
-import AuthModule from '@adminide-stack/user-auth0-server';
-import OrganizationModule, { AccountPlanModule } from '@adminide-stack/account-api-server';
-import BillingModule from '@adminide-stack/billing-api-server';
-import MarketspaceModule from '@adminide-stack/marketplace-module-server';
-import RegistryModule from '@adminide-stack/registry-api-server';
-import PlatformModule from '@adminide-stack/platform-server/lib/module.js';
-import IntegrationModule from '@adminide-stack/integration-api-server';
-import { EnvironmentService } from '@adminide-stack/platform-server';
-import ExtensionModule from '@adminide-stack/extension-module-server';
-import { IAdminIdeSettings } from '@adminide-stack/core';
-import ProjectMgmtModule from '@adminide-stack/project-mgmt-server';
-import CountryModule from '@container-stack/territory';
-import NotificationModule from '@container-stack/notification-api-server';
-import { config } from '../config';
-const environmentService = new EnvironmentService(null, null);
-
-export const settings: IAdminIdeSettings & any = {
-    // mongoConnection: generateMongo(config.MONGO_URL),
-    subTopic: config.CONNECTION_ID, // usually versioning
-    brigadeNamespace: 'brigade',
-    brigadeVersion: 'v1',
-    environmentService,
-    environment: {
-        args: ['--builtin-extensions-dir', '', '--disable-extensions', ''],
-    },
-    adminApiNamespace: config.ADMIN_API_NAMESPACE,
-    apiNamespace: config.API_NAMESPACE,
-    sshNamespace: config.API_NAMESPACE,
-    apiVersion: 'v1',
-    activityNamespace: config.ACTIVITY_NAMESPACE,
-    activityVersion: '',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('IMongoDBSettings').toConstantValue(settings);
-        bind('IMongoDBSettings').toConstantValue(settings);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export const ExternalModules = new Feature(CountryModule);
-
-let DevModules = new Feature({});
-
-if (config.isDev) {
-    const MailingModule = require('@container-stack/mailing-api-server');
-    DevModules = MailingModule.default;
-}
-
-export default new Feature<any>(
-    DefaultFeature,
-    PlatformModule,
-    BillingModule,
-    AuthModule,
-    IntegrationModule,
-    AccountPlanModule,
-    GitModule,
-    NotificationModule,
-    ProjectMgmtModule,
-    OrganizationModule,
-    ExternalModules,
-    ExtensionModule,
-    MarketspaceModule,
-    DevModules,
-    RegistryModule
-);

package/lib/generators/add-frontend/templates/src/common/AntStyles.tsx.template

@@ -1,8 +0,0 @@
-import * as React from 'react';
-import { createCache as createAntdCache, extractStyle, StyleProvider } from '@ant-design/cssinjs';
-
-const antdCache = createAntdCache();
-export const styleSheet = extractStyle(antdCache);
-export const AntSytles = ({ children }: { children: React.ReactNode }) => (
-    <StyleProvider cache={antdCache}>{children}</StyleProvider>
-);

package/lib/generators/add-frontend/templates/src/common/createEmotionCache.ts.template

@@ -1,7 +0,0 @@
-import createCache from '@emotion/cache';
-
-export const defaultCache = createEmotionCache();
-
-export default function createEmotionCache() {
-    return createCache({ key: 'css', prepend: true });
-}

package/lib/generators/add-frontend/templates/src/common/index.ts.template

@@ -1,3 +0,0 @@
-export * from './AntStyles';
-export * from './createEmotionCache';
-export * from './utils';

package/lib/generators/add-frontend/templates/src/common/utils.ts.template

@@ -1,16 +0,0 @@
-import { isEmpty } from 'lodash-es';
-
-export function jsonToString(json) {
-    if (isEmpty(json)) {
-        return '';
-    }
-
-    if (Array.isArray(json)) {
-        let arr = json.map((a) => jsonToString(a));
-        return arr.join(' ');
-    }
-
-    const str = JSON.stringify(json);
-    const arr = str.split(',');
-    return Array.isArray(arr) ? arr.join(' ') : str;
-}