@common-stack/generate-plugin 6.0.6-alpha.10 → 6.0.6-alpha.12

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.6-alpha.12](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.11...v6.0.6-alpha.12) (2024-09-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.6-alpha.11](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.10...v6.0.6-alpha.11) (2024-09-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [6.0.6-alpha.10](https://github.com/cdmbase/common-stack/compare/v6.0.6-alpha.9...v6.0.6-alpha.10) (2024-09-03)
 
 **Note:** Version bump only for package @common-stack/generate-plugin

package/cde-config.json

@@ -1,30 +1,23 @@
 {
     "version": "1.0",
     "schema": "https://example.com/schemas/code-config-schema.json",
+    "license": "MIT",
+    "repository": "https://github.com/CDEBase/fullstack-pro",
     "servers": {
       "fronted-server": {
         "type": "frontend",
         "port": "3000",
         "apiBaseUrl": "https://api.example.com",
         "environment": "production",
-        "features": [
-          "auth",
-          "dashboard",
-          "analytics"
-        ],
+        "features": ["auth", "dashboard", "analytics"],
         "config.json": {
           "i18n": {
             "enabled": true,
             "fallbackLng": "en",
-            "supportedLngs": [
-              "en",
-              "de",
-              "es"
-            ],
+            "supportedLngs": ["en", "de", "es"],
             "defaultNS": "common"
           },
-          "modules": [
-          ],
+          "modules": [],
           "paths": {
             "lifecycleMiddleware": "@adminide-stack/platform-client/lib/middleware/lifecycleMiddleware.js"
           },
@@ -34,23 +27,16 @@
             "__WEB_DEV_SERVER_PORT__": 3000,
             "__BACKEND_URL__": "http://localhost:3000"
           },
-          "viteConfig": {
-          }
+          "viteConfig": {}
         }
       },
       "backend-server": {
         "type": "backend",
         "port": 3000,
         "databaseUrl": "postgres://user:password@localhost:5432/mydb",
-        "features": [
-          "auth",
-          "account"
-        ],
+        "features": ["auth", "account"],
         "config.json": {
-          "modules": [
-            "@adminide-stack/account-api-server",
-            "@adminide-stack/extension-module-server"
-          ]
+          "modules": ["@adminide-stack/account-api-server", "@adminide-stack/extension-module-server"]
         },
         "cors": true
       }
@@ -58,29 +44,44 @@
     "packages": {
       "name": "packages-xyz",
       "modules": {
-        "books-core": {
-          "type": "packages-core",
-          "enable": true,
-          "provider": "auth0"
-        },
-        "books-client": {
-          "type": "packages-client",
-          "files": {
-            "config/env-config.ts": {
-              "BOOKS_API": "xxxxxx"
-            },
-            "cdm-locale": {
-              "en": {
-                "main.json": []
+        "billing-api": {
+          "core": {
+            "type": "packages-core",
+            "files": {
+              "config/env-config.ts": {},
+              "cdm-locales": {
+                "en": {
+                  "main.json": {}
+                },
+                "es": {
+                  "common.json": {},
+                  "main.json": []
+                }
               }
             }
-          }
-        },
-        "books-browser": {
-          "type": "packages-browser",
-          "files": {
+          },
+          "client": {
+            "type": "packages-client",
+            "files": {
+              "config/env-config.ts": {},
+              "cdm-locales": {}
+            }
+          },
+          "browser": {
+            "type": "packages-browser",
+            "files": {
+              "config/env-config.ts": {},
+              "cdm-locales": {}
+            }
+          },
+          "server": {
+            "type": "packages-server",
+            "files": {
+              "config/env-config.ts": {},
+              "cdm-locales": {}
+            }
           }
         }
       }
     }
-  }
+}

package/generators.json

@@ -39,6 +39,11 @@
             "factory": "./lib/generators/add-client-package/generator.cjs",
             "schema": "./lib/generators/add-client-package/schema.json",
             "description": "add-client-package generator"
+        },
+        "add-package": {
+            "factory": "./lib/generators/add-package/generator.cjs",
+            "schema": "./lib/generators/add-package/schema.json",
+            "description": "add-package generator"
         }
     }
 }

package/lib/{constants/index.cjs → common/constants.cjs}

@@ -1,3 +1,3 @@
 'use strict';const FRAMEWORK_ANTUI = 'antui';
 const FRAMEWORK_CHAKRAUI = 'chakraui';
-const FRAMEWORK_TAILWINDUI = 'tailwindui';exports.FRAMEWORK_ANTUI=FRAMEWORK_ANTUI;exports.FRAMEWORK_CHAKRAUI=FRAMEWORK_CHAKRAUI;exports.FRAMEWORK_TAILWINDUI=FRAMEWORK_TAILWINDUI;//# sourceMappingURL=index.cjs.map
+const FRAMEWORK_TAILWINDUI = 'tailwindui';exports.FRAMEWORK_ANTUI=FRAMEWORK_ANTUI;exports.FRAMEWORK_CHAKRAUI=FRAMEWORK_CHAKRAUI;exports.FRAMEWORK_TAILWINDUI=FRAMEWORK_TAILWINDUI;//# sourceMappingURL=constants.cjs.map

package/lib/common/constants.cjs.map

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

package/lib/{constants/index.mjs → common/constants.mjs}

@@ -1,3 +1,3 @@
 const FRAMEWORK_ANTUI = 'antui';
 const FRAMEWORK_CHAKRAUI = 'chakraui';
-const FRAMEWORK_TAILWINDUI = 'tailwindui';export{FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI};//# sourceMappingURL=index.mjs.map
+const FRAMEWORK_TAILWINDUI = 'tailwindui';export{FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI};//# sourceMappingURL=constants.mjs.map

package/lib/common/constants.mjs.map

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

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

@@ -62,7 +62,7 @@
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "6.0.6-alpha.5",
+        "@common-stack/server-stack": "6.0.6-alpha.10",
         "@remix-run/node": "^2.8.1",
         "lodash": "^4.17.15",
         "react": "18.2.0",

package/lib/generators/add-backend/generator.cjs

@@ -1,14 +1,16 @@
-'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);function addBackendGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),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_SERVER_NAME = 'backend-server';
+function addBackendGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        const projectName = index.isValid(options.ns) ? `backend-${index.getValid(options.ns)}-server` : 'backend-server';
+        const projectName = index.isValid(options.name) ? `${index.getValid(options.name)}-${DEFAULT_SERVER_NAME}` : DEFAULT_SERVER_NAME;
         const configs = Object.assign(Object.assign({}, options), { name: projectName });
         return yield generateBackend(tree, configs);
     });
 }
 const generateBackend = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'backend-server';
+    let projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
+    projectName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${projectName}` : projectName;
     // resetProject(`${basePath}/${projectRoot}`);
     // addProjectConfiguration(tree, framework, {
     //     root: projectRoot,
@@ -21,5 +23,12 @@ const generateBackend = (tree, options) => tslib.__awaiter(void 0, void 0, void
         packageJson['name'] = projectName;
         return packageJson;
     });
+    if (options['config.json']) {
+        devkit.updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
+            const addtionalConfigs = options['config.json'];
+            configJson = setupConfig_cjs.deepMerge(configJson, addtionalConfigs);
+            return configJson;
+        });
+    }
     yield devkit.formatFiles(tree);
 });exports.addBackendGenerator=addBackendGenerator;exports.default=addBackendGenerator;exports.generateBackend=generateBackend;//# sourceMappingURL=generator.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","__awaiter","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAGA,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,WAAWC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,GAAG,gBAAgB,CAAC;QACtG,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;IAC/D,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;;AAU/G,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","__awaiter","generateFiles","path","updateJson","deepMerge","formatFiles"],"mappings":"6mBAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAGA,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,mBAAmB,CAAA,CAAE,GAAG,mBAAmB,CAAC;QACrH,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAAC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;;;;;;;;AAU3F,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACH,IAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QACxBA,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAGC,yBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAErD,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;KACN;AACD,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

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

@@ -1,14 +1,16 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';function addBackendGenerator(tree, options) {
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';const DEFAULT_SERVER_NAME = 'backend-server';
+function addBackendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const projectName = isValid(options.ns) ? `backend-${getValid(options.ns)}-server` : 'backend-server';
+        const projectName = isValid(options.name) ? `${getValid(options.name)}-${DEFAULT_SERVER_NAME}` : DEFAULT_SERVER_NAME;
         const configs = Object.assign(Object.assign({}, options), { name: projectName });
         return yield generateBackend(tree, configs);
     });
 }
 const generateBackend = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'backend-server';
+    let projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     // resetProject(`${basePath}/${projectRoot}`);
     // addProjectConfiguration(tree, framework, {
     //     root: projectRoot,
@@ -21,5 +23,12 @@ const generateBackend = (tree, options) => __awaiter(void 0, void 0, void 0, fun
         packageJson['name'] = projectName;
         return packageJson;
     });
+    if (options['config.json']) {
+        updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
+            const addtionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, addtionalConfigs);
+            return configJson;
+        });
+    }
     yield formatFiles(tree);
 });export{addBackendGenerator,addBackendGenerator as default,generateBackend};//# sourceMappingURL=generator.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,WAAW,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,GAAG,gBAAgB,CAAC;QACtG,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,gBAAgB,CAAC;IAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;;AAU/G,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-backend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"6PAMA,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEvB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,mBAAmB,CAAA,CAAE,GAAG,mBAAmB,CAAC;QACrH,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAC/C,CAAA,CAAA;AAAA,CAAA;MAEY,eAAe,GAAG,CAAO,IAAU,EAAE,OAAY,KAAI,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC9D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAA,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;;;;;;;;AAU3F,IAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACpE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;AACH,IAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QACxB,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAG,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAErD,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;KACN;AACD,IAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

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

@@ -7,12 +7,17 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
+        },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this backend server module?(optional)"
         }
     },
     "required": ["ns", "directory"]

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

@@ -1,15 +1,17 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),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;
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),index=require('../../utils/index.cjs'),constants=require('../../common/constants.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 = constants.FRAMEWORK_ANTUI;
+const DEFAULT_SERVER_NAME = 'frontend-server';
 function addFrontendGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        const projectName = index.isValid(options.ns) ? `frontend-${index.getValid(options.ns)}-server` : 'frontend-server';
+        const projectName = index.isValid(options.name) ? `${index.getValid(options.name)}-${DEFAULT_SERVER_NAME}` : DEFAULT_SERVER_NAME;
         const configs = Object.assign(Object.assign({}, options), { name: projectName });
         return yield generateFrontend(tree, configs);
     });
 }
 const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'frontend-server';
+    let projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
+    projectName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
     const framework = (_b = index.getValid(options.framework)) !== null && _b !== void 0 ? _b : DEFAULT_FRAMEWORK;
     console.log('UI framework specified: ', framework);
@@ -24,22 +26,24 @@ const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void
     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) {
+        if (framework === constants.FRAMEWORK_ANTUI) {
             packageJson['dependencies']["@admin-layout/ant-design-pro"] = "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']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
             packageJson['dependencies']["antd"] = "^5.14.0";
         }
-        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";
+        else if (framework === constants.FRAMEWORK_CHAKRAUI) {
             packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
+            packageJson['dependencies']["framer-motion"] = "^11.5.4";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
             packageJson['dependencies']["@emotion/css"] = "^11.10.0";
             packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
         }
-        else if (framework === index$1.FRAMEWORK_TAILWINDUI) {
+        else if (framework === constants.FRAMEWORK_TAILWINDUI) {
             packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
             packageJson['devDependencies']["postcss"] = "^8.4.41";
             packageJson['devDependencies']["autoprefixer"] = "^10.4.20";
@@ -48,10 +52,10 @@ const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void
     });
     devkit.updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
         configJson['uiFramework'] = framework;
-        if (framework === index$1.FRAMEWORK_ANTUI) {
+        if (framework === constants.FRAMEWORK_ANTUI) {
             configJson['modules'].push("@admin-layout/ant-design-pro");
         }
-        else if (framework === index$1.FRAMEWORK_CHAKRAUI) {
+        else if (framework === constants.FRAMEWORK_CHAKRAUI) {
             configJson['modules'].push("@admin-layout/chakra-design-pro");
         }
         if (options['config.json']) {

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":["FRAMEWORK_ANTUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","deepMerge","formatFiles"],"mappings":"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"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","deepMerge","formatFiles"],"mappings":"6pBAQA,MAAM,iBAAiB,GAAGA,yBAAe,CAAC;AAC1C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAExB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;QACtF,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,CAAA,EAAI,mBAAmB,CAAA,CAAE,GAAG,mBAAmB,CAAC;QACrH,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChD,CAAA,CAAA;AAAA,CAAA;MAEY,gBAAgB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC/D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAAC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;AAC3F,IAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;IAExC,MAAM,SAAS,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;AACnE,IAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;;;;;;;;AAWnD,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,IAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,IAAI,SAAS,KAAKN,yBAAe,EAAE;YAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;YACvE,WAAW,CAAC,cAAc,CAAC,CAAC,kCAAkC,CAAC,GAAG,QAAQ,CAAC;YAC3E,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;SACnD;AAAM,aAAA,IAAI,SAAS,KAAKO,4BAAkB,EAAE;YACzC,WAAW,CAAC,cAAc,CAAC,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;SAE/D;AAAM,aAAA,IAAI,SAAS,KAAKC,8BAAoB,EAAE;YAC3C,WAAW,CAAC,iBAAiB,CAAC,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;YAC1D,WAAW,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YACtD,WAAW,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;SAC/D;AAED,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;IACHF,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,QAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,QAAA,IAAI,SAAS,KAAKN,yBAAe,EAAE;YAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;SAC9D;AAAM,aAAA,IAAI,SAAS,KAAKO,4BAAkB,EAAE;YACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;SACjE;AAED,QAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;AACxB,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAGE,yBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;SACxD;AAED,QAAA,OAAO,UAAU,CAAC;AACtB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}

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

@@ -1,15 +1,17 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../constants/index.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../common/constants.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+const DEFAULT_SERVER_NAME = 'frontend-server';
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+        const projectName = isValid(options.name) ? `${getValid(options.name)}-${DEFAULT_SERVER_NAME}` : DEFAULT_SERVER_NAME;
         const configs = Object.assign(Object.assign({}, options), { name: projectName });
         return yield generateFrontend(tree, configs);
     });
 }
 const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'frontend-server';
+    let projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+    projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
     const projectSrc = `${projectRoot}/src`;
     const framework = (_b = getValid(options.framework)) !== null && _b !== void 0 ? _b : DEFAULT_FRAMEWORK;
     console.log('UI framework specified: ', framework);
@@ -26,16 +28,18 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
         packageJson['name'] = projectName;
         if (framework === FRAMEWORK_ANTUI) {
             packageJson['dependencies']["@admin-layout/ant-design-pro"] = "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']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
             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']["@chakra-ui/react"] = "^2.8.2";
+            packageJson['dependencies']["framer-motion"] = "^11.5.4";
+            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
+            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
             packageJson['dependencies']["@emotion/css"] = "^11.10.0";
             packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
         }

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":"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"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -7,18 +7,23 @@
         "ns": {
             "type": "string",
             "description": "The project namespace",
-            "x-prompt": "What name would you like to use?"
+            "x-prompt": "What namespace would you like to use?"
         },
         "directory": {
             "type": "string",
             "description": "",
             "x-prompt": "What directory would you like to create in?"
         },
+        "name": {
+            "type": "string",
+            "description": "The module name(optional)",
+            "x-prompt": "What name would you like to use for this frontend server module?(optional)"
+        },
         "framework": {
             "type": "string",
             "description": "",
-            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?"
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui, tailwindui]?(default: antui)"
         }
     },
-    "required": ["ns", "directory", "framework"]
+    "required": ["ns", "directory"]
 }

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

@@ -52,8 +52,6 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@emotion/react": "^11.10.4",
-        "@emotion/server": "^11.10.0",
         "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
@@ -83,7 +81,7 @@
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
         "@common-stack/frontend-stack-react": "6.0.6-alpha.6",
-        "@common-stack/rollup-vite-utils": "6.0.6-alpha.9",
+        "@common-stack/rollup-vite-utils": "6.0.6-alpha.11",
         "@remix-run/dev": "^2.8.1",
         "@remix-run/serve": "^2.8.1",
         "cross-env": "^7.0.3",

package/lib/generators/add-frontend/templates/tools/mergeConfig.js

@@ -1,6 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { setupConfig } from '@common-stack/rollup-vite-utils/lib/utils/setupConfig.js';
+import { updateFromConfig } from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginUpdateFromConfig.js';
 import projectConfig from '../config.json' assert { type: 'json' };
 
 // Function to merge configurations
@@ -32,3 +33,5 @@ if (!gitignoreContent.includes('app')) {
   fs.appendFileSync(gitignorePath, '\napp\n');
   console.log('Added "app" to .gitignore');
 }
+
+updateFromConfig(finalConfigPath);

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

@@ -147,7 +147,7 @@
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
         "@common-stack/env-list-loader": "6.0.6-alpha.5",
-        "@common-stack/generate-plugin": "6.0.6-alpha.9",
+        "@common-stack/generate-plugin": "6.0.6-alpha.11",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",