@common-stack/generate-plugin 6.0.8-alpha.6 → 6.0.8-alpha.60

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","pluginPkg","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","deepMerge","formatFiles"],"mappings":"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"}

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

@@ -1,5 +1,61 @@
-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;
+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';import pluginPkg from'../../common/package-releases/package.json.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 const DEFAULT_SERVER_NAME = 'frontend-server';
+/**
+ * Helper to retrieve a package version from pluginPkg.
+ * Throws an error if a version for packageName is not defined.
+ */
+function getPackageVersion(packageName) {
+    // Read the generator's package.json. This file is updated using ncu,
+    // so the generator always picks up the latest dependency versions.
+    // const pluginPkgPath = path.resolve(__dirname, '../../common/package-releases/package.json');
+    // const pluginPkg = JSON.parse(fs.readFileSync(pluginPkgPath, 'utf-8'));
+    const version = (pluginPkg.dependencies && pluginPkg.dependencies[packageName]) ||
+        (pluginPkg.devDependencies && pluginPkg.devDependencies[packageName]);
+    if (!version) {
+        throw new Error(`Version for package "${packageName}" not found in plugin package.json.`);
+    }
+    return version;
+}
+/**
+ * Helper to map an array of dependency names to an object where each key is a dependency
+ * and its value is obtained via getPackageVersion().
+ */
+function mapDependencies(depNames) {
+    return depNames.reduce((acc, name) => {
+        acc[name] = getPackageVersion(name);
+        return acc;
+    }, {});
+}
+/**
+ * A mapping of frameworks to dependency definitions.
+ * Each dependency's version is obtained dynamically from pluginPkg using a helper.
+ */
+const frameworkDependencyMap = {
+    [FRAMEWORK_ANTUI]: {
+        dependencies: mapDependencies([
+            '@admin-layout/ant-design-pro',
+            '@ant-design/static-style-extract',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+            'antd',
+        ]),
+    },
+    [FRAMEWORK_CHAKRAUI]: {
+        dependencies: mapDependencies([
+            '@chakra-ui/react',
+            'framer-motion',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+        ]),
+    },
+    [FRAMEWORK_TAILWINDUI]: {
+        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer']),
+    },
+};
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
@@ -12,55 +68,46 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
     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);
-    // resetProject(`${basePath}/${projectRoot}`);
-    // addProjectConfiguration(tree, framework, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: projectSrc,
-    //     targets: {},
-    // });
     generateFiles(tree, path.join(__dirname, 'templates'), projectRoot, {});
-    generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectSrc, options);
+    generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        if (framework === FRAMEWORK_ANTUI) {
-            packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            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']["@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";
+        packageJson.name = projectName;
+        packageJson.dependencies = packageJson.dependencies || {};
+        packageJson.devDependencies = packageJson.devDependencies || {};
+        const dependencyOverrides = frameworkDependencyMap[framework] || {};
+        if (dependencyOverrides.dependencies) {
+            Object.entries(dependencyOverrides.dependencies).forEach(([pkg, version]) => {
+                if (!packageJson.dependencies[pkg]) {
+                    packageJson.dependencies[pkg] = version;
+                }
+            });
         }
-        else if (framework === FRAMEWORK_TAILWINDUI) {
-            packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
-            packageJson['devDependencies']["postcss"] = "^8.4.41";
-            packageJson['devDependencies']["autoprefixer"] = "^10.4.20";
+        if (dependencyOverrides.devDependencies) {
+            Object.entries(dependencyOverrides.devDependencies).forEach(([pkg, version]) => {
+                if (!packageJson.devDependencies[pkg]) {
+                    packageJson.devDependencies[pkg] = version;
+                }
+            });
         }
         return packageJson;
     });
     updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
-        configJson['uiFramework'] = framework;
+        configJson.uiFramework = framework;
         if (framework === FRAMEWORK_ANTUI) {
-            configJson['modules'].push("@admin-layout/ant-design-pro");
+            if (!configJson.modules.includes('@admin-layout/ant-design-pro')) {
+                configJson.modules.push('@admin-layout/ant-design-pro');
+            }
         }
         else if (framework === FRAMEWORK_CHAKRAUI) {
-            configJson['modules'].push("@admin-layout/chakra-design-pro");
+            if (!configJson.modules.includes('@admin-layout/chakra-design-pro')) {
+                configJson.modules.push('@admin-layout/chakra-design-pro');
+            }
         }
         if (options['config.json']) {
-            const addtionalConfigs = options['config.json'];
-            configJson = deepMerge(configJson, addtionalConfigs);
+            const additionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, additionalConfigs);
         }
         return configJson;
     });

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/templates/Dockerfile

@@ -5,6 +5,9 @@ ENV PYTHON=/usr/bin/python
 
 COPY .npmrc package.json /tmp/
 
+# Copy the common package to the temporary directory
+COPY common /tmp/common
+
 RUN set -ex \
 	&& cd /tmp \
 	&& npm install -g node-gyp \
@@ -13,6 +16,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 

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

@@ -25,8 +25,9 @@
         "build:dev": "cross-env ENV_FILE=../../config/development/dev.env yarn build",
         "build:devSSR": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env  yarn build",
         "build:stats": "cross-env BUNDLE_STATS=true yarn build:debug",
+        "copycommon": "cp -r ../../packages/common .",
         "dev:vite:ssr": "cross-env SSR=true NODE_ENV=development ENV_FILE=../../config/development/dev.env node ./server.js",
-        "docker:build": "cross-env yarn build && docker build . -t $npm_package_name:$npm_package_version",
+        "docker:build": "yarn copycommon && yarn build && docker build . -t $npm_package_name:$npm_package_version",
         "docker:build:debug": "yarn build:debug && docker build . -t $npm_package_name:$npm_package_version",
         "docker:run": "docker run  --env-file ../../config/staging/docker-staging.env  -p 3000:3000  -it $npm_package_name:$npm_package_version",
         "genconfig": "node ./tools/mergeConfig.js",
@@ -51,8 +52,11 @@
         "watch:staging": "cross-env ENV_FILE=../../config/staging/staging.env node ./server.js",
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "dependencies": {
-        "@common-stack/frontend-stack-react": "6.0.8-alpha.1",
+        "@common-stack/frontend-stack-react": "6.0.8-alpha.50",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
@@ -77,7 +81,7 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.59",
         "@remix-run/dev": "~2.10.1",
         "@remix-run/serve": "~2.10.1",
         "cross-env": "^7.0.3",

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

@@ -61,6 +61,9 @@ export default defineConfig(async ({ isSsrBuild }) => {
                     paths: config.paths,
                     iconsRepository: config?.iconsRepository,
                     rootPath: resolve(directoryName, '../..'),
+                    settings: {
+                        _useFutureCommonPackage: true,
+                    },
                 },
                 metaJson
             )
@@ -85,6 +88,14 @@ export default defineConfig(async ({ isSsrBuild }) => {
             }),
             tsconfigPaths({ ignoreConfigErrors: true }),
         ],
+        optimizeDeps: {
+            esbuildOptions: {
+                target: 'esnext',
+            },
+        },
+        build: {
+            target: 'esnext',
+        },
         resolve: {
             alias: {
                 '@app': resolve(directoryName, 'app'),
@@ -94,5 +105,11 @@ export default defineConfig(async ({ isSsrBuild }) => {
     };
 
     // Deep merge custom Vite config from config.json
-    return mergeWith(viteConfig, config.viteConfig);
+    // to merge Arrays properly need to concat. 
+    const result = mergeWith(config.viteConfig, viteConfig, (objValue, srcValue) => {
+        if (Array.isArray(objValue)) {
+            return objValue.concat(srcValue);
+        }
+    });
+    return result;
 });

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

@@ -29,7 +29,7 @@ pipeline {
     // by default first value of the choice will be choosen
     choice choices: ['auto', 'force'], description: 'Choose merge strategy', name: 'NPM_PUBLISH_STRATEGY'
     choice choices: ['yarn', 'npm'], description: 'Choose build strategy', name: 'BUILD_STRATEGY'
-    choice choices: ['0.7.11','0.7.9', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
+    choice choices: ['0.7.12','0.7.11', '0.6.0'], description: 'Choose Idestack chart version', name: 'IDESTACK_CHART_VERSION'
     choice choices: ['nodejs20', 'nodejs18', 'nodejs22'], description: 'Choose NodeJS version', name: 'NODEJS_TOOL_VERSION'    
     choice choices: ['buildOnly', 'buildAndTest', 'buildAndPublish',  'mobileBuild', 'mobilePreview', 'mobilePreviewLocal', 'mobilePreviewSubmit', 'mobileProd', 'mobileProdSubmit', 'devDeployOnly', 'stageDeploy', 'stageDeployOnly', 'prodDeploy', 'prodDeployOnly', 'allenv'], description: 'Where to deploy micro services?', name: 'ENV_CHOICE'
     choice choices: ['all', 'ios', 'android' ], description: 'Mobile type if it is mobile build?', name: 'MOBILE_CHOICE'
@@ -646,7 +646,7 @@ def buildAndPushDockerImage(server, name, version) {
   } else {
     sh """
       npx lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run ${env.BUILD_COMMAND};
-
+      npx lerna exec --scope=*${server} ${params.BUILD_STRATEGY} copycommon
       docker buildx create --name ${server} --driver docker-container --use
       docker buildx inspect ${server} --bootstrap
 

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

@@ -0,0 +1,126 @@
+{
+    "servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
+    "codegen": {
+        "outputFile": "codegen.ts",
+        "rootSchema": "servers/backend-server/src/api/root-schema.graphqls",
+        "fullConfig": {
+            "overwrite": true,
+            "schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
+            "generates": {
+                "packages/common/src/generated/generated-models.ts": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "scalars": {
+                            "URI": "URI",
+                            "URIInput": "URI | UriComponents"
+                        },
+                        "enumPrefix": false,
+                        "enumValues": {
+                            "ConfigurationScope": "@workbench-stack/core/lib/interfaces/configuration/configuration.js#ConfigurationScope",
+                            "ConfigurationTarget": "../configuration#ConfigurationTarget"
+                        },
+                        "constEnums": false,
+                        "contextType": "../apollo-context#MyContext",
+                        "withHooks": true,
+                        "typesPrefix": "I",
+                        "noNamespaces": true,
+                        "noGraphQLTag": true
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": [
+                                    "import { URI,  UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
+                                ]
+                            }
+                        },
+                        "typescript",
+                        "typescript-operations",
+                        "typescript-resolvers"
+                    ]
+                },
+                "packages/common/src/generated/generated.tsx": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "scalars": {
+                            "URI": "URI",
+                            "URIInput": "URI | UriComponents"
+                        },
+                        "enumPrefix": false,
+                        "withHooks": true,
+                        "typesPrefix": "I",
+                        "noNamespaces": true,
+                        "noGraphQLTag": true
+                    },
+                    "preset": "import-types-preset",
+                    "presetConfig": {
+                        "typesPath": "./generated-models",
+                        "importTypesNamespace": "SchemaTypes"
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": [
+                                    "import { URI,  UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
+                                ]
+                            }
+                        },
+                        "typescript-react-apollo"
+                    ]
+                },
+                "packages/common/src/generated/introspection-result.ts": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "typesPrefix": "I"
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": ["/* tslint:disable */"]
+                            }
+                        },
+                        "fragment-matcher"
+                    ]
+                }
+            }
+        }
+    },
+    "updateDependencies": {
+        "packagesToCheck": [
+            "@common-stack/server-stack",
+            "@common-stack/frontend-stack-react",
+            "@common-stack/mobile-stack-react"
+        ],
+        "packagePaths": {
+            "backend": ["servers/backend-server/package.json"],
+            "frontend": ["servers/frontend-server/package.json"],
+            "mobile": ["portable-devices/mobile/package.json"]
+        }
+    },
+    "updateDependencyVersion": {
+        "roots": ["servers", "portable-devices", "packages", "packages-modules"],
+        "ignorePattern": "**/node_modules/**",
+        "jsonSpacing": 4,
+        "addEndNewLine": true,
+        "commitMessage": "Updated packages to use correct versions"
+    },
+    "sortPackageJson": {
+        "directories": [".", "packages", "packages-modules", "servers", "portable-devices"],
+        "skipNodeModules": true
+    },
+    "deployVersionUpdate": {
+        "lernaJsonPath": "lerna.json",
+        "jenkinsfilePath": "Jenkinsfile",
+        "valuesDevYamlPath": "values-dev.yaml",
+        "valuesProdYamlPath": "values-prod.yaml"
+    },
+    "projectPaths": {
+        "packages": "packages",
+        "packagesModules": "packages-modules",
+        "servers": "servers",
+        "portableDevices": "portable-devices"
+    }
+}

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

@@ -25,7 +25,7 @@
     },
     "scripts": {
         "prebootstrap": "lerna run prepare",
-        "bootstrap": "yarn && yarn lerna",
+        "bootstrap": "yarn",
         "postbootstrap": "yarn build",
         "build": "yarn build:packages",
         "build:clean": "lerna exec yarn build:clean",
@@ -52,14 +52,15 @@
         "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
         "format": "yarn lint --fix",
         "format:md": "yarn lint:md --fix",
-        "generateGraphql": "graphql-codegen",
+        "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
+        "generateGraphql": "graphql-codegen-esm",
+        "postgenerateGraphql": "lerna run watch --scope=common",
         "generateGraphql:watch": "yarn generateGraphql -- --watch",
         "git:pull": "git pull origin $(git rev-parse --abbrev-ref HEAD)",
         "git:push": "git push origin $(git rev-parse --abbrev-ref HEAD)",
         "gitcommit": "git add -A && git diff --staged --quiet || git commit -am 'auto publish [skip ci] \r\n'",
         "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
         "jest": "./node_modules/.bin/jest",
-        "lerna": "lerna bootstrap",
         "prelernapublish": "git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH  && git merge -s recursive -X theirs $MASTER_BRANCH  -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
         "lernapublish": "lerna publish patch --ignore-scripts",
         "postlernapublish": "yarn update-lerna-on-develop && git checkout $MASTER_BRANCH",
@@ -105,9 +106,11 @@
     },
     "resolutions": {
         "@apollo/client": "^3.9.0",
-        "@types/react": "^18.0.25",
-        "@types/react-dom": "^18.0.8",
+        "@types/react": "^18.2.25",
+        "@types/react-dom": "^18.2.7",
+        "common": "link:packages/common",
         "html-to-text": "^8.0.0",
+        "lerna": "8.1.8",
         "react": "18.3.0-canary-c3048aab4-20240326",
         "react-dom": "18.3.0-canary-c3048aab4-20240326",
         "react-native": "0.72.10",
@@ -146,20 +149,20 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.8-alpha.1",
-        "@common-stack/generate-plugin": "6.0.8-alpha.5",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
+        "@common-stack/env-list-loader": "6.0.8-alpha.31",
+        "@common-stack/generate-plugin": "6.0.8-alpha.59",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.59",
         "@emotion/babel-plugin": "^11.11.0",
-        "@graphql-codegen/add": "^5.0.2",
-        "@graphql-codegen/cli": "^5.0.2",
-        "@graphql-codegen/fragment-matcher": "^5.0.2",
+        "@graphql-codegen/add": "^5.0.3",
+        "@graphql-codegen/cli": "^5.0.4",
+        "@graphql-codegen/fragment-matcher": "^5.1.0",
         "@graphql-codegen/import-types-preset": "^3.0.0",
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-        "@graphql-codegen/typescript": "^4.0.6",
+        "@graphql-codegen/typescript": "^4.1.3",
         "@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
-        "@graphql-codegen/typescript-operations": "^4.2.0",
-        "@graphql-codegen/typescript-react-apollo": "^4.3.0",
-        "@graphql-codegen/typescript-resolvers": "^4.0.6",
+        "@graphql-codegen/typescript-operations": "^4.4.1",
+        "@graphql-codegen/typescript-react-apollo": "^4.3.2",
+        "@graphql-codegen/typescript-resolvers": "^4.4.2",
         "@loadable/babel-plugin": "^5.13.2",
         "@loadable/webpack-plugin": "^5.15.2",
         "@nx-aws-plugin/nx-aws-cache": "^3.2.2",
@@ -176,7 +179,8 @@
         "@rollup/plugin-typescript": "^11.1.5",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
-        "@testing-library/react": "^16.0.1",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/react": "^16.1.0",
         "@testing-library/react-hooks": "^8.0.1",
         "@types/async": "^3.2.15",
         "@types/body-parser": "1.19.2",
@@ -272,7 +276,7 @@
         "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
-        "lerna": "8",
+        "lerna": "8.1.8",
         "less": "^4.1.3",
         "less-loader": "^11.0.0",
         "lint-staged": "^15.2.7",
@@ -307,11 +311,15 @@
         "redux-devtools-extension": "^2.13.9",
         "redux-mock-store": "^1.5.4",
         "remap-istanbul": "^0.13.0",
+        "remix-development-tools": "^4.4.1",
         "resolve-url-loader": "^5.0.0",
         "rimraf": "^3.0.2",
         "rollup": "^4.13.0",
         "rollup-plugin-esbuild": "^6.1.1",
+        "rollup-plugin-multi-input": "^1.5.0",
         "rollup-plugin-string": "^3.0.0",
+        "rollup-plugin-svg": "^2.0.0",
+        "rollup-plugin-visualizer": "^5.14.0",
         "sass-loader": "^13.1.0",
         "shelljs": "^0.8.5",
         "simple-git": "^3.14.1",
@@ -332,10 +340,15 @@
         "typedoc": "^0.23.20",
         "typescript": "^5.5.4",
         "url-loader": "^4.1.1",
+        "vite": "^5.1.1",
+        "vite-plugin-babel-macros": "^1.0.6",
+        "vite-plugin-cjs-interop": "^2.0.6",
+        "vite-plugin-compression": "^0.5.1",
+        "vitest": "^3.0.4",
         "wait-on": "^6.0.1",
         "webpack": "^5.74.0",
         "webpack-bundle-analyzer": "^4.7.0",
-        "webpack-cli": "^4.10.0",
+        "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.11.1",
         "webpack-manifest-plugin": "^5.0.0",
         "webpack-merge": "^5.8.0",