@common-stack/generate-plugin 5.0.5-alpha.0 → 5.0.5-alpha.10

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

@@ -0,0 +1,49 @@
+{
+    "name": "browser-package",
+    "version": "3.1.1-alpha.6",
+    "description": "Sample core for higher packages to depend on",
+    "license": "ISC",
+    "author": "CDMBase LLC",
+    "main": "lib/index.js",
+    "module": "lib/index.js",
+    "type": "module",
+    "typings": "lib/index.d.ts",
+    "scripts": {
+        "build": "npm run build:clean && npm run build:lib",
+        "build:clean": "rimraf lib",
+        "build:lib": "rollup -c rollup.config.mjs",
+        "build:lib:watch": "npm run build:lib -- --watch",
+        "jest": "./node_modules/.bin/jest",
+        "prepublish": "npm run build",
+        "schema:download": "./node_modules/.bin/apollo-codegen download-schema http://localhost:8080/graphql --output schema.json ",
+        "schema:generate": "./node_modules/.bin/apollo-codegen generate src/browser/graphql/**/*.gql --schema schema.json --target typescript --output src/browser/graphql/schema.ts",
+        "test": "cross-env ENV_FILE=../../config/test/test.env jest",
+        "test:debug": "npm test -- --runInBand",
+        "test:watch": "npm test -- --watch",
+        "watch": "npm run build:lib:watch"
+    },
+    "dependencies": {
+        "envalid": "~7.2.2",
+        "pluralize": "8.0.0",
+        "react-csv": "^2.0.3"
+    },
+    "peerDependencies": {
+        "@cdm-logger/client": "*",
+        "@common-stack/client-react": "5.0.5-alpha.0",
+        "@remix-run/react": "*",
+        "antd": ">=5.1.6",
+        "lodash": "*",
+        "moment": "*",
+        "react": "*",
+        "react-redux": "*",
+        "redux": ">=4.0.1",
+        "redux-observable": "*",
+        "rxjs": "*"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "typescript": {
+        "definition": "lib/index.d.ts"
+    }
+}

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

@@ -0,0 +1,29 @@
+import { createRollupConfig } from '../../../rollup.config.base.mjs';
+// Define any additional plugins specific to this bundle
+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: 'Browser',
+                compact: true,
+                exports: 'named',
+                sourcemap: true,
+                preserveModules: true,
+                chunkFileNames: '[name]-[hash].[format].js',
+                globals: { react: 'React' },
+            },
+        ],
+    }),
+];

package/lib/generators/add-browser-package/files/src/index.ts.template

@@ -0,0 +1,4 @@
+import { Feature } from '@common-stack/client-react';
+import { repository } from './module';
+export * from './interfaces';
+export default new Feature(repository);

package/lib/generators/add-browser-package/files/src/interfaces/index.ts.template

@@ -0,0 +1 @@
+export * from './interfaces';

package/lib/generators/add-browser-package/files/src/interfaces/interfaces.ts.template

@@ -0,0 +1 @@
+import * as React from 'react';

package/lib/generators/add-browser-package/files/src/module.tsx.template

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { Feature } from '@common-stack/client-react';
+
+export const repository = new Feature({
+  routeConfig: [],
+  componentFillPlugins: [],
+});

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

@@ -0,0 +1,28 @@
+{
+  "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"
+  ]
+}

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

@@ -0,0 +1,71 @@
+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-browser-package/generator.cjs

@@ -0,0 +1,19 @@
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.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 addBrowserPackageGenerator(tree, options) {
+    return tslib.__awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'browser-package';
+        const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
+        // addProjectConfiguration(tree, options.name, {
+        //     root: projectRoot,
+        //     projectType: 'library',
+        //     sourceRoot: `${projectRoot}/src`,
+        //     targets: {},
+        // });
+        devkit.generateFiles(tree, path__namespace.join(__dirname, 'files'), projectRoot, options);
+        devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+            packageJson['name'] = projectName;
+            return packageJson;
+        });
+        yield devkit.formatFiles(tree);
+    });
+}exports.addBrowserPackageGenerator=addBrowserPackageGenerator;exports.default=addBrowserPackageGenerator;//# sourceMappingURL=generator.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-browser-package/generator.ts"],"sourcesContent":[null],"names":["getValid","isValid","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKsB,SAAA,0BAA0B,CAAC,IAAU,EAAE,OAAyC,EAAA;;;QAClG,MAAM,WAAW,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;QAChE,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGD,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzEC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

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

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+import { AddBrowserPackageGeneratorSchema } from './schema';
+export declare function addBrowserPackageGenerator(tree: Tree, options: AddBrowserPackageGeneratorSchema): Promise<void>;
+export default addBrowserPackageGenerator;

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

@@ -0,0 +1,19 @@
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {getValid,isValid}from'../../utils/index.mjs';function addBrowserPackageGenerator(tree, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'browser-package';
+        const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
+        // addProjectConfiguration(tree, options.name, {
+        //     root: projectRoot,
+        //     projectType: 'library',
+        //     sourceRoot: `${projectRoot}/src`,
+        //     targets: {},
+        // });
+        generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
+        updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+            packageJson['name'] = projectName;
+            return packageJson;
+        });
+        yield formatFiles(tree);
+    });
+}export{addBrowserPackageGenerator,addBrowserPackageGenerator as default};//# sourceMappingURL=generator.mjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-browser-package/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"2KAKsB,SAAA,0BAA0B,CAAC,IAAU,EAAE,OAAyC,EAAA;;;QAClG,MAAM,WAAW,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;QAChE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;;;;;;;AAO/G,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACzE,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;AACH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,19 @@
+{
+    "$schema": "https://json-schema.org/schema",
+    "$id": "AddBrowserPackage",
+    "title": "",
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What name would you like to use?"
+        },
+        "directory": {
+            "type": "string",
+            "description": "",
+            "x-prompt": "What directory would you like to create in?"
+        }
+    },
+    "required": ["name", "directory"]
+}

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

@@ -1,13 +1,14 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.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);const DEFAULT_FRAMEWORK = 'antui';
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),index$1=require('../../constants/index.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);const DEFAULT_FRAMEWORK = index$1.FRAMEWORK_ANTUI;
 function addFrontendGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
-        const basePath = process.cwd();
-        const projectName = options.ns ? `frontend-${options.ns}-server` : 'frontend-server';
-        const projectRoot = options.path ? `${options.path}${projectName}` : projectName;
+        var _a;
+        // const basePath = process.cwd();
+        const projectName = index.isValid(options.ns) ? `frontend-${index.getValid(options.ns)}-server` : 'frontend-server';
+        const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
         const projectSrc = `${projectRoot}/src`;
-        const framework = options.framework || DEFAULT_FRAMEWORK;
+        const framework = (_a = index.getValid(options.framework)) !== null && _a !== void 0 ? _a : DEFAULT_FRAMEWORK;
         console.log('UI framework specified: ', framework);
-        index.resetProject(`${basePath}/${projectRoot}`);
+        // resetProject(`${basePath}/${projectRoot}`);
         // addProjectConfiguration(tree, framework, {
         //     root: projectRoot,
         //     projectType: 'library',
@@ -18,10 +19,26 @@ function addFrontendGenerator(tree, options) {
         devkit.generateFiles(tree, path__namespace.join(__dirname, 'frameworks', framework), projectSrc, options);
         devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
             packageJson['name'] = projectName;
+            if (framework === index$1.FRAMEWORK_ANTUI) {
+                packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
+            }
+            else if (framework === index$1.FRAMEWORK_CHAKRAUI) {
+                packageJson['dependencies']["@admin-layout/chakra-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/chakra-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-chakra"] = "latest";
+            }
             return packageJson;
         });
         devkit.updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
             configJson['uiFramework'] = framework;
+            if (framework === index$1.FRAMEWORK_ANTUI) {
+                configJson['modules'].push("@admin-layout/ant-design-pro");
+            }
+            else if (framework === index$1.FRAMEWORK_CHAKRAUI) {
+                configJson['modules'].push("@admin-layout/chakra-design-pro");
+            }
             return configJson;
         });
         yield devkit.formatFiles(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["resetProject","generateFiles","path","updateJson","formatFiles"],"mappings":"whBAKA,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAEZ,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAAA,kBAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAAC,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACHA,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","isValid","getValid","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","formatFiles"],"mappings":"qkBAMA,MAAM,iBAAiB,GAAGA,uBAAe,CAAC;AAEpB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;;;QAEtF,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,YAAYC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,GAAG,iBAAiB,CAAC;QACxG,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAC/G,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;QAExC,MAAM,SAAS,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;AACnE,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;;;;;;;;AAWnD,QAAAC,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,IAAI,SAAS,KAAKL,uBAAe,EAAE;gBAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;gBACvE,WAAW,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,GAAG,QAAQ,CAAC;gBAC/D,WAAW,CAAC,cAAc,CAAC,CAAC,wCAAwC,CAAC,GAAG,QAAQ,CAAC;aACpF;AAAM,iBAAA,IAAI,SAAS,KAAKM,0BAAkB,EAAE;gBACzC,WAAW,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,QAAQ,CAAC;gBAC1E,WAAW,CAAC,cAAc,CAAC,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC;gBAClE,WAAW,CAAC,cAAc,CAAC,CAAC,2CAA2C,CAAC,GAAG,QAAQ,CAAC;aACvF;AAED,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACHD,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,IAAI,SAAS,KAAKL,uBAAe,EAAE;gBAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC9D;AAAM,iBAAA,IAAI,SAAS,KAAKM,0BAAkB,EAAE;gBACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;aACjE;AAED,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

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

@@ -1,13 +1,14 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {resetProject}from'../../utils/index.mjs';const DEFAULT_FRAMEWORK = 'antui';
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI}from'../../constants/index.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const basePath = process.cwd();
-        const projectName = options.ns ? `frontend-${options.ns}-server` : 'frontend-server';
-        const projectRoot = options.path ? `${options.path}${projectName}` : projectName;
+        var _a;
+        // const basePath = process.cwd();
+        const projectName = isValid(options.ns) ? `frontend-${getValid(options.ns)}-server` : 'frontend-server';
+        const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
         const projectSrc = `${projectRoot}/src`;
-        const framework = options.framework || DEFAULT_FRAMEWORK;
+        const framework = (_a = getValid(options.framework)) !== null && _a !== void 0 ? _a : DEFAULT_FRAMEWORK;
         console.log('UI framework specified: ', framework);
-        resetProject(`${basePath}/${projectRoot}`);
+        // resetProject(`${basePath}/${projectRoot}`);
         // addProjectConfiguration(tree, framework, {
         //     root: projectRoot,
         //     projectType: 'library',
@@ -18,10 +19,26 @@ function addFrontendGenerator(tree, options) {
         generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectSrc, options);
         updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
             packageJson['name'] = projectName;
+            if (framework === FRAMEWORK_ANTUI) {
+                packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/ant-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-ant"] = "latest";
+            }
+            else if (framework === FRAMEWORK_CHAKRAUI) {
+                packageJson['dependencies']["@admin-layout/chakra-design-pro"] = "latest";
+                packageJson['dependencies']["@admin-layout/chakra-ui"] = "latest";
+                packageJson['dependencies']["@adminide-stack/user-auth0-browser-chakra"] = "latest";
+            }
             return packageJson;
         });
         updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
             configJson['uiFramework'] = framework;
+            if (framework === FRAMEWORK_ANTUI) {
+                configJson['modules'].push("@admin-layout/ant-design-pro");
+            }
+            else if (framework === FRAMEWORK_CHAKRAUI) {
+                configJson['modules'].push("@admin-layout/chakra-design-pro");
+            }
             return configJson;
         });
         yield formatFiles(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"uKAKA,MAAM,iBAAiB,GAAG,OAAO,CAAC;AAEZ,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;AACtF,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AAC/B,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,GAAG,CAAY,SAAA,EAAA,OAAO,CAAC,EAAE,CAAA,OAAA,CAAS,GAAG,iBAAiB,CAAC;AACrF,QAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,CAAA,EAAG,OAAO,CAAC,IAAI,GAAG,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AACjF,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;AAExC,QAAA,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,iBAAiB,CAAC;AACzD,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;AAEnD,QAAA,YAAY,CAAC,CAAG,EAAA,QAAQ,IAAI,WAAW,CAAA,CAAE,CAAC,CAAC;;;;;;;AAS3C,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"sPAMA,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAEpB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;;;QAEtF,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,YAAY,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,GAAG,iBAAiB,CAAC;QACxG,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;AAC/G,QAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;QAExC,MAAM,SAAS,GAAG,CAAA,EAAA,GAAA,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;AACnE,QAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;;;;;;;;AAWnD,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,QAAA,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACxF,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,YAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,YAAA,IAAI,SAAS,KAAK,eAAe,EAAE;gBAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;gBACvE,WAAW,CAAC,cAAc,CAAC,CAAC,sBAAsB,CAAC,GAAG,QAAQ,CAAC;gBAC/D,WAAW,CAAC,cAAc,CAAC,CAAC,wCAAwC,CAAC,GAAG,QAAQ,CAAC;aACpF;AAAM,iBAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;gBACzC,WAAW,CAAC,cAAc,CAAC,CAAC,iCAAiC,CAAC,GAAG,QAAQ,CAAC;gBAC1E,WAAW,CAAC,cAAc,CAAC,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC;gBAClE,WAAW,CAAC,cAAc,CAAC,CAAC,2CAA2C,CAAC,GAAG,QAAQ,CAAC;aACvF;AAED,YAAA,OAAO,WAAW,CAAC;AACvB,SAAC,CAAC,CAAC;QACH,UAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,YAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,YAAA,IAAI,SAAS,KAAK,eAAe,EAAE;gBAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;aAC9D;AAAM,iBAAA,IAAI,SAAS,KAAK,kBAAkB,EAAE;gBACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;aACjE;AAED,YAAA,OAAO,UAAU,CAAC;AACtB,SAAC,CAAC,CAAC;AAEH,QAAA,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;KAC3B,CAAA,CAAA;AAAA"}

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

@@ -6,16 +6,19 @@
     "properties": {
         "ns": {
             "type": "string",
-            "description": "The project namespace"
+            "description": "The project namespace",
+            "x-prompt": "What name would you like to use?"
         },
-        "path": {
+        "directory": {
             "type": "string",
-            "description": "The project path ex: \"servers/\", default: \"/\""
+            "description": "",
+            "x-prompt": "What directory would you like to create in?"
         },
         "framework": {
             "type": "string",
-            "description": "UI framework in [antui, chakraui]"
+            "description": "",
+            "x-prompt": "What UI framework would you like to use in [antui, chakraui]?"
         }
     },
-    "required": ["ns"]
+    "required": ["ns", "directory", "framework"]
 }

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

@@ -1,58 +1,50 @@
 {
-    "commonPaths": {
-    },
-    "copyOperations": [
+  "commonPaths": {
+    "appPath": "app",
+    "frontendStackPath": "frontend-stack-react"
+  },
+  "copyOperations": [
+    {
+      "packageName": "@common-stack/frontend-stack-react",
+      "destPath": "$.commonPaths.frontendStackPath",
+      "generateModule": true
+    }
+  ],
+  "i18n": {
+    "enabled": true,
+    "fallbackLng": "en",
+    "supportedLngs": [
+      "en",
+      "de",
+      "es"
     ],
-    "i18n": {
-      "enabled": true,
-      "fallbackLng": "en",
-      "supportedLngs": [
-        "en",
-        "de",
-        "es"
-      ],
-      "defaultNS": "common",
-      "react": {
-        "useSuspense": false
-      },
-      "backend": {
-        "loadPath": "/cdm-locales/{{lng}}/{{ns}}.json",
-        "loadServerPath": "./public/cdm-locales/{{lng}}/{{ns}}.json"
-      },
-      "packages": [
-      ]
+    "defaultNS": "common",
+    "react": {
+      "useSuspense": false
     },
-    "modules": [
-      "@admin-layout/ant-design-pro",
-      "@adminide-stack/account-api-browser",
-      "@adminide-stack/extension-module-browser",
-      "@adminide-stack/user-auth0-browser",
-      "@adminide-stack/user-auth0-browser-ant",
-      "@adminide-stack/billing-api-browser",
-      "@adminide-stack/registry-api-browser",
-      "@adminide-stack/git-api-browser",
-      "@adminide-stack/project-mgmt-browser",
-      "@adminide-stack/integration-api-client",
-      "@adminide-stack/marketplace-module-browser"
-    ],
-    "paths": {
-      "lifecycleMiddleware": "@adminide-stack/platform-client/lib/middleware/lifecycleMiddleware.js"
+    "backend": {
+      "loadPath": "/cdm-locales/{{lng}}/{{ns}}.json",
+      "loadServerPath": "./public/cdm-locales/{{lng}}/{{ns}}.json"
     },
-    "buildConfig": {
-      "__CLIENT__": false,
-      "__SERVER__": true,
-      "__DEV__": false,
-      "__TEST__": false,
-      "__CDN_URL__": "",
-      "__GRAPHQL_URL__": "http://localhost:8080/graphql",
-      "__DEBUGGING__": false,
-      "__SSR__": true,
-      "__API_URL__": "/graphql",
-      "__FRONTEND_BUILD_DIR__": "./dist/client",
-      "__WEB_DEV_SERVER_PORT__": 3000,
-      "__GRAPHQL_ENDPOINT__": "/graphql",
-      "__LOCAL_SERVER_HOST__": "localhost",
-      "__BACKEND_URL__": "http://localhost:3000"
-    }
+    "packages": [
+    ]
+  },
+  "modules": [
+  ],
+  "buildConfig": {
+    "__CLIENT__": false,
+    "__SERVER__": true,
+    "__DEV__": false,
+    "__TEST__": false,
+    "__CDN_URL__": "",
+    "__GRAPHQL_URL__": "http://localhost:8080/graphql",
+    "__DEBUGGING__": false,
+    "__SSR__": true,
+    "__API_URL__": "/graphql",
+    "__FRONTEND_BUILD_DIR__": "./dist/client",
+    "__WEB_DEV_SERVER_PORT__": 3000,
+    "__GRAPHQL_ENDPOINT__": "/graphql",
+    "__LOCAL_SERVER_HOST__": "localhost",
+    "__BACKEND_URL__": "http://localhost:3000"
   }
-  
+}

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

@@ -1,6 +1,6 @@
 {
-    "name": "adminide-stack-frontend-server",
-    "version": "3.1.1-alpha.6",
+    "name": "sample-stack-frontend-server",
+    "version": "1.0.0",
     "private": true,
     "description": "Sample Client server",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
@@ -52,8 +52,6 @@
         "watch:test": "cross-env ENV_FILE=../../config/test/test.env node ./server.js"
     },
     "dependencies": {
-        "@admin-layout/ant-design-pro": "7.3.8-alpha.29",
-        "@admin-layout/ant-ui": "7.3.8-alpha.28",
         "@admin-layout/assets": "7.3.8-alpha.0",
         "@admin-layout/icons": "7.3.8-alpha.0",
         "@adminide-stack/account-api-browser": "7.3.8-alpha.0",
@@ -76,12 +74,12 @@
         "@cdm-logger/client": "^9.0.3",
         "@cdm-logger/server": "^9.0.3",
         "@cdmbase/redux-data-router": "^1.0.10",
-        "@common-stack/client-core": "0.0.1",
-        "@common-stack/client-react": "0.0.1",
-        "@common-stack/components-pro": "0.0.1",
-        "@common-stack/core": "0.0.1",
-        "@common-stack/remix-router-redux": "0.0.1",
-        "@common-stack/server-core": "0.0.1",
+        "@common-stack/client-core": "5.0.5-alpha.0",
+        "@common-stack/client-react": "5.0.5-alpha.0",
+        "@common-stack/components-pro": "5.0.5-alpha.0",
+        "@common-stack/core": "5.0.5-alpha.0",
+        "@common-stack/remix-router-redux": "5.0.5-alpha.0",
+        "@common-stack/server-core": "5.0.5-alpha.0",
         "@container-stack/ssh-keygen-server-module": "0.0.36-alpha.23",
         "@container-stack/territory": "5.1.2",
         "@emotion/css": "^11.10.0",
@@ -160,8 +158,8 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/frontend-stack-react": "0.0.1",
-        "@common-stack/rollup-vite-utils": "0.0.1",
+        "@common-stack/frontend-stack-react": "5.0.5-alpha.5",
+        "@common-stack/rollup-vite-utils": "5.0.5-alpha.9",
         "@remix-run/dev": "^2.8.1",
         "@remix-run/serve": "^2.8.1",
         "cross-env": "^7.0.3",