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

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

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),filesConfig=require('../../utils/filesConfig.cjs'),syncConfig=require('../../utils/syncConfig.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 addPackageGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),filesConfig=require('../../utils/filesConfig.cjs'),syncConfig=require('../../utils/syncConfig.cjs'),copyDotfiles=require('../../utils/copyDotfiles.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 addPackageGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         if (!index.isValid(options.name)) {
             console.error('Package name can not be empty, please try again!');
@@ -14,7 +14,7 @@
             generatePackage(tree, Object.assign(Object.assign({}, options), { type: packageType.toLocaleLowerCase() }), true);
         }
         else {
-            packages.forEach(pkg => {
+            packages.forEach((pkg) => {
                 const configs = Object.assign(Object.assign({}, options), { type: pkg });
                 generatePackage(tree, configs, true);
             });
@@ -31,20 +31,62 @@
 //     await formatFiles(tree);
 // }
 const generatePackage = (tree_1, options_1, ...args_1) => tslib.__awaiter(void 0, [tree_1, options_1, ...args_1], void 0, function* (tree, options, cmdLine = false) {
-    const basePath = `${options.name}/${options.type}`;
-    const packageRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${basePath}` : basePath;
-    const baseName = index.isValid(options.name) ? `${options.name}-${options.type}` : options.type;
-    const packageName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${baseName}` : baseName;
-    devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', options.type), packageRoot, options);
-    devkit.updateJson(tree, `${packageRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = packageName;
+    var _a, _b;
+    const packageName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'empty-package';
+    let projectRoot = '';
+    if (index.isValid(options.directory)) {
+        projectRoot = `${index.getValid(options.directory)}/${packageName}`;
+    }
+    else {
+        projectRoot = `packages/${packageName}`;
+    }
+    // Namespace the package if provided
+    let fullPackageName = packageName;
+    if (index.isValid(options.ns)) {
+        fullPackageName = `${index.getValid(options.ns)}-${packageName}`;
+    }
+    // Calculate the offset from root for relative paths in templates
+    const offset = devkit.offsetFromRoot(projectRoot);
+    // Define template options with offsetFromRoot for relative paths
+    const templateOptions = Object.assign(Object.assign({}, options), { name: fullPackageName, offsetFromRoot: offset, template: '', dot: '.' });
+    // Determine the package type and generate files accordingly
+    const packageType = (_b = index.getValid(options.type)) !== null && _b !== void 0 ? _b : 'core';
+    console.log(`Generating ${packageType} package: ${fullPackageName} at ${projectRoot}`);
+    // Generate the appropriate package files based on type
+    switch (packageType) {
+        case 'browser':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'browser'), projectRoot, templateOptions);
+            break;
+        case 'client':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'client'), projectRoot, templateOptions);
+            break;
+        case 'server':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'server'), projectRoot, templateOptions);
+            break;
+        case 'core':
+        default:
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'core'), projectRoot, templateOptions);
+            break;
+    }
+    // Rename underscore-prefixed files to dot files
+    copyDotfiles.renameDotFiles(tree, projectRoot);
+    // Copy .npmrc from the main project root if exists
+    const mainProjectRoot = options.projectRoot || '';
+    copyDotfiles.copyNpmrc(tree, mainProjectRoot, projectRoot);
+    // Update package.json with the correct package name
+    devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson.name = fullPackageName;
         return packageJson;
     });
     if (cmdLine) {
-        syncConfig.syncConfig(tree, packageRoot, options);
+        syncConfig.syncConfig(tree, projectRoot, options);
     }
     else {
-        filesConfig.processFiles(tree, packageRoot, options);
+        filesConfig.processFiles(tree, projectRoot, options);
         yield devkit.formatFiles(tree);
     }
+    return {
+        packageName: fullPackageName,
+        projectRoot,
+    };
 });exports.addPackageGenerator=addPackageGenerator;exports.default=addPackageGenerator;exports.generatePackage=generatePackage;//# sourceMappingURL=generator.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","formatFiles","__awaiter","generateFiles","path","updateJson","syncConfig","processFiles"],"mappings":"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"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","formatFiles","__awaiter","offsetFromRoot","generateFiles","path","renameDotFiles","copyNpmrc","updateJson","syncConfig","processFiles"],"mappings":"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"}

package/lib/generators/add-package/generator.d.ts

@@ -1,5 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { AddPackageGeneratorSchema } from './schema';
 export declare function addPackageGenerator(tree: Tree, options: AddPackageGeneratorSchema): Promise<void>;
-export declare const generatePackage: (tree: Tree, options: any, cmdLine?: boolean) => Promise<void>;
+export declare const generatePackage: (tree: Tree, options: any, cmdLine?: boolean) => Promise<{
+    packageName: string;
+    projectRoot: string;
+}>;
 export default addPackageGenerator;

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

@@ -1,4 +1,4 @@
-import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';import {processFiles}from'../../utils/filesConfig.mjs';import {syncConfig}from'../../utils/syncConfig.mjs';function addPackageGenerator(tree, options) {
+import {__awaiter}from'tslib';import {formatFiles,offsetFromRoot,generateFiles,updateJson}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';import {processFiles}from'../../utils/filesConfig.mjs';import {syncConfig}from'../../utils/syncConfig.mjs';import {renameDotFiles,copyNpmrc}from'../../utils/copyDotfiles.mjs';function addPackageGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!isValid(options.name)) {
             console.error('Package name can not be empty, please try again!');
@@ -14,7 +14,7 @@ import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'
             generatePackage(tree, Object.assign(Object.assign({}, options), { type: packageType.toLocaleLowerCase() }), true);
         }
         else {
-            packages.forEach(pkg => {
+            packages.forEach((pkg) => {
                 const configs = Object.assign(Object.assign({}, options), { type: pkg });
                 generatePackage(tree, configs, true);
             });
@@ -31,20 +31,62 @@ import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'
 //     await formatFiles(tree);
 // }
 const generatePackage = (tree_1, options_1, ...args_1) => __awaiter(void 0, [tree_1, options_1, ...args_1], void 0, function* (tree, options, cmdLine = false) {
-    const basePath = `${options.name}/${options.type}`;
-    const packageRoot = isValid(options.directory) ? `${getValid(options.directory)}/${basePath}` : basePath;
-    const baseName = isValid(options.name) ? `${options.name}-${options.type}` : options.type;
-    const packageName = isValid(options.ns) ? `${getValid(options.ns)}-${baseName}` : baseName;
-    generateFiles(tree, path.join(__dirname, 'files', options.type), packageRoot, options);
-    updateJson(tree, `${packageRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = packageName;
+    var _a, _b;
+    const packageName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'empty-package';
+    let projectRoot = '';
+    if (isValid(options.directory)) {
+        projectRoot = `${getValid(options.directory)}/${packageName}`;
+    }
+    else {
+        projectRoot = `packages/${packageName}`;
+    }
+    // Namespace the package if provided
+    let fullPackageName = packageName;
+    if (isValid(options.ns)) {
+        fullPackageName = `${getValid(options.ns)}-${packageName}`;
+    }
+    // Calculate the offset from root for relative paths in templates
+    const offset = offsetFromRoot(projectRoot);
+    // Define template options with offsetFromRoot for relative paths
+    const templateOptions = Object.assign(Object.assign({}, options), { name: fullPackageName, offsetFromRoot: offset, template: '', dot: '.' });
+    // Determine the package type and generate files accordingly
+    const packageType = (_b = getValid(options.type)) !== null && _b !== void 0 ? _b : 'core';
+    console.log(`Generating ${packageType} package: ${fullPackageName} at ${projectRoot}`);
+    // Generate the appropriate package files based on type
+    switch (packageType) {
+        case 'browser':
+            generateFiles(tree, path.join(__dirname, 'files', 'browser'), projectRoot, templateOptions);
+            break;
+        case 'client':
+            generateFiles(tree, path.join(__dirname, 'files', 'client'), projectRoot, templateOptions);
+            break;
+        case 'server':
+            generateFiles(tree, path.join(__dirname, 'files', 'server'), projectRoot, templateOptions);
+            break;
+        case 'core':
+        default:
+            generateFiles(tree, path.join(__dirname, 'files', 'core'), projectRoot, templateOptions);
+            break;
+    }
+    // Rename underscore-prefixed files to dot files
+    renameDotFiles(tree, projectRoot);
+    // Copy .npmrc from the main project root if exists
+    const mainProjectRoot = options.projectRoot || '';
+    copyNpmrc(tree, mainProjectRoot, projectRoot);
+    // Update package.json with the correct package name
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson.name = fullPackageName;
         return packageJson;
     });
     if (cmdLine) {
-        syncConfig(tree, packageRoot, options);
+        syncConfig(tree, projectRoot, options);
     }
     else {
-        processFiles(tree, packageRoot, options);
+        processFiles(tree, projectRoot, options);
         yield formatFiles(tree);
     }
+    return {
+        packageName: fullPackageName,
+        projectRoot,
+    };
 });export{addPackageGenerator,addPackageGenerator as default,generatePackage};//# sourceMappingURL=generator.mjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"yWASsB,SAAA,mBAAmB,CAAC,IAAU,EAAE,OAAkC,EAAA;;QACpF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AACxB,YAAA,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YAClE,OAAO;SACV;QAED,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACzD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,WAAW,IAAI,WAAW,CAAC,iBAAiB,EAAE,KAAK,KAAK,EAAE;YAC1D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;AACjC,gBAAA,OAAO,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;gBAChG,OAAO;aACV;AACD,YAAA,eAAe,CAAC,IAAI,EAAO,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,OAAO,KAAE,IAAI,EAAE,WAAW,CAAC,iBAAiB,EAAE,EAAI,CAAA,EAAA,IAAI,CAAC,CAAC;SACtF;aAAM;AACH,YAAA,QAAQ,CAAC,OAAO,CAAC,CAAC,GAAG,KAAI;gBACrB,MAAM,OAAO,mCAAa,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,GAAG,GAAE,CAAC;AAC/C,gBAAA,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACzC,aAAC,CAAC,CAAC;SACN;AAED,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA,CAAA;AAED;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AAEO,MAAM,eAAe,GAAG,CAA2D,MAAA,EAAA,SAAA,EAAA,GAAA,MAAA,KAApD,SAAA,CAAA,KAAA,CAAA,EAAA,CAAA,MAAA,EAAA,SAAA,EAAA,GAAA,MAAA,CAAA,EAAA,KAAA,CAAA,EAAA,WAAA,IAAU,EAAE,OAAY,EAAE,OAAA,GAAmB,KAAK,EAAA;;IACpF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,eAAe,CAAC;IAC9D,IAAI,WAAW,GAAG,EAAE,CAAC;AAErB,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC5B,WAAW,GAAG,CAAG,EAAA,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,CAAC;KACjE;SAAM;AACH,QAAA,WAAW,GAAG,CAAA,SAAA,EAAY,WAAW,CAAA,CAAE,CAAC;KAC3C;;IAGD,IAAI,eAAe,GAAG,WAAW,CAAC;AAClC,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACrB,eAAe,GAAG,CAAG,EAAA,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,CAAC;KAC9D;;AAGD,IAAA,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;;IAG3C,MAAM,eAAe,mCACd,OAAO,CAAA,EAAA,EACV,IAAI,EAAE,eAAe,EACrB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,EAAE,EACZ,GAAG,EAAE,GAAG,GACX,CAAC;;IAGF,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,MAAM,CAAC;IAErD,OAAO,CAAC,GAAG,CAAC,CAAc,WAAA,EAAA,WAAW,CAAa,UAAA,EAAA,eAAe,CAAO,IAAA,EAAA,WAAW,CAAE,CAAA,CAAC,CAAC;;IAGvF,QAAQ,WAAW;AACf,QAAA,KAAK,SAAS;AACV,YAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC5F,MAAM;AACV,QAAA,KAAK,QAAQ;AACT,YAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM;AACV,QAAA,KAAK,QAAQ;AACT,YAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YAC3F,MAAM;AACV,QAAA,KAAK,MAAM,CAAC;AACZ,QAAA;AACI,YAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC;YACzF,MAAM;KACb;;AAGD,IAAA,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;;AAGlC,IAAA,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;AAClD,IAAA,SAAS,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;;IAG9C,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,IAAI,GAAG,eAAe,CAAC;AACnC,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;AACT,QAAA,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;KAC1C;SAAM;AACH,QAAA,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AACzC,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B;IAED,OAAO;AACH,QAAA,WAAW,EAAE,eAAe;QAC5B,WAAW;KACd,CAAC;AACN,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "7.0.4-alpha.1",
+    "version": "7.0.4-alpha.3",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "2191788389a85def10699cb0114c12b780291c24"
+    "gitHead": "16fbc2994452790ece9dbf63fe19ea6d6f9ed869"
 }

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

@@ -145,7 +145,7 @@
         "@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/generate-plugin": "7.0.4-alpha.2",
         "@common-stack/rollup-vite-utils": "7.0.4-alpha.0",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.3",

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) {
@@ -37,37 +43,54 @@ const baseConfig = {
         addJsExtensionToImportsPlugin({
             packages: '*',
             needToAddIndexJs: [],
-            excludeImports: ['@emotion/react/jsx-runtime'],
+            // exclude fs/promises from modifying
+            excludeImports: ['@emotion/react/jsx-runtime', 'fs/promises', '@apollo/server*'],
         }),
-        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

@@ -31,6 +31,9 @@ import { addMoleculerGenerator as generateMoleculer } from '../add-moleculer/gen
 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 +93,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-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 = [
 ];