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

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

@@ -17,7 +17,7 @@
     "main": "index.js",
     "scripts": {
         "prebuild": "yarn build:clean && yarn genconfig",
-        "build": "cross-env SSR=true NODE_OPTIONS='--max_old_space_size=4096' NODE_ENV=production remix vite:build",
+        "build": "cross-env SSR=true NODE_OPTIONS='--max_old_space_size=6096' NODE_ENV=production remix vite:build",
         "build:SSR": "cross-env SSR=true NODE_ENV=production remix vite:build",
         "build:clean": "rimraf dist build node_modules/.vite",
         "build:debug": "cross-env DEBUGGING=true NODE_ENV=production remix vite:build",
@@ -56,16 +56,12 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/frontend-stack-react": "6.0.8-alpha.0",
+        "@common-stack/frontend-stack-react": "8.1.1-alpha.4",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
-        "compression": "^1.7.4",
         "glob-all": "^3.3.1",
         "immutability-helper": "^3.0.1",
         "is-plain-obj": "^3.0.0",
-        "isomorphic-fetch": "^2.2.1",
-        "lodash": "^4.17.15",
-        "lodash-es": "^4.17.21",
         "moment": "2.29.1",
         "ramda": "^0.30.1",
         "react-ga4": "^2.1.0",
@@ -81,7 +77,7 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.0",
+        "@common-stack/rollup-vite-utils": "8.1.1-alpha.9",
         "@remix-run/dev": "~2.15.3",
         "@remix-run/serve": "~2.15.3",
         "cross-env": "^7.0.3",

package/lib/generators/add-frontend/templates/server.js

@@ -1,14 +1,9 @@
 import express from 'express';
 import compression from 'compression';
 import { createRequestHandler } from '@remix-run/express';
-import { installGlobals } from '@remix-run/node';
 import './env.js';
-import {
-    performCopyOperations,
-} from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/configLoader.js';
-import config from './app/cde-webconfig.json' assert { type: 'json' };
-
-installGlobals();
+import { performCopyOperations } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/configLoader.js';
+import config from './app/cde-webconfig.json' with { type: 'json' };
 
 Object.keys(config.buildConfig).forEach((key) => {
     global[key] = config.buildConfig[key];
@@ -17,9 +12,15 @@ Object.keys(config.buildConfig).forEach((key) => {
 const startServer = async () => {
     await performCopyOperations(config);
 
-    const { corsMiddleware } = await import(`./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/backend/middlewares/cors.js`);
-    const { containerMiddleware } = await import(`./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/backend/middlewares/container.js`);
-    const { loadContext } = await import(`./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/load-context.server.js`);
+    const { corsMiddleware } = await import(
+        `./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/backend/middlewares/cors.js`
+    );
+    const { containerMiddleware } = await import(
+        `./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/backend/middlewares/container.js`
+    );
+    const { loadContext } = await import(
+        `./${config.commonPaths.appPath}/${config.commonPaths.frontendStackPath}/load-context.server.js`
+    );
 
     const viteDevServer =
         process.env.NODE_ENV === 'production'

package/lib/generators/add-frontend/templates/src/routes.ts.template

@@ -0,0 +1,38 @@
+// import { flatRoutes } from "@remix-run/fs-routes";
+import { type RouteConfig } from '@remix-run/route-config';
+import { remixRoutesOptionAdapter } from '@remix-run/routes-option-adapter';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import { defineRoutesConfig } from '@common-stack/rollup-vite-utils/lib/vite-wrappers/json-wrappers.js';
+import { performCopyOperations } from '@common-stack/rollup-vite-utils/lib/preStartup/configLoader/configLoader.js';
+import config from '../app/cde-webconfig.json' with { type: 'json' };
+
+const directoryName = dirname(fileURLToPath(import.meta.url));
+
+export default remixRoutesOptionAdapter(async (defineRoutes) => {
+    if (process.env.NODE_ENV === 'production') {
+        await performCopyOperations(config);
+    }
+    let metaJson = null;
+    try {
+        metaJson = await import('../app/sync-meta.json');
+    } catch {
+        console.warn('No sync-meta.json found, continuing without metadata.');
+    }
+    return defineRoutes((routeFn) => {
+        defineRoutesConfig(
+            routeFn,
+            {
+                routesFileName: 'routes.json',
+                packages: config.modules,
+                paths: config.paths,
+                iconsRepository: config?.iconsRepository,
+                rootPath: resolve(directoryName, '../../..'),
+                settings: {
+                    _useFutureCommonPackage: true,
+                },
+            },
+            metaJson,
+        );
+    });
+}) satisfies RouteConfig;

package/lib/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/lib/generators/add-fullstack/files/package.json

@@ -136,9 +136,9 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.8-alpha.0",
-        "@common-stack/generate-plugin": "6.0.8-alpha.0",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.0",
+        "@common-stack/env-list-loader": "8.1.1-alpha.2",
+        "@common-stack/generate-plugin": "8.1.1-alpha.9",
+        "@common-stack/rollup-vite-utils": "8.1.1-alpha.9",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.3",
         "@graphql-codegen/cli": "^5.0.4",

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

@@ -29,11 +29,11 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.0",
-        "@common-stack/core": "6.0.8-alpha.0",
-        "@common-stack/server-core": "6.0.8-alpha.0",
-        "@common-stack/server-stack": "6.0.8-alpha.0",
-        "@common-stack/store-mongo": "6.0.8-alpha.0",
+        "@common-stack/client-core": "8.1.1-alpha.4",
+        "@common-stack/core": "8.1.1-alpha.4",
+        "@common-stack/server-core": "8.1.1-alpha.4",
+        "@common-stack/server-stack": "8.1.1-alpha.5",
+        "@common-stack/store-mongo": "8.1.1-alpha.4",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

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

@@ -29,7 +29,7 @@
     },
     "peerDependencies": {
         "@cdm-logger/client": "*",
-        "@common-stack/client-react": "6.0.8-alpha.0",
+        "@common-stack/client-react": "8.1.1-alpha.4",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",

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

@@ -62,9 +62,9 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@cdm-logger/server": ">=9.0.3",
-        "@common-stack/core": "6.0.8-alpha.0",
-        "@common-stack/server-core": "6.0.8-alpha.0",
-        "@common-stack/store-mongo": "6.0.8-alpha.0",
+        "@common-stack/core": "8.1.1-alpha.4",
+        "@common-stack/server-core": "8.1.1-alpha.4",
+        "@common-stack/store-mongo": "8.1.1-alpha.4",
         "@container-stack/mailing-api": ">=0.0.35-alpha.1",
         "@vscode-alt/monaco-editor": "^0.21.4",
         "inversify": "^5.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "8.1.1-alpha.0",
+    "version": "8.1.1-alpha.10",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -18,7 +18,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "8.1.1-alpha.0",
+        "@common-stack/rollup-vite-utils": "8.1.1-alpha.10",
         "tslib": "^2.3.0"
     },
     "publishConfig": {
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "7fc661e44322b602d561e42de8cb121048ef444f"
+    "gitHead": "ea4d6450f95dc8cdba4be5888b794b562bb72e4c"
 }

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

@@ -64,7 +64,7 @@
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "6.0.8-alpha.0",
+        "@common-stack/server-stack": "8.1.1-alpha.5",
         "@remix-run/node": "~2.15.3",
         "lodash": "^4.17.15",
         "react": "18.2.0"

package/src/generators/add-frontend/frameworks/tailwindui/src/entry.client.tsx.template

@@ -55,21 +55,17 @@ async function hydrate() {
     startTransition(() => {
         hydrateRoot(
             document,
-            (
-                <I18nextProvider i18n={i18next}>
-                    <StrictMode>
-                        <ReduxProvider store={store}>
-                            <SlotFillProvider>
-                                <InversifyProvider container={container} modules={clientModules}>
-                                    <ApolloProvider client={client}>
-                                        <RemixBrowser />
-                                    </ApolloProvider>
-                                </InversifyProvider>
-                            </SlotFillProvider>
-                        </ReduxProvider>
-                    </StrictMode>
-                </I18nextProvider>
-            ) as any,
+            <I18nextProvider i18n={i18next}>
+                <ReduxProvider store={store}>
+                    <SlotFillProvider>
+                        <InversifyProvider container={container} modules={clientModules}>
+                            <ApolloProvider client={client}>
+                                <RemixBrowser />
+                            </ApolloProvider>
+                        </InversifyProvider>
+                    </SlotFillProvider>
+                </ReduxProvider>
+            </I18nextProvider>,
         );
     });
 }

package/src/generators/add-frontend/frameworks/tailwindui/src/entry.server.tsx.template

@@ -4,6 +4,7 @@
  * For more information, see https://remix.run/file-conventions/entry.server
  */
 import * as React from 'react';
+import 'reflect-metadata';
 (global as any).__CLIENT__ = false;
 (global as any).__SERVER__ = true;
 import { PassThrough, Transform } from 'node:stream';
@@ -28,7 +29,8 @@ import config from '@app/cde-webconfig.json';
 // @ts-ignore
 import type { IAppLoadContext } from '@common-stack/client-core';
 
-const ABORT_DELAY = 5_000;
+// Reject/cancel all pending promises after 5 seconds
+export const streamTimeout = 5000;
 
 class ConstantsTransform extends Transform {
     _fills: string[];
@@ -120,7 +122,7 @@ function handleBotRequest(
         let shellRendered = false;
         const { pipe, abort } = renderToPipeableStream(
             <I18nextProvider i18n={i18nInstance}>
-                <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />
+                <RemixServer context={remixContext} url={request.url} />
             </I18nextProvider>,
             {
                 onAllReady() {
@@ -154,7 +156,7 @@ function handleBotRequest(
             },
         );
 
-        setTimeout(abort, ABORT_DELAY);
+        setTimeout(abort, streamTimeout + 1000);
     });
 }
 
@@ -184,11 +186,7 @@ function handleBrowserRequest(
                         <SlotFillProvider context={slotFillContext}>
                             <InversifyProvider container={container} modules={clientModules as any}>
                                 <ApolloProvider client={client}>
-                                    <RemixServer
-                                        context={remixContext}
-                                        url={request.url}
-                                        abortDelay={ABORT_DELAY}
-                                    />
+                                    <RemixServer context={remixContext} url={request.url} />
                                 </ApolloProvider>
                             </InversifyProvider>
                         </SlotFillProvider>
@@ -203,8 +201,9 @@ function handleBrowserRequest(
                     const apolloState = { ...client.extract() };
                     const reduxState = { ...store.getState() };
                     const fills = Object.keys(slotFillContext.fills);
+                    const styleSheet = '';
 
-                    const transform = new ConstantsTransform(fills, apolloState, reduxState, []);
+                    const transform = new ConstantsTransform(fills, apolloState, reduxState, styleSheet);
 
                     responseHeaders.set('Content-Type', 'text/html');
 
@@ -233,6 +232,6 @@ function handleBrowserRequest(
             },
         );
 
-        setTimeout(abort, ABORT_DELAY);
+        setTimeout(abort, streamTimeout + 1000);
     });
 }