@common-stack/generate-plugin 8.0.2-alpha.1 → 8.1.1-alpha.1

package/src/generators/add-frontend/templates/vite.config.ts.template

@@ -1,23 +1,26 @@
-import { defineConfig } from 'vite';
+import { defineConfig, ConfigEnv, UserConfig } from 'vite';
 import { vitePlugin as remix } from '@remix-run/dev';
 import { dirname, resolve } from 'path';
-import { installGlobals } from '@remix-run/node';
 import { fileURLToPath } from 'url';
-import { defineRoutesConfig } from '@common-stack/rollup-vite-utils/lib/vite-wrappers/json-wrappers.js';
+// import { remixDevTools } from 'remix-development-tools';
 import tsconfigPaths from 'vite-tsconfig-paths';
 import { i18nInternationalizationPlugin } from '@common-stack/rollup-vite-utils/lib/vite-plugins/i18n-internationalization-plugin.js';
-import { performCopyOperations } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/configLoader.js';
+// import { visualizer } from 'rollup-plugin-visualizer';
 import { loadEnvConfig } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/envLoader.js';
 import { cjsInterop } from 'vite-plugin-cjs-interop';
 import { mergeWith } from 'lodash-es';
-import config from './app/cde-webconfig.json' assert { type: 'json' };
+import config from './app/cde-webconfig.json' with { type: 'json' };
 
-// This installs globals such as "fetch", "Response", "Request" and "Headers".
-installGlobals();
+declare module '@remix-run/node' {
+    // or cloudflare, deno, etc.
+    interface Future {
+        v3_singleFetch: true;
+    }
+}
 
 const directoryName = dirname(fileURLToPath(import.meta.url));
 
-export default defineConfig(async ({ isSsrBuild }) => {
+export default defineConfig(async ({ isSsrBuild }: ConfigEnv): Promise<UserConfig> => {
     console.log('--- IS SSR BUILD:', isSsrBuild);
 
     // Load environment variables from dotenv or other config
@@ -32,69 +35,105 @@ export default defineConfig(async ({ isSsrBuild }) => {
             Object.entries(config.buildConfig).map(([key, value]) => [
                 key,
                 typeof value === 'string' ? `"${value.replace(/\\/g, '\\\\')}"` : value,
-            ])
+            ]),
         ),
     };
 
-    // Define routes configuration
-    const routesConfig = async (defineRoutes) => {
-        // In production, perform required file copy operations
-        if (process.env.NODE_ENV === 'production') {
-            await performCopyOperations(config);
-        }
-
-        // Load metadata for routes
-        let metaJson = null;
-        try {
-            metaJson = await import('./app/sync-meta.json');
-        } catch {
-            console.warn('No sync-meta.json found, continuing without metadata.');
-        }
-
-        // Return routes definition
-        return defineRoutes((routeFn) =>
-            defineRoutesConfig(
-                routeFn,
-                {
-                    routesFileName: 'routes.json',
-                    packages: config.modules,
-                    paths: config.paths,
-                    iconsRepository: config?.iconsRepository,
-                    rootPath: resolve(directoryName, '../..'),
-                    settings: {
-                        _useFutureCommonPackage: true,
-                    },
-                },
-                metaJson
-            )
-        );
-    };
-
     // Vite configuration
     const viteConfig = {
         define: envVariables,
+        ssr: {
+            // Keep small client-only libraries bundled, including all @radix-ui packages
+            // to ensure proper CommonJS to ESM interop handled by cjsInterop plugin
+            noExternal: [
+                'react-datepicker',
+                /^@radix-ui\//,
+                '@radix-ui/react-slot',
+                '@radix-ui/react-primitive',
+                '@radix-ui/react-compose-refs',
+                '@radix-ui/react-context',
+                '@radix-ui/react-collection',
+                '@radix-ui/react-separator',
+            ],
+        },
         plugins: [
+            // remixDevTools({
+            //     server: {
+            //         logs: {
+            //             cookies: true,
+            //             defer: true,
+            //             actions: true,
+            //             loaders: true,
+            //             cache: true,
+            //             siteClear: true,
+            //         },
+            //     },
+            // }),
             i18nInternationalizationPlugin({
                 folderName: 'cdm-locales',
                 packages: [...config.modules, ...config.i18n.packages],
-                namespaceResolution: 'basename',
+                namespaceResolution: 'basename' as any,
             }),
+            // visualizer({
+            //     open: true,
+            //     filename: 'bundle-analysis.html',
+            // }),
+            // cjsInterop({
+            //     dependencies: ['@apollo/client', '@ant-design/pro-utils', '@rjsf/**',],
+            // }),
             cjsInterop({
-                dependencies: ['@apollo/client'],
+                dependencies: [
+                    '@rjsf/**',
+                    'react-timer-hook',
+                    'rc-util/lib/hooks/useMergedState.js',
+                    '@ant-design/icons',
+                    'rc-picker',
+                    '@monaco-editor/loader',
+                    'react-google-calendar-api',
+                    '@apollo/client',
+                ],
             }),
             remix({
                 appDirectory: 'src',
-                routes: routesConfig,
+                // routes: routesConfig,
+                future: {
+                    unstable_optimizeDeps: true,
+                    v3_fetcherPersist: true,
+                    v3_relativeSplatPath: true,
+                    v3_throwAbortReason: true,
+                    v3_lazyRouteDiscovery: true,
+                    v3_singleFetch: true,
+                    v3_routeConfig: true,
+                },
             }),
             tsconfigPaths({ ignoreConfigErrors: true }),
         ],
         optimizeDeps: {
+            include: [
+                '@radix-ui/react-slot',
+                '@radix-ui/react-compose-refs',
+                '@radix-ui/react-primitive',
+                '@radix-ui/react-collection',
+                '@radix-ui/react-dialog',
+                '@radix-ui/react-select',
+                '@radix-ui/react-alert-dialog',
+                '@radix-ui/react-popover',
+                '@radix-ui/react-tooltip',
+                '@radix-ui/react-context-menu',
+            ],
             esbuildOptions: {
                 target: 'esnext',
             },
+            force: true, // Force dependency optimization on every build
         },
         build: {
             target: 'esnext',
+            rollupOptions: {
+                output: {
+                    // Ensure that worker files are properly bundled
+                    format: 'es',
+                },
+            },
         },
         resolve: {
             alias: {
@@ -102,14 +141,18 @@ export default defineConfig(async ({ isSsrBuild }) => {
                 '@src': resolve(directoryName, 'src'),
             },
         },
+        worker: {
+            format: 'es', // Use ES modules format for workers
+            plugins: () => [], // Return an empty array of plugins
+        },
     };
 
     // Deep merge custom Vite config from config.json
-    // to merge Arrays properly need to concat. 
+    // to merge Arrays properly need to concat.
     const result = mergeWith(config.viteConfig, viteConfig, (objValue, srcValue) => {
         if (Array.isArray(objValue)) {
             return objValue.concat(srcValue);
         }
     });
-    return result;
+    return result as UserConfig;
 });

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

@@ -4,7 +4,7 @@ def GIT_BRANCH_NAME=getGitBranchName()
 pipeline {
   agent {
     kubernetes{
-      label 'new-slave-2cpu-8gb'
+      label 'slave-2cpu-8gb'
     }
   }
   parameters {

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

@@ -0,0 +1,7 @@
+node_modules
+dist
+lib
+
+# Generated files
+**/generated/**
+packages/common/src/generated/**

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

@@ -2,10 +2,13 @@
     "servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
     "codegen": {
         "outputFile": "codegen.ts",
-        "rootSchema": "servers/backend-server/src/api/root-schema.graphqls",
+        "rootSchema": "node_modules/@common-stack/graphql-api/root-schema.graphqls",
         "fullConfig": {
             "overwrite": true,
             "schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
+            "hooks": {
+                "afterAllFileWrite": ["node scripts/fix-enum-references.js"]
+            },
             "generates": {
                 "packages/common/src/generated/generated-models.ts": {
                     "schema": "%discoveredSchemas%",
@@ -37,7 +40,8 @@
                         },
                         "typescript",
                         "typescript-operations",
-                        "typescript-resolvers"
+                        "typescript-resolvers",
+                        "typescript-mongodb"
                     ]
                 },
                 "packages/common/src/generated/generated.tsx": {

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

@@ -10,7 +10,7 @@
         "type": "git",
         "url": "git+https://github.com/cdmbase/fullstack-pro.git"
     },
-    "license": "MIT",
+    "license": "UNLICENSED",
     "author": {
         "name": "CDMBase LLC",
         "email": "none@cdmbase.com"
@@ -96,16 +96,12 @@
     },
     "resolutions": {
         "@apollo/client": "^3.9.0",
-        "@nx/workspace": "20.4.3",
         "@types/react": "^18.2.25",
         "@types/react-dom": "^18.2.7",
         "common": "link:packages/common",
         "html-to-text": "^8.0.0",
-        "nx": "20.4.3",
-        "react": "18.3.0-canary-c3048aab4-20240326",
-        "react-dom": "18.3.0-canary-c3048aab4-20240326",
-        "react-native": "0.72.10",
-        "react-native-gesture-handler": "~2.12.0"
+        "react-native": "~0.76.3",
+        "react-native-safe-area-context": "4.12.0"
     },
     "dependencies": {
         "graphql": "^16.0.0",
@@ -140,9 +136,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "8.0.1-alpha.0",
-        "@common-stack/generate-plugin": "8.0.2-alpha.0",
-        "@common-stack/rollup-vite-utils": "8.0.2-alpha.0",
+        "@common-stack/env-list-loader": "8.1.1-alpha.0",
+        "@common-stack/generate-plugin": "8.1.1-alpha.0",
+        "@common-stack/rollup-vite-utils": "8.1.1-alpha.0",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.3",
         "@graphql-codegen/cli": "^5.0.4",
@@ -151,13 +147,13 @@
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
         "@graphql-codegen/typescript": "^4.1.3",
         "@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
+        "@graphql-codegen/typescript-mongodb": "^3.0.0",
         "@graphql-codegen/typescript-operations": "^4.4.1",
         "@graphql-codegen/typescript-react-apollo": "^4.3.2",
         "@graphql-codegen/typescript-resolvers": "^4.4.2",
         "@loadable/babel-plugin": "^5.13.2",
         "@loadable/webpack-plugin": "^5.15.2",
         "@nx-aws-plugin/nx-aws-cache": "^3.2.2",
-        "@nx/workspace": "20.4.3",
         "@redux-devtools/core": "^3.13.1",
         "@redux-devtools/dock-monitor": "^3.0.1",
         "@redux-devtools/log-monitor": "^4.0.1",
@@ -167,7 +163,7 @@
         "@rollup/plugin-image": "^3.0.1",
         "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.2.3",
-        "@rollup/plugin-typescript": "^11.1.5",
+        "@rollup/plugin-typescript": "^12.1.4",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
         "@testing-library/dom": "^10.4.0",
@@ -287,7 +283,7 @@
         "nock": "^13.2.9",
         "node-dev": "^7.4.3",
         "node-hmr-plugin": "^1.0.1",
-        "nodemon": "^2.0.20",
+        "nodemon": "^3.1.10",
         "nodemon-webpack-plugin": "^4.8.1",
         "openurl": "^1.1.1",
         "pm2": "^5.2.2",

package/src/generators/add-fullstack/files/scripts/fix-enum-references.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+// File paths to fix
+const filesToFix = [
+    path.join(__dirname, '../packages/common/src/generated/generated-models.ts'),
+    path.join(__dirname, '../packages/common/src/generated/generated.tsx'),
+];
+
+// Enum mappings - add more mappings here if needed
+const enumMappings = {
+    ICacheControlScope: 'CacheControlScope',
+    // Add more enum mappings here as needed
+    // 'ISomeOtherEnum': 'SomeOtherEnum'
+};
+
+function fixEnumReferences(filePath) {
+    if (!fs.existsSync(filePath)) {
+        console.log(`File not found: ${filePath}`);
+        return;
+    }
+
+    let content = fs.readFileSync(filePath, 'utf8');
+    let hasChanges = false;
+
+    // Apply enum reference fixes
+    Object.entries(enumMappings).forEach(([incorrectRef, correctRef]) => {
+        const regex = new RegExp(`\\b${incorrectRef}\\b`, 'g');
+        if (content.includes(incorrectRef)) {
+            content = content.replace(regex, correctRef);
+            hasChanges = true;
+            console.log(`Fixed: ${incorrectRef} -> ${correctRef} in ${path.basename(filePath)}`);
+        }
+    });
+
+    if (hasChanges) {
+        fs.writeFileSync(filePath, content, 'utf8');
+        console.log(`Updated: ${filePath}`);
+    } else {
+        console.log(`No changes needed in: ${path.basename(filePath)}`);
+    }
+}
+
+function main() {
+    console.log('🔧 Fixing enum references in generated files...');
+
+    filesToFix.forEach(fixEnumReferences);
+
+    console.log('✅ Enum reference fix completed!');
+}
+
+if (require.main === module) {
+    main();
+}
+
+module.exports = { fixEnumReferences, enumMappings };

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

@@ -1,26 +1,22 @@
 {
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "jsx": "react",
-    "skipLibCheck": true,
-    "declaration": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "preserveConstEnums": true,
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "allowSyntheticDefaultImports": true,
-    "pretty": true,
-    "removeComments": false,
-    "lib": [
-      "ES2022",
-      "dom",
-      "esnext.asynciterable"
-    ]
-  },
-  "include": ["src", "typings/*.d.ts"],
-  "exclude": ["node_modules"]
+    "compilerOptions": {
+        "target": "ES2022",
+        "module": "ES2022",
+        "moduleResolution": "bundler",
+        "esModuleInterop": true,
+        "jsx": "react",
+        "skipLibCheck": true,
+        "declaration": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "noImplicitAny": false,
+        "allowSyntheticDefaultImports": true,
+        "pretty": true,
+        "removeComments": false,
+        "lib": ["ES2022", "dom", "esnext.asynciterable"]
+    },
+    "include": ["src", "typings/*.d.ts"],
+    "exclude": ["node_modules"]
 }

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

@@ -18,6 +18,7 @@ export function renameDotFiles(tree: Tree, projectRoot: string) {
         { src: '_browserslistrc', dest: '.browserslistrc' },
         { src: '_eslintignore', dest: '.eslintignore' },
         { src: '_eslintrc.js', dest: '.eslintrc.js' },
+        { src: '_prettierignore', dest: '.prettierignore' },
         { src: '_nxignore', dest: '.nxignore' },
         { src: '_markdownlint.json', dest: '.markdownlint.json' },
         { src: '_markdownlintignore', dest: '.markdownlintignore' },
@@ -28,7 +29,7 @@ export function renameDotFiles(tree: Tree, projectRoot: string) {
     dotFiles.forEach(({ src, dest }) => {
         const srcPath = path.join(projectRoot, src);
         const destPath = path.join(projectRoot, dest);
-        
+
         // Check if the source file exists
         if (tree.exists(srcPath)) {
             // Read content and write to destination

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

@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "private": true,
     "description": "",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "main": "index.js",
     "scripts": {
@@ -29,11 +29,11 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/client-core": "8.0.2-alpha.0",
-        "@common-stack/core": "8.0.2-alpha.0",
-        "@common-stack/server-core": "8.0.2-alpha.0",
-        "@common-stack/server-stack": "8.0.2-alpha.0",
-        "@common-stack/store-mongo": "8.0.2-alpha.0",
+        "@common-stack/client-core": "8.1.1-alpha.0",
+        "@common-stack/core": "8.1.1-alpha.0",
+        "@common-stack/server-core": "8.1.1-alpha.0",
+        "@common-stack/server-stack": "8.1.1-alpha.0",
+        "@common-stack/store-mongo": "8.1.1-alpha.0",
         "@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

@@ -2,7 +2,7 @@
     "name": "browser-package",
     "version": "3.1.1-alpha.6",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",
@@ -29,7 +29,7 @@
     },
     "peerDependencies": {
         "@cdm-logger/client": "*",
-        "@common-stack/client-react": "8.0.2-alpha.0",
+        "@common-stack/client-react": "8.1.1-alpha.0",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",

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

@@ -2,7 +2,7 @@
     "name": "client-package",
     "version": "3.1.1-alpha.4",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",

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

@@ -2,7 +2,7 @@
     "name": "core-package",
     "version": "3.1.1-alpha.4",
     "description": "Workbench core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",

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

@@ -2,7 +2,7 @@
     "name": "server-package",
     "version": "3.1.1-alpha.5",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",
@@ -62,9 +62,9 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@cdm-logger/server": ">=9.0.3",
-        "@common-stack/core": "8.0.2-alpha.0",
-        "@common-stack/server-core": "8.0.2-alpha.0",
-        "@common-stack/store-mongo": "8.0.2-alpha.0",
+        "@common-stack/core": "8.1.1-alpha.0",
+        "@common-stack/server-core": "8.1.1-alpha.0",
+        "@common-stack/store-mongo": "8.1.1-alpha.0",
         "@container-stack/mailing-api": ">=0.0.35-alpha.1",
         "@vscode-alt/monaco-editor": "^0.21.4",
         "inversify": "^5.0.1",

package/lib/generators/add-backend/files/src/api/root-schema.graphqls

@@ -1,109 +0,0 @@
-scalar AnyObject
-scalar Date
-scalar Time
-scalar DateTime
-scalar Timestamp
-scalar URI
-scalar URIInput
-scalar Observable
-
-scalar JSON
-scalar JSONObject
-
-"""
- An object with an ID.
-"""
-interface Node {
-    """
-    The ID of the node.
-    """
-    id: ID!
-}
-
-# Pagination information. See https://facebook.github.io/relay/graphql/connections.htm#sec-undefined.PageInfo.
-type PageInfo {
-    # Whether there is a next page of nodes in the connection.
-    hasNextPage: Boolean!
-}
-
-"""
- Represents a null return value.
-"""
-type EmptyResponse {
-    # A dummy null value.
-    alwaysNil: String
-}
-
-type FieldError {
-  field: String!
-  message: String!
-}
-
-input Sort{
-    key: String!,
-    value: SortEnum!,
-}
-
-enum SortEnum{
-    ASC,
-    DESC
-}
-
-type Query {
-    """
-     Looks up a node by ID.
-    """
-    node(id: ID!): Node
-}
-
-type Mutation {
-    dummy: Int
-}
-
-type Subscription {
-    dummy: Int
-}
-
-type AdminIdeSettings {
-    dummy: Int
-}
-
-""" All Moleculer Topic names are extended from this."""
-enum MoleculerServiceName {
-    dummy
-}
-
-interface IResourceUtilizationSettings {
-    subTopic: String
-    adminApiNamespace: String
-}
-
-"""
- Input geometry of the location.
- List the `longitude` first and then `latitude`
-  - Validate longitude values are between `-180` and `180`
-  - Validate latitude values are between `-90` and `90`
-"""
-input GeoLocation_Input {
-    type: String  = "Point"
-    coordinates: [Float]
-}
-
-type GeoLocation {
-    coordinates: [Float]
-}
-
-enum MailTemplateId {
-    dummy
-}
-
-enum MoleculerCronServiceName {
-    dummy
-}
-
-schema {
-    query: Query
-    mutation: Mutation
-    subscription: Subscription
-}
-