@common-stack/generate-plugin 7.0.4-alpha.2 → 7.0.4-alpha.20

package/lib/generators/add-fullstack/updates/nxSetup.cjs

@@ -1,81 +1,137 @@
 'use strict';var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),readline=require('readline');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);var readline__namespace=/*#__PURE__*/_interopNamespaceDefault(readline);/**
- * Prompts the user for AWS credentials and updates nx.json
+ * Sets up Nx configuration with optional AWS credentials
  */
 function setupNxConfig(tree, projectRoot) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        try {
-            // Create readline interface for user input
-            const rl = readline__namespace.createInterface({
-                input: process.stdin,
-                output: process.stdout
-            });
-            console.log('\nAWS Configuration for Nx Cache');
-            console.log('=============================');
-            console.log('This project uses AWS S3 for remote caching with Nx.');
-            console.log('Please provide your AWS credentials or press Enter to skip for now.');
-            // Prompt for the AWS access key ID
-            const awsAccessKeyId = yield new Promise((resolve) => {
-                rl.question('AWS Access Key ID: ', (answer) => {
-                    resolve(answer.trim());
+        console.log('\nAWS Configuration for Nx Cache');
+        console.log('=============================');
+        console.log('This project uses AWS S3 for remote caching with Nx.');
+        console.log('Please provide your AWS credentials or press Enter to skip for now.');
+        // Basic configuration without AWS credentials
+        const basicConfig = {
+            tasksRunnerOptions: {
+                default: {
+                    runner: 'nx/tasks-runners/default',
+                    options: {
+                        cacheableOperations: ['build', 'test', 'lint'],
+                        accessibleHosts: ['https://registry.npmjs.org'],
+                        useDaemonProcess: false,
+                        parallel: 3,
+                    },
+                },
+            },
+        };
+        const nxJsonPath = path__namespace.join(projectRoot, 'nx.json');
+        // Safe prompt function with timeout that returns a string
+        const askWithTimeout = (rl, question, timeoutMs = 10000) => {
+            return new Promise((resolve) => {
+                let resolved = false;
+                const timeout = setTimeout(() => {
+                    if (!resolved) {
+                        resolved = true;
+                        console.log(`\nTimeout waiting for input. Skipping.`);
+                        resolve('');
+                    }
+                }, timeoutMs);
+                rl.question(question, (answer) => {
+                    if (!resolved) {
+                        resolved = true;
+                        clearTimeout(timeout);
+                        resolve(answer);
+                    }
                 });
             });
-            // Prompt for the AWS secret access key if access key ID was provided
-            let awsSecretAccessKey = '';
-            if (awsAccessKeyId) {
-                awsSecretAccessKey = yield new Promise((resolve) => {
-                    rl.question('AWS Secret Access Key: ', (answer) => {
-                        resolve(answer.trim());
-                    });
-                });
-            }
-            // Prompt for the AWS region
-            const awsRegion = yield new Promise((resolve) => {
-                rl.question('AWS Region (default: us-east-1): ', (answer) => {
-                    resolve(answer.trim() || 'us-east-1');
-                });
-            });
-            // Prompt for the S3 bucket name
-            const awsBucket = yield new Promise((resolve) => {
-                rl.question('AWS S3 Bucket Name: ', (answer) => {
-                    resolve(answer.trim());
-                });
+        };
+        let rl;
+        try {
+            rl = readline__namespace.createInterface({
+                input: process.stdin,
+                output: process.stdout,
             });
-            rl.close();
-            // Wait for the close event to ensure we don't proceed before input is complete
-            yield new Promise(resolve => rl.on('close', resolve));
-            // Update nx.json if it exists and AWS credentials were provided
-            if (awsAccessKeyId && awsSecretAccessKey && awsBucket) {
-                const nxJsonPath = path__namespace.join(projectRoot, 'nx.json');
+            // Ask for AWS credentials with timeouts
+            const accessKeyId = yield askWithTimeout(rl, 'AWS Access Key ID (press Enter to skip): ');
+            // If user skips, create basic config
+            if (!accessKeyId || accessKeyId === '') {
+                console.log('Skipping AWS configuration. Creating basic nx.json.');
+                // Check if nx.json exists and update or create
                 if (tree.exists(nxJsonPath)) {
                     devkit.updateJson(tree, nxJsonPath, (json) => {
-                        // Preserve the existing configuration, just update the AWS credentials
                         if (!json.tasksRunnerOptions) {
-                            json.tasksRunnerOptions = {};
+                            json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
                         }
-                        if (!json.tasksRunnerOptions.default) {
-                            json.tasksRunnerOptions.default = {
-                                runner: '@nx-aws-plugin/nx-aws-cache',
-                                options: {
-                                    runtimeCacheInputs: ['node --version']
-                                }
-                            };
-                        }
-                        // Update only the AWS credentials
-                        json.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, json.tasksRunnerOptions.default.options), { awsAccessKeyId,
-                            awsSecretAccessKey,
-                            awsRegion,
-                            awsBucket });
-                        console.log('Updated nx.json with AWS configuration');
                         return json;
                     });
                 }
+                else {
+                    tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+                }
             }
             else {
-                console.log('Skipped AWS configuration for nx.json');
+                // Get remaining AWS info
+                const secretAccessKey = yield askWithTimeout(rl, 'AWS Secret Access Key: ');
+                const region = (yield askWithTimeout(rl, 'AWS Region (default: us-east-1): ')) || 'us-east-1';
+                const bucketName = yield askWithTimeout(rl, 'AWS S3 Bucket Name: ');
+                // Only add AWS config if all fields are provided
+                if (secretAccessKey && bucketName) {
+                    // Use type assertion to avoid TypeScript errors
+                    const awsConfig = Object.assign({}, basicConfig);
+                    // Use "as any" to bypass type checking
+                    awsConfig.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, awsConfig.tasksRunnerOptions.default.options), { cacheDirectory: '.nx/cache', remoteCache: {
+                            s3: {
+                                accessKeyId,
+                                secretAccessKey,
+                                region,
+                                bucketName,
+                            },
+                        } });
+                    // Update or create nx.json with AWS config
+                    if (tree.exists(nxJsonPath)) {
+                        devkit.updateJson(tree, nxJsonPath, () => awsConfig);
+                        console.log('Updated nx.json with AWS configuration.');
+                    }
+                    else {
+                        tree.write(nxJsonPath, JSON.stringify(awsConfig, null, 2));
+                        console.log('Created nx.json with AWS configuration.');
+                    }
+                }
+                else {
+                    console.log('Incomplete AWS information. Creating basic nx.json.');
+                    // Create basic config without AWS
+                    if (tree.exists(nxJsonPath)) {
+                        devkit.updateJson(tree, nxJsonPath, (json) => {
+                            if (!json.tasksRunnerOptions) {
+                                json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
+                            }
+                            return json;
+                        });
+                    }
+                    else {
+                        tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+                    }
+                }
             }
         }
         catch (error) {
             console.error('Error setting up Nx configuration:', error);
+            // Fallback to basic config
+            if (tree.exists(nxJsonPath)) {
+                devkit.updateJson(tree, nxJsonPath, (json) => {
+                    if (!json.tasksRunnerOptions) {
+                        json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
+                    }
+                    return json;
+                });
+            }
+            else {
+                tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+            }
+        }
+        finally {
+            // Ensure readline interface is closed
+            if (rl) {
+                rl.close();
+            }
+            console.log('Nx configuration setup complete.');
         }
     });
 }exports.setupNxConfig=setupNxConfig;//# sourceMappingURL=nxSetup.cjs.map

package/lib/generators/add-fullstack/updates/nxSetup.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"nxSetup.cjs","sources":["../../../../src/generators/add-fullstack/updates/nxSetup.ts"],"sourcesContent":[null],"names":["readline","path","updateJson"],"mappings":"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"}
+{"version":3,"file":"nxSetup.cjs","sources":["../../../../src/generators/add-fullstack/updates/nxSetup.ts"],"sourcesContent":[null],"names":["path","readline","updateJson"],"mappings":"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"}

package/lib/generators/add-fullstack/updates/nxSetup.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 /**
- * Prompts the user for AWS credentials and updates nx.json
+ * Sets up Nx configuration with optional AWS credentials
  */
 export declare function setupNxConfig(tree: Tree, projectRoot: string): Promise<void>;

package/lib/generators/add-fullstack/updates/nxSetup.mjs

@@ -1,81 +1,137 @@
 import {__awaiter}from'tslib';import {updateJson}from'@nx/devkit';import*as path from'path';import*as readline from'readline';/**
- * Prompts the user for AWS credentials and updates nx.json
+ * Sets up Nx configuration with optional AWS credentials
  */
 function setupNxConfig(tree, projectRoot) {
     return __awaiter(this, void 0, void 0, function* () {
-        try {
-            // Create readline interface for user input
-            const rl = readline.createInterface({
-                input: process.stdin,
-                output: process.stdout
-            });
-            console.log('\nAWS Configuration for Nx Cache');
-            console.log('=============================');
-            console.log('This project uses AWS S3 for remote caching with Nx.');
-            console.log('Please provide your AWS credentials or press Enter to skip for now.');
-            // Prompt for the AWS access key ID
-            const awsAccessKeyId = yield new Promise((resolve) => {
-                rl.question('AWS Access Key ID: ', (answer) => {
-                    resolve(answer.trim());
+        console.log('\nAWS Configuration for Nx Cache');
+        console.log('=============================');
+        console.log('This project uses AWS S3 for remote caching with Nx.');
+        console.log('Please provide your AWS credentials or press Enter to skip for now.');
+        // Basic configuration without AWS credentials
+        const basicConfig = {
+            tasksRunnerOptions: {
+                default: {
+                    runner: 'nx/tasks-runners/default',
+                    options: {
+                        cacheableOperations: ['build', 'test', 'lint'],
+                        accessibleHosts: ['https://registry.npmjs.org'],
+                        useDaemonProcess: false,
+                        parallel: 3,
+                    },
+                },
+            },
+        };
+        const nxJsonPath = path.join(projectRoot, 'nx.json');
+        // Safe prompt function with timeout that returns a string
+        const askWithTimeout = (rl, question, timeoutMs = 10000) => {
+            return new Promise((resolve) => {
+                let resolved = false;
+                const timeout = setTimeout(() => {
+                    if (!resolved) {
+                        resolved = true;
+                        console.log(`\nTimeout waiting for input. Skipping.`);
+                        resolve('');
+                    }
+                }, timeoutMs);
+                rl.question(question, (answer) => {
+                    if (!resolved) {
+                        resolved = true;
+                        clearTimeout(timeout);
+                        resolve(answer);
+                    }
                 });
             });
-            // Prompt for the AWS secret access key if access key ID was provided
-            let awsSecretAccessKey = '';
-            if (awsAccessKeyId) {
-                awsSecretAccessKey = yield new Promise((resolve) => {
-                    rl.question('AWS Secret Access Key: ', (answer) => {
-                        resolve(answer.trim());
-                    });
-                });
-            }
-            // Prompt for the AWS region
-            const awsRegion = yield new Promise((resolve) => {
-                rl.question('AWS Region (default: us-east-1): ', (answer) => {
-                    resolve(answer.trim() || 'us-east-1');
-                });
-            });
-            // Prompt for the S3 bucket name
-            const awsBucket = yield new Promise((resolve) => {
-                rl.question('AWS S3 Bucket Name: ', (answer) => {
-                    resolve(answer.trim());
-                });
+        };
+        let rl;
+        try {
+            rl = readline.createInterface({
+                input: process.stdin,
+                output: process.stdout,
             });
-            rl.close();
-            // Wait for the close event to ensure we don't proceed before input is complete
-            yield new Promise(resolve => rl.on('close', resolve));
-            // Update nx.json if it exists and AWS credentials were provided
-            if (awsAccessKeyId && awsSecretAccessKey && awsBucket) {
-                const nxJsonPath = path.join(projectRoot, 'nx.json');
+            // Ask for AWS credentials with timeouts
+            const accessKeyId = yield askWithTimeout(rl, 'AWS Access Key ID (press Enter to skip): ');
+            // If user skips, create basic config
+            if (!accessKeyId || accessKeyId === '') {
+                console.log('Skipping AWS configuration. Creating basic nx.json.');
+                // Check if nx.json exists and update or create
                 if (tree.exists(nxJsonPath)) {
                     updateJson(tree, nxJsonPath, (json) => {
-                        // Preserve the existing configuration, just update the AWS credentials
                         if (!json.tasksRunnerOptions) {
-                            json.tasksRunnerOptions = {};
+                            json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
                         }
-                        if (!json.tasksRunnerOptions.default) {
-                            json.tasksRunnerOptions.default = {
-                                runner: '@nx-aws-plugin/nx-aws-cache',
-                                options: {
-                                    runtimeCacheInputs: ['node --version']
-                                }
-                            };
-                        }
-                        // Update only the AWS credentials
-                        json.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, json.tasksRunnerOptions.default.options), { awsAccessKeyId,
-                            awsSecretAccessKey,
-                            awsRegion,
-                            awsBucket });
-                        console.log('Updated nx.json with AWS configuration');
                         return json;
                     });
                 }
+                else {
+                    tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+                }
             }
             else {
-                console.log('Skipped AWS configuration for nx.json');
+                // Get remaining AWS info
+                const secretAccessKey = yield askWithTimeout(rl, 'AWS Secret Access Key: ');
+                const region = (yield askWithTimeout(rl, 'AWS Region (default: us-east-1): ')) || 'us-east-1';
+                const bucketName = yield askWithTimeout(rl, 'AWS S3 Bucket Name: ');
+                // Only add AWS config if all fields are provided
+                if (secretAccessKey && bucketName) {
+                    // Use type assertion to avoid TypeScript errors
+                    const awsConfig = Object.assign({}, basicConfig);
+                    // Use "as any" to bypass type checking
+                    awsConfig.tasksRunnerOptions.default.options = Object.assign(Object.assign({}, awsConfig.tasksRunnerOptions.default.options), { cacheDirectory: '.nx/cache', remoteCache: {
+                            s3: {
+                                accessKeyId,
+                                secretAccessKey,
+                                region,
+                                bucketName,
+                            },
+                        } });
+                    // Update or create nx.json with AWS config
+                    if (tree.exists(nxJsonPath)) {
+                        updateJson(tree, nxJsonPath, () => awsConfig);
+                        console.log('Updated nx.json with AWS configuration.');
+                    }
+                    else {
+                        tree.write(nxJsonPath, JSON.stringify(awsConfig, null, 2));
+                        console.log('Created nx.json with AWS configuration.');
+                    }
+                }
+                else {
+                    console.log('Incomplete AWS information. Creating basic nx.json.');
+                    // Create basic config without AWS
+                    if (tree.exists(nxJsonPath)) {
+                        updateJson(tree, nxJsonPath, (json) => {
+                            if (!json.tasksRunnerOptions) {
+                                json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
+                            }
+                            return json;
+                        });
+                    }
+                    else {
+                        tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+                    }
+                }
             }
         }
         catch (error) {
             console.error('Error setting up Nx configuration:', error);
+            // Fallback to basic config
+            if (tree.exists(nxJsonPath)) {
+                updateJson(tree, nxJsonPath, (json) => {
+                    if (!json.tasksRunnerOptions) {
+                        json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
+                    }
+                    return json;
+                });
+            }
+            else {
+                tree.write(nxJsonPath, JSON.stringify(basicConfig, null, 2));
+            }
+        }
+        finally {
+            // Ensure readline interface is closed
+            if (rl) {
+                rl.close();
+            }
+            console.log('Nx configuration setup complete.');
         }
     });
 }export{setupNxConfig};//# sourceMappingURL=nxSetup.mjs.map

package/lib/generators/add-fullstack/updates/nxSetup.mjs.map

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

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

@@ -29,11 +29,11 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/client-core": "7.0.4-alpha.0",
-        "@common-stack/core": "7.0.4-alpha.0",
-        "@common-stack/server-core": "7.0.4-alpha.0",
-        "@common-stack/server-stack": "7.0.4-alpha.0",
-        "@common-stack/store-mongo": "7.0.4-alpha.0",
+        "@common-stack/client-core": "7.0.4-alpha.17",
+        "@common-stack/core": "7.0.4-alpha.17",
+        "@common-stack/server-core": "7.0.4-alpha.17",
+        "@common-stack/server-stack": "7.0.4-alpha.18",
+        "@common-stack/store-mongo": "7.0.4-alpha.17",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "7.0.4-alpha.2",
+    "version": "7.0.4-alpha.20",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -18,7 +18,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "7.0.4-alpha.0",
+        "@common-stack/rollup-vite-utils": "7.0.4-alpha.20",
         "tslib": "^2.3.0"
     },
     "publishConfig": {
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "6f0008c84e4b55390bc23edf6689934300fa3aca"
+    "gitHead": "e031c43b10b6af5d522b7f34452fa31f2ba4e311"
 }

package/src/common/package-releases/package.json

@@ -17,6 +17,7 @@
         "autoprefixer": "^10.4.20",
         "framer-motion": "^12.4.1",
         "postcss": "^8.5.1",
+        "tailwind-merge": "^3.0.2",
         "tailwindcss": "^4.0.4"
     },
     "devDependencies": {},

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

@@ -64,7 +64,7 @@
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "7.0.4-alpha.0",
+        "@common-stack/server-stack": "7.0.4-alpha.18",
         "@remix-run/node": "~2.10.1",
         "lodash": "^4.17.15",
         "react": "18.2.0"

package/src/generators/add-frontend/frameworks/antui/src/entry.client.tsx.template

@@ -35,7 +35,12 @@ import { LocaleContext } from './context';
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
 const antCache = createCache();
-const cache = createEmotionCache();
+
+const emotionInsertionPoint =
+    document.querySelector('meta[name="emotion-insertion-point"]') || document.createElement('meta');
+const cache = createEmotionCache({
+    insertionPoint: emotionInsertionPoint,
+});
 
 (window as any).__remixStore = store;
 removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
@@ -72,7 +77,7 @@ async function hydrate() {
                 <I18nextProvider i18n={i18next}>
                     <LocaleProvider>
                         <CacheProvider value={cache}>
-                            <StyleProvider cache={antCache}>
+                            <StyleProvider container={document.head} cache={antCache}>
                                 <ReduxProvider store={store}>
                                     <SlotFillProvider>
                                         <InversifyProvider container={container} modules={clientModules}>

package/src/generators/add-frontend/frameworks/antui/src/root.tsx.template

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError } from '@remix-run/react';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
 import { ApplicationErrorHandler } from '@admin-layout/ant-ui';
@@ -71,6 +71,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
                 <meta charSet="utf-8" />
                 <meta name="viewport" content="width=device-width, initial-scale=1" />
                 <Meta />
+                <meta name="emotion-insertion-point" content="" />
                 <Links />
                 {typeof window === 'undefined' ? `[__STYLESHEET__]` : ''}
             </head>

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

@@ -77,7 +77,7 @@ const frameworkDependencyMap: {
         ]),
     },
     [FRAMEWORK_TAILWINDUI]: {
-        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer']),
+        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer', 'tailwind-merge']),
     },
 };
 

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

@@ -56,7 +56,7 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/frontend-stack-react": "7.0.4-alpha.0",
+        "@common-stack/frontend-stack-react": "7.0.4-alpha.17",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
@@ -81,7 +81,7 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/rollup-vite-utils": "7.0.4-alpha.0",
+        "@common-stack/rollup-vite-utils": "7.0.4-alpha.19",
         "@remix-run/dev": "~2.10.1",
         "@remix-run/serve": "~2.10.1",
         "cross-env": "^7.0.3",

package/src/generators/add-fullstack/files/_gitignore

@@ -16,6 +16,9 @@ npm-debug.log*
 .awcache
 .nx
 
+# env
+*.env
+
 # Jest Env
 globalConfig.json