@common-stack/generate-plugin 6.0.8-alpha.3 → 6.0.8-alpha.31

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

@@ -36,8 +36,7 @@ import config from '@app/cde-webconfig.json';
 
 import { Head } from './root';
 import type { IAppLoadContext } from '@common-stack/client-core';
-// import { ServerStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
-import { ServerStyleContext } from './context';
+import { ServerStyleContext, LocaleContext } from './context';
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
 
 const { extractCriticalToChunks } = createEmotionServer(defaultCache);
@@ -149,17 +148,19 @@ async function handleBrowserRequest(
 
     const html = renderToString(
         <I18nextProvider i18n={instance}>
-            <CacheProvider value={defaultCache}>
-                <ApolloProvider client={client}>
-                    <ReduxProvider store={store}>
-                        <SlotFillProvider context={slotFillContext}>
-                            <InversifyProvider container={container} modules={clientModules}>
-                                <RemixServer context={remixContext} url={request.url} />
-                            </InversifyProvider>
-                        </SlotFillProvider>
-                    </ReduxProvider>
-                </ApolloProvider>
-            </CacheProvider>
+            <LocaleContext.Provider value={lng}>
+                <CacheProvider value={defaultCache}>
+                    <ApolloProvider client={client}>
+                        <ReduxProvider store={store}>
+                            <SlotFillProvider context={slotFillContext}>
+                                <InversifyProvider container={container} modules={clientModules}>
+                                    <RemixServer context={remixContext} url={request.url} />
+                                </InversifyProvider>
+                            </SlotFillProvider>
+                        </ReduxProvider>
+                    </ApolloProvider>
+                </CacheProvider>
+            </LocaleContext.Provider>
         </I18nextProvider>,
     );
 
@@ -177,23 +178,25 @@ async function handleBrowserRequest(
         const { pipe, abort } = renderToPipeableStream(
             (
                 <I18nextProvider i18n={instance}>
-                    <ServerStyleContext.Provider value={chunks.styles}>
-                        <CacheProvider value={defaultCache}>
-                            <ApolloProvider client={client}>
-                                <ReduxProvider store={store}>
-                                    <SlotFillProvider context={slotFillContext}>
-                                        <InversifyProvider container={container} modules={clientModules}>
-                                            <RemixServer
-                                                context={remixContext}
-                                                url={request.url}
-                                                abortDelay={ABORT_DELAY}
-                                            />
-                                        </InversifyProvider>
-                                    </SlotFillProvider>
-                                </ReduxProvider>
-                            </ApolloProvider>
-                        </CacheProvider>
-                    </ServerStyleContext.Provider>
+                    <LocaleContext.Provider value={lng}>
+                        <ServerStyleContext.Provider value={chunks.styles}>
+                            <CacheProvider value={defaultCache}>
+                                <ApolloProvider client={client}>
+                                    <ReduxProvider store={store}>
+                                        <SlotFillProvider context={slotFillContext}>
+                                            <InversifyProvider container={container} modules={clientModules}>
+                                                <RemixServer
+                                                    context={remixContext}
+                                                    url={request.url}
+                                                    abortDelay={ABORT_DELAY}
+                                                />
+                                            </InversifyProvider>
+                                        </SlotFillProvider>
+                                    </ReduxProvider>
+                                </ApolloProvider>
+                            </CacheProvider>
+                        </ServerStyleContext.Provider>
+                    </LocaleContext.Provider>
                 </I18nextProvider>
             ) as any,
             {

package/src/generators/add-frontend/frameworks/chakraui/root.tsx.template

@@ -11,7 +11,7 @@ import { ApplicationErrorHandler } from '@admin-layout/chakra-ui';
 import clientModules, { plugins } from '@app/frontend-stack-react/modules.js';
 import { createHead } from 'remix-island';
 import { useContext } from 'react';
-import { ServerStyleContext, ClientStyleContext } from './context';
+import { ServerStyleContext, ClientStyleContext, LocaleContext } from './context';
 import { withEmotionCache } from '@emotion/react';
 import { useChangeLanguage } from 'remix-i18next/react';
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
@@ -31,6 +31,9 @@ export const Head = createHead(() => (
 export const Document = withEmotionCache(({ children }: DocumentProps, emotionCache) => {
     const serverStyleData = useContext(ServerStyleContext);
     const clientStyleData = useContext(ClientStyleContext);
+    const locale = useContext(LocaleContext);
+
+    useChangeLanguage(locale);
 
     React.useEffect(() => {
         // re-link sheet container
@@ -64,12 +67,12 @@ export const Document = withEmotionCache(({ children }: DocumentProps, emotionCa
         </>
     );
 });
-
+/*
 export let loader = async ({ request }) => {
     let locale = await i18next.getLocale(request);
     return json({ locale });
 };
-
+*/
 export let handle = {
     i18n: 'common',
 };
@@ -79,11 +82,12 @@ export function shouldRevalidate(params: any) {
 }
 
 export default function App() {
+    /*
     const data = useRouteLoaderData<{ locale: any }>('root');
     const locale = data?.locale;
     
     useChangeLanguage(locale);
-
+    */
     React.useEffect(() => {
         subscribeReduxRouter({ store: window.__remixStore, router: window.__remixRouter } as any);
     }, []);

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

@@ -146,9 +146,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.1",
-        "@common-stack/generate-plugin": "6.0.8-alpha.2",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
+        "@common-stack/env-list-loader": "6.0.8-alpha.30",
+        "@common-stack/generate-plugin": "6.0.8-alpha.30",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.30",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.2",
@@ -272,7 +272,7 @@
         "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
-        "lerna": "8",
+        "lerna": "8.1.8",
         "less": "^4.1.3",
         "less-loader": "^11.0.0",
         "lint-staged": "^15.2.7",

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

@@ -0,0 +1,5 @@
+{
+    "modules": [],
+    "devModules": ["@container-stack/mailing-api-server"],
+    "externalModules": ["@container-stack/territory"]
+}

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

@@ -25,11 +25,11 @@
         "watch": "npm run start:dev"
     },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.1",
-        "@common-stack/core": "6.0.8-alpha.1",
-        "@common-stack/server-core": "6.0.8-alpha.1",
-        "@common-stack/server-stack": "6.0.8-alpha.2",
-        "@common-stack/store-mongo": "6.0.8-alpha.1",
+        "@common-stack/client-core": "6.0.8-alpha.30",
+        "@common-stack/core": "6.0.8-alpha.30",
+        "@common-stack/server-core": "6.0.8-alpha.30",
+        "@common-stack/server-stack": "6.0.8-alpha.30",
+        "@common-stack/store-mongo": "6.0.8-alpha.30",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

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

@@ -1,11 +1,24 @@
 import graphql from '@rollup/plugin-graphql';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { writeBackendModuleFile } from '@common-stack/rollup-vite-utils';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Write backend module file before bundling
+try {
+    const packageConfig = await import('./config.json', { assert: { type: 'json' } });
+    await writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig.default);
+} catch (e) {
+    console.error('Error writing backend module file:', e);
+}
 
 const bundle = (config) => ({
     ...config,
     input: 'src/index.ts',
-    // marking all node modules as external
     external: (id) => !/^[./]/.test(id),
 });
 

package/lib/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);

package/src/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);