@common-stack/generate-plugin 7.0.4-alpha.1 → 7.0.4-alpha.11

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.9",
         "@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.8",
         "@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
 

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

@@ -52,7 +52,6 @@
         "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
         "format": "yarn lint --fix",
         "format:md": "yarn lint:md --fix",
-        "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
         "generateGraphql": "graphql-codegen-esm",
         "postgenerateGraphql": "lerna run watch --scope=common",
         "generateGraphql:watch": "yarn generateGraphql -- --watch",
@@ -77,6 +76,7 @@
         "publish:forceManual": "yarn lernapublish --force-publish=*",
         "publish:push": "yarn prelernapublish && git push origin publish && yarn postlernapublish",
         "push-develop": "git push origin develop",
+        "regenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
         "setBranchEnv": "cross-env REPOSITORY_BRANCH=${1:-$REPOSITORY_BRANCH} PUBLISH_BRANCH=${2:-$PUBLISH_BRANCH}",
         "sort-packages": "node tools/sortPackageJson.mjs && prettier --write package.json **/**/*/package.json **/*/package.json",
         "start": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env yarn startWeb",
@@ -145,8 +145,8 @@
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
         "@common-stack/env-list-loader": "7.0.4-alpha.0",
-        "@common-stack/generate-plugin": "7.0.4-alpha.0",
-        "@common-stack/rollup-vite-utils": "7.0.4-alpha.0",
+        "@common-stack/generate-plugin": "7.0.4-alpha.10",
+        "@common-stack/rollup-vite-utils": "7.0.4-alpha.8",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.3",
         "@graphql-codegen/cli": "^5.0.4",

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

@@ -2,16 +2,22 @@
 import graphql from '@rollup/plugin-graphql';
 import image from '@rollup/plugin-image';
 import typescript from '@rollup/plugin-typescript';
+import esbuild from 'rollup-plugin-esbuild'
 import { string } from 'rollup-plugin-string';
 import svg from 'rollup-plugin-svg';
 import { copy } from '@web/rollup-plugin-copy';
+import json from '@rollup/plugin-json';
 import modifyLibFilesPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginModifyLibFiles.js';
 import generateJsonFromObject from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginGenerateJson.js';
 import addJsExtensionToImportsPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginAddJsExtension.js';
 import { ignoreCssUrlPlugin } from '@common-stack/rollup-vite-utils/lib/rollup/pluginIgnore.js';
 // Define any additional plugins specific to this bundle
 const additionalPlugins = [
-    copy({ patterns: ['**/cdm-locales/**/*', '**/*.gql', '**/**/*.graphql', '**/styles/**/*', '**/css/**/*'], rootDir: './src' }),
+    copy({
+        patterns: ['**/cdm-locales/**/*', '**/*.gql', '**/**/*.graphql', '**/styles/**/*', '**/templates/**/*', '**/css/**/*'],
+        rootDir: './src',
+    }),
+    json(),
 ];
 
 function deepMergeConfigs(baseConfig, specificConfig) {
@@ -35,39 +41,55 @@ const baseConfig = {
             include: ['**/*.ejs', '**/*.graphql'],
         }),
         addJsExtensionToImportsPlugin({
-            packages: '*',
-            needToAddIndexJs: [],
+            packages: ['@react-icons/all-files', '@apollo/client', '@vscode-alt/monaco-editor'],
+            needToAddIndexJs: ['@apollo/client'],
             excludeImports: ['@emotion/react/jsx-runtime'],
         }),
-        typescript(), // TypeScript at the top as per best practices
+        typescript(), // Initially include the TypeScript plugin
         ignoreCssUrlPlugin(),
-        modifyLibFilesPlugin({
-            include: ['**/**/compute.js'], // Adjust to target specific files or patterns
-            outputDir: 'lib', // Ensure this matches your actual output directory
-        }),
-        generateJsonFromObject({}),
-
         ...additionalPlugins,
     ],
     external: (id) => !/^[./]/.test(id),
     globals: { react: 'React' },
 };
 
-// Function to create a configuration by extending the base
-function createRollupConfig(overrides, isWatchMode = false) {
-    const config = deepMergeConfigs(baseConfig, overrides);
+// Updated createRollupConfig function to accept an options object as the second parameter.
+// If useEsbuild is true, the TypeScript plugin is removed completely and replaced with the esbuild plugin.
+function createRollupConfig(specificOverrides, options = {}) {
+    const { useEsbuild, isWatchMode, generateRoutesJSON } = options;
+    const config = deepMergeConfigs(baseConfig, specificOverrides);
 
-    // Adjust TypeScript plugin based on watch mode
-    config.plugins = config.plugins.map((plugin) => {
-        if (plugin.name === 'typescript') {
-            return typescript({
-                ...plugin.options,
-                noEmitOnError: !isWatchMode, // Set to false only in watch mode
-            });
-        }
-        return plugin;
-    });
+    // Conditionally add both modifyLibFilesPlugin and generateJsonFromObject plugins if generateRoutesJSON option is provided.
+    if (generateRoutesJSON) {
+        // Add modifyLibFilesPlugin with predetermined configuration.
+        config.plugins.push(modifyLibFilesPlugin({
+            include: ['**/**/compute.js'], // Adjust to target specific files or patterns
+            outputDir: 'lib',              // Ensure this matches your actual output directory
+        }));
+        // Allow generateRoutesJSON to be an object with plugin configuration or simply a boolean.
+        const jsonConfig = typeof generateRoutesJSON === 'object' ? generateRoutesJSON : {};
+        config.plugins.push(generateJsonFromObject(jsonConfig));
+    }
 
+    if (useEsbuild) {
+        // Remove the TypeScript plugin completely.
+        config.plugins = config.plugins.filter((plugin) => plugin.name !== 'typescript');
+        // Add the esbuild plugin only. Note: The "watch" option is removed as it's not supported by esbuild.
+        config.plugins.push(esbuild({
+            target: 'es2017', // Adjust the target as needed
+        }));
+    } else {
+        // Retain the TypeScript plugin and adjust its options based on watch mode.
+        config.plugins = config.plugins.map((plugin) => {
+            if (plugin.name === 'typescript') {
+                return typescript({
+                    ...plugin.options,
+                    noEmitOnError: !isWatchMode, // Adjust based on watch mode
+                });
+            }
+            return plugin;
+        });
+    }
     return config;
 }
 

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

@@ -24,13 +24,15 @@ import {
     setupNpmAuth,
     setupNxConfig,
 } from './updates';
-// import { generateBackend, generateFrontend } from '../../index';
 import { addBackendGenerator as generateBackend } from '../add-backend/generator';
 import { addFrontendGenerator as generateFrontend } from '../add-frontend/generator';
 import { addMoleculerGenerator as generateMoleculer } from '../add-moleculer/generator';
 import { addPackageGenerator as generatePackage } from '../add-package/generator';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
+    // Immediately set the environment variable to skip NX config
+    process.env.SKIP_NX_CONFIG = 'true';
+
     let projectPath = options.path || '';
     if (projectPath !== '') {
         const basePath = process.cwd();
@@ -90,7 +92,11 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
         }
     }
 
-    // Add this before commitInitialFiles
+    // Setup Nx config with AWS credentials
+    // Allow skipping via environment variable
+    if (options.skipNxConfig) {
+        process.env.SKIP_NX_CONFIG = 'true';
+    }
     await setupNxConfig(tree, projectRoot);
 
     // Setup git and commit files

package/src/generators/add-fullstack/schema.ts

@@ -0,0 +1,10 @@
+export interface AddFullstackGeneratorSchema {
+    name?: string;
+    path?: string;
+    skipGit?: boolean;
+    skipGitCrypt?: boolean;
+    skipHusky?: boolean;
+    skipNxConfig?: boolean;
+    template?: string;
+    config?: any;
+}

package/src/generators/add-fullstack/updates/nxSetup.ts

@@ -3,93 +3,143 @@ 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
  */
 export async function setupNxConfig(tree: Tree, projectRoot: string) {
-    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 = await new Promise<string>((resolve) => {
-            rl.question('AWS Access Key ID: ', (answer) => {
-                resolve(answer.trim());
-            });
-        });
-        
-        // Prompt for the AWS secret access key if access key ID was provided
-        let awsSecretAccessKey = '';
-        if (awsAccessKeyId) {
-            awsSecretAccessKey = await new Promise<string>((resolve) => {
-                rl.question('AWS Secret Access Key: ', (answer) => {
-                    resolve(answer.trim());
-                });
-            });
-        }
-        
-        // Prompt for the AWS region
-        const awsRegion = await new Promise<string>((resolve) => {
-            rl.question('AWS Region (default: us-east-1): ', (answer) => {
-                resolve(answer.trim() || 'us-east-1');
+    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: readline.Interface, question: string, timeoutMs = 10000): Promise<string> => {
+        return new Promise<string>((resolve) => {
+            let resolved = false;
+
+            const timeout = setTimeout(() => {
+                if (!resolved) {
+                    resolved = true;
+                    console.log(`\nTimeout waiting for input. Skipping.`);
+                    resolve('');
+                }
+            }, timeoutMs);
+
+            rl.question(question, (answer: string) => {
+                if (!resolved) {
+                    resolved = true;
+                    clearTimeout(timeout);
+                    resolve(answer);
+                }
             });
         });
-        
-        // Prompt for the S3 bucket name
-        const awsBucket = await new Promise<string>((resolve) => {
-            rl.question('AWS S3 Bucket Name: ', (answer) => {
-                resolve(answer.trim());
-            });
+    };
+
+    let rl: readline.Interface | undefined;
+    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
-        await 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 = await 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 = {};
-                    }
-                    
-                    if (!json.tasksRunnerOptions.default) {
-                        json.tasksRunnerOptions.default = {
-                            runner: '@nx-aws-plugin/nx-aws-cache',
-                            options: {
-                                runtimeCacheInputs: ['node --version']
-                            }
-                        };
+                        json.tasksRunnerOptions = basicConfig.tasksRunnerOptions;
                     }
-                    
-                    // Update only the AWS credentials
-                    json.tasksRunnerOptions.default.options = {
-                        ...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 = await askWithTimeout(rl, 'AWS Secret Access Key: ');
+            const region = (await askWithTimeout(rl, 'AWS Region (default: us-east-1): ')) || 'us-east-1';
+            const bucketName = await 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 = { ...basicConfig };
+                // Use "as any" to bypass type checking
+                (awsConfig.tasksRunnerOptions.default.options as any) = {
+                    ...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.');
     }
-} 
+}

package/src/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.6",
+        "@common-stack/core": "7.0.4-alpha.6",
+        "@common-stack/server-core": "7.0.4-alpha.9",
+        "@common-stack/server-stack": "7.0.4-alpha.10",
+        "@common-stack/store-mongo": "7.0.4-alpha.10",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/src/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.6",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",

package/src/generators/add-package/files/browser/rollup.config.mjs

@@ -1,4 +1,4 @@
-import { createRollupConfig } from '../../../rollup.config.base.mjs';
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
 // Define any additional plugins specific to this bundle
 const additionalPlugins = [
 ];

package/src/generators/add-package/files/browser/tsconfig.json

@@ -1,28 +1,16 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "declaration": true,
-    "declarationDir": "lib",
-    "types": [
-      "@types/node",
-      "@types/jest",
-      "../../../typings",
-    ],
-    "skipLibCheck": true
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "../../../node_modules",
-    "node_modules",
-    "lib",
-    "lib",
-    "webpack.config.js",
-    "rollup.config.mjs"
-  ]
-}
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "outDir": "lib",
+        "rootDir": "./src",
+        "sourceMap": true,
+        "noImplicitAny": true,
+        "declaration": true,
+        "lib": ["es6", "dom", "esnext", "es2015.core"],
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
+        "jsx": "react"
+    },
+    "include": ["src"],
+    "exclude": ["node_modules", "lib"]
+}

package/src/generators/add-package/files/client/rollup.config.mjs

@@ -1,29 +1,34 @@
-import { createRollupConfig } from '../../../rollup.config.base.mjs';
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
 
 // Define any additional plugins specific to this bundle
-const additionalPlugins = [
- ];
+const additionalPlugins = [];
 
 // Use the createRollupConfig function to merge the base and specific configurations
-export default [
-    createRollupConfig({
-        input: ['src/index.ts'],
-        plugins: [
-            // Spread in additional plugins specific to this config
-            ...additionalPlugins,
-        ],
-        output: [
-            {
-                dir: 'lib',
-                format: 'es',
-                name: 'Client',
-                compact: true,
-                exports: 'named',
-                sourcemap: true,
-                preserveModules: true,
-                chunkFileNames: '[name]-[hash].[format].js',
-                globals: { react: 'React' },
-            },
-        ],
-    }),
-];
+export default (commandLineArgs) => {
+    const isWatchMode = commandLineArgs.watch;
+    return [
+        createRollupConfig({
+            input: ['src/index.ts'],
+            plugins: [
+                // Spread in additional plugins specific to this config
+                ...additionalPlugins,
+            ],
+            output: [
+                {
+                    dir: 'lib',
+                    format: 'es',
+                    name: 'Accounts',
+                    compact: true,
+                    exports: 'named',
+                    sourcemap: true,
+                    preserveModules: true,
+                    chunkFileNames: '[name]-[hash].[format].js',
+                    globals: { react: 'React' },
+                },
+            ],
+        }, {
+            isWatchMode,
+            generateRoutesJSON: false,
+        }),
+    ];
+};

package/src/generators/add-package/files/client/tsconfig.json

@@ -1,27 +1,14 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "jsx": "react",
-    "rootDir": "src",
-    "outDir": "lib",
-    "declaration": true,
-    "declarationDir": "lib",
-    "types": [
-      "@types/node",
-      "@types/jest",
-      "../../../typings",
-    ],
-    "skipLibCheck": true
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "../../../node_modules",
-    "node_modules",
-    "lib",
-    "lib",
-    "webpack.config.js",
-    "rollup.config.mjs"
-  ]
-}
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "jsx": "react",
+        "rootDir": "src",
+        "outDir": "lib",
+        "declaration": true,
+        "declarationDir": "lib",
+        "types": ["@types/node", "@types/jest", "../../../typings"],
+        "skipLibCheck": true
+    },
+    "include": ["src"],
+    "exclude": ["../../../node_modules", "node_modules", "lib", "webpack.config.js", "rollup.config.mjs"]
+}