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

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"]
+}

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

@@ -1,65 +1,37 @@
-import graphql from '@rollup/plugin-graphql';
-import image from '@rollup/plugin-image';
-import typescript from '@rollup/plugin-typescript';
-import { string } from 'rollup-plugin-string';
-function appendJsExtensionForMonacoEditor() {
-    return {
-        name: 'append-js-extension-for-monaco-editor',
-        transform(code, id) {
-            // Only modify .ts files and ignore node_modules
-            if (id.includes('node_modules') || !id.endsWith('.ts')) {
-                return null;
-            }
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
 
-            let modifiedCode = code;
-            const monacoImportRegex = /(@vscode-alt\/monaco-editor\/esm\/vs\/[a-zA-Z0-9\/._-]+)(?<!\.js)('|")/g;
+// Define any additional plugins specific to this bundle
+const additionalPlugins = [];
 
-            modifiedCode = modifiedCode.replace(monacoImportRegex, (match, p1, p2) => {
-                // Directly append '.js' to the captured path, excluding if it already ends with '.js'
-                return `${p1}.js${p2}`;
-            });
-
-            return {
-                code: modifiedCode,
-                map: null, // Returning null for simplicity, consider generating source maps if necessary
-            };
-        },
-    };
-}
-
-const bundle = (config) => ({
-    ...config,
-    input: 'src/index.ts',
-    // marking all node modules as external
-    external: (id) => !/^[./]/.test(id),
-});
-const globals = { react: 'React' };
-
-export default [
-    bundle({
-        plugins: [
-            typescript({ noEmitOnError: true }),
-            image(),
-            graphql({
-                include: '**/*.gql',
-            }),
-            string({
-                include: '**/*.graphql',
-            }),
-            appendJsExtensionForMonacoEditor(),
-        ],
-        output: [
+// Use the createRollupConfig function to merge the base and specific configurations
+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' },
+                    },
+                ],
+            },
             {
-                dir: 'lib',
-                format: 'es',
-                name: 'Core',
-                compact: true,
-                exports: 'named',
-                sourcemap: false,
-                preserveModules: true,
-                chunkFileNames: '[name]-[hash].[format].js',
-                globals,
+                isWatchMode,
+                generateRoutesJSON: false,
             },
-        ],
-    }),
-];
+        ),
+    ];
+};

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

@@ -1,22 +1,13 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "declaration": true,
-    "preserveConstEnums": true,
-    "declarationDir": "lib"
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "../../../node_modules",
-    "node_modules",
-    "lib",
-    "lib",
-    "webpack.config.js",
-    "rollup.config.mjs"
-  ]
-}
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "rootDir": "src",
+        "outDir": "lib",
+        "declaration": true,
+        "preserveConstEnums": true,
+        "declarationDir": "lib"
+    },
+    "include": ["src"],
+    "exclude": ["../../../node_modules", "node_modules", "lib", "webpack.config.js", "rollup.config.mjs"]
+}

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

@@ -1,30 +1,37 @@
-import { createRollupConfig } from '../../../rollup.config.base.mjs';
-import json from '@rollup/plugin-json'
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
+import json from '@rollup/plugin-json';
 
 // Define any additional plugins specific to this bundle
-const additionalPlugins = [
-    json()
-];
+const additionalPlugins = [json()];
 
 // 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: [
+export default (commandLineArgs) => {
+    const isWatchMode = commandLineArgs.watch;
+    return [
+        createRollupConfig(
             {
-                dir: 'lib',
-                format: 'es',
-                name: 'Server',
-                compact: true,
-                exports: 'named',
-                sourcemap: true,
-                preserveModules: true,
-                chunkFileNames: '[name]-[hash].[format].js',
+                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',
+                    },
+                ],
             },
-        ],
-    }),
-];
+            {
+                isWatchMode,
+                generateRoutesJSON: false,
+            },
+        ),
+    ];
+};

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

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

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

@@ -1,9 +1,11 @@
-import { addProjectConfiguration, formatFiles, generateFiles, Tree, updateJson } from '@nx/devkit';
+/* eslint-disable import/no-extraneous-dependencies */
+import { formatFiles, generateFiles, Tree, updateJson, offsetFromRoot } from '@nx/devkit';
 import * as path from 'path';
 import { AddPackageGeneratorSchema } from './schema';
 import { isValid, getValid } from '../../utils';
 import { processFiles } from '../../utils/filesConfig';
 import { syncConfig } from '../../utils/syncConfig';
+import { renameDotFiles, copyNpmrc } from '../../utils/copyDotfiles';
 
 export async function addPackageGenerator(tree: Tree, options: AddPackageGeneratorSchema) {
     if (!isValid(options.name)) {
@@ -14,14 +16,14 @@ export async function addPackageGenerator(tree: Tree, options: AddPackageGenerat
     const packages = ['core', 'client', 'browser', 'server'];
     const packageType = getValid(options.packageType);
     if (packageType && packageType.toLocaleLowerCase() !== 'all') {
-        if(!packages.includes(packageType)) {
+        if (!packages.includes(packageType)) {
             console.error('Package type is not available! please choice in Client|Browser|Core|Server|All');
             return;
         }
-        generatePackage(tree, {...options, type: packageType.toLocaleLowerCase()}, true);
+        generatePackage(tree, { ...options, type: packageType.toLocaleLowerCase() }, true);
     } else {
-        packages.forEach(pkg => {
-            const configs: any = {...options, type: pkg};
+        packages.forEach((pkg) => {
+            const configs: any = { ...options, type: pkg };
             generatePackage(tree, configs, true);
         });
     }
@@ -35,28 +37,84 @@ export async function addPackageGenerator(tree: Tree, options: AddPackageGenerat
 //         configs.type = packageName;
 //         generatePackage(tree, configs, false);
 //     }
-    
+
 //     await formatFiles(tree);
 // }
 
 export const generatePackage = async (tree: Tree, options: any, cmdLine: boolean = 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;
+    const packageName = getValid(options.name) ?? '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 = {
+        ...options,
+        name: fullPackageName,
+        offsetFromRoot: offset,
+        template: '',
+        dot: '.',
+    };
+
+    // Determine the package type and generate files accordingly
+    const packageType = getValid(options.type) ?? '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);
         await formatFiles(tree);
     }
-}
+
+    return {
+        packageName: fullPackageName,
+        projectRoot,
+    };
+};
 
 export default addPackageGenerator;

package/lib/generators/add-package/files/browser/webpack.config.js

@@ -1,71 +0,0 @@
-var nodeExternals = require('webpack-node-externals');
-var webpack = require('webpack');
-var path = require('path');
-
-var webpack_opts = {
-    mode: 'development',
-    entry: './src/index.tsx',
-    target: 'node',
-    output: {
-        path: path.join(__dirname, 'lib'),
-        filename: 'index.js',
-        libraryTarget: "commonjs2",
-    },
-    node: {
-        __dirname: false
-    },
-    resolve: {
-        extensions: ['.ts', '.tsx', '.graphql', '.gql'],
-    },
-    plugins: [
-        new webpack.LoaderOptionsPlugin({
-            options: {
-                test: /\.tsx?$/,
-                ts: {
-                    compiler: 'typescript',
-                    configFile: 'tsconfig.json'
-                },
-                tslint: {
-                    emitErrors: true,
-                    failOnHint: true
-                }
-            }
-        })
-    ],
-    devtool: 'source-map',
-    module: {
-        rules: [{
-            test: /\.tsx?$/,
-            use: 'ts-loader'
-        },
-        {
-            test: /\.(pdf|jpg|png|gif|svg|ico)$/,
-            use: [
-                {
-                    loader: "url-loader"
-                }
-            ]
-        },
-        {
-            test: /\.mjs$/,
-            include: /node_modules/,
-            type: 'javascript/auto',
-        },
-        {
-            test: /\.graphql?/,
-            exclude: /node_modules/,
-            use: 'raw-loader',
-        }, {
-            test: /\.(gql)$/,
-            exclude: /node_modules/,
-            use: ['graphql-tag/loader']
-        }
-        ]
-    },
-    externals: [
-        nodeExternals({ modulesDir: "../../../node_modules" }),
-        nodeExternals()
-    ]
-};
-
-module.exports = webpack_opts;

package/lib/generators/add-package/files/client/webpack.config.js

@@ -1,72 +0,0 @@
-var nodeExternals = require('webpack-node-externals');
-var webpack = require('webpack');
-var path = require('path');
-var fs = require('fs');
-
-var webpack_opts = {
-  mode: 'development',
-  entry: './src/index.ts',
-  target: 'node',
-  output: {
-    path: path.join(__dirname, 'lib'),
-    filename: 'index.js',
-    libraryTarget: "commonjs2",
-  },
-  node: {
-    __dirname: false
-  },
-  resolve: {
-    extensions: ['.ts', '.tsx', '.graphql', '.gql'],
-  },
-  plugins: [
-    new webpack.LoaderOptionsPlugin({
-      options: {
-        test: /\.tsx?$/,
-        ts: {
-          compiler: 'typescript',
-          configFile: 'tsconfig.json'
-        },
-        tslint: {
-          emitErrors: true,
-          failOnHint: true
-        }
-      }
-    })
-  ],
-  devtool: 'source-map',
-  module: {
-    rules: [{
-      test: /\.tsx?$/,
-      use: 'ts-loader'
-    },
-    {
-      test: /\.mjs$/,
-      include: /node_modules/,
-      type: 'javascript/auto',
-    },
-    {
-      test: /\.graphql?/,
-      exclude: /node_modules/,
-      use: 'raw-loader',
-    }, {
-      test: /\.(gql)$/,
-      exclude: /node_modules/,
-      use: ['graphql-tag/loader']
-    },
-    {
-      test: /\.(pdf|jpg|png|gif|svg|ico)$/,
-      use: [
-        {
-          loader: "url-loader"
-        }
-      ]
-    },
-    ]
-  },
-  externals: [
-    nodeExternals({ modulesDir: "../../../node_modules" }),
-    nodeExternals()
-  ]
-};
-
-module.exports = webpack_opts;