@common-stack/generate-plugin 6.0.8-alpha.5 → 6.0.8-alpha.50

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

@@ -1,10 +1,14 @@
 import {__awaiter}from'tslib';import {generateFiles,formatFiles}from'@nx/devkit';import*as path from'path';import*as fs from'fs';import {getValid,isValid}from'../../utils/index.mjs';import {updateJenkinsFile}from'./updates/jenkinsfileUpdate.mjs';import {updatePackageJson,updateRepository}from'./updates/packageJsonUpdate.mjs';import {backupLernaJson,restoreLernaJson}from'./updates/lernaJsonUpdate.mjs';import {updateHtmlPlugin}from'./updates/htmlPluginUpdate.mjs';import {updateLicense}from'./updates/licenseUpdate.mjs';import {backupFiles,restoreFiles}from'./updates/ignoreUpdate.mjs';import {generateFrontend}from'../add-frontend/generator.mjs';import {generateBackend}from'../add-backend/generator.mjs';import {generateMoleculer}from'../add-moleculer/generator.mjs';import {generatePackage}from'../add-package/generator.mjs';import'../../executors/update-deploy-version/executor.mjs';function addFullstackGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const basePath = options.path || '';
+        let projectPath = options.path || '';
+        if (projectPath !== '') {
+            const basePath = process.cwd();
+            projectPath = path.relative(basePath, projectPath);
+        }
         const projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'fullstack-pro';
-        const projectRoot = path.join(basePath, projectName);
-        console.log(`basePath: ${basePath}`);
+        const projectRoot = path.join(projectPath, projectName);
+        // console.log(`Project Path: ${projectPath}`);
         // backup existing lerna values
         const lernaBackup = backupLernaJson(tree, projectRoot);
         // backup files codegen.yaml
@@ -25,7 +29,7 @@ import {__awaiter}from'tslib';import {generateFiles,formatFiles}from'@nx/devkit'
         restoreFiles(tree, projectRoot, filesBackup);
         yield formatFiles(tree);
         if (isValid(options.config)) {
-            const configPath = path.resolve(basePath, getValid(options.config));
+            const configPath = path.resolve(projectPath, getValid(options.config));
             if (fs.existsSync(configPath)) {
                 try {
                     const configs = JSON.parse(fs.readFileSync(configPath).toString());

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

@@ -1 +1 @@
-{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.mjs","sources":["../../../src/generators/add-fullstack/generator.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

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

@@ -16,7 +16,7 @@
         "path": {
             "type": "string",
             "description": "The base path where the project will be created or updated",
-            "x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
+            "x-prompt": "Where do you want to create or update the project? (Please provide in absolute path, or leave empty for the current directory)"
         }
     },
     "required": ["name"]

package/lib/generators/add-moleculer/files/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:20.16-alpine
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
   && apk add --no-cache \
@@ -13,6 +14,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 WORKDIR /home/app

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

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

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

@@ -12,7 +12,8 @@
         "build:clean": "rimraf dist",
         "build:dist": "rollup -c rollup.config.mjs",
         "build:watch": "npm run build:dist -- --watch",
-        "docker:build": "npm run build && docker build . -t $npm_package_name:$npm_package_version",
+        "copycommon": "cp -r ../../packages/common .",
+        "docker:build": "yarn copycommon && npm run build && docker build . -t $npm_package_name:$npm_package_version",
         "docker:run": "docker run -it --env-file ../../config/staging/docker-staging.env  $npm_package_name:$npm_package_version",
         "jest": "./node_modules/.bin/jest",
         "start": "cross-env NODE_ENV=production tsx  dist/index.js",
@@ -24,12 +25,15 @@
         "test:watch": "npm test -- --watch",
         "watch": "npm run start:dev"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "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.4",
-        "@common-stack/store-mongo": "6.0.8-alpha.1",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
+        "@common-stack/server-stack": "6.0.8-alpha.32",
+        "@common-stack/store-mongo": "6.0.8-alpha.31",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/lib/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "6.0.8-alpha.5",
+    "version": "6.0.8-alpha.50",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -17,7 +17,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.48",
         "tslib": "^2.3.0"
     },
     "publishConfig": {
@@ -25,5 +25,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "266473bd4cee2f874d7d7c48d46cc69547a22560"
+    "gitHead": "84917a1ffbeda2933b7d5fa3f2781c70e1af4bb9"
 }

package/rollup.config.mjs

@@ -3,6 +3,7 @@ import image from '@rollup/plugin-image';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
 import copy from 'rollup-plugin-copy';
+import json from '@rollup/plugin-json';
 
 // Define a base configuration for reuse
 const baseConfig = {
@@ -18,6 +19,7 @@ const baseConfig = {
       include: '**/*.graphql',
       exclude: ['src/generators'],
     }),
+    json(),
     typescript({ 
       noEmitOnError: true,
       exclude: ['src/generators'],
@@ -37,6 +39,7 @@ const baseConfig = {
         { src: 'src/generators/add-package/files/*', dest: 'lib/generators/add-package/files' },
         { src: 'src/executors/update-deploy-version/schema.json', dest: 'lib/executors/update-deploy-version' },
         { src: 'src/executors/sort-package-json/schema.json', dest: 'lib/executors/sort-package-json' },
+        { src: 'src/common/package-releases/package.json', dest: 'lib/common/package-releases' },
       ],
       verbose: false,
     }),

package/src/common/package-releases/package.json

@@ -0,0 +1,26 @@
+{
+    "name": "sample-stack-frontend-server",
+    "version": "1.0.0",
+    "private": true,
+    "resolutions": {
+        "common": "link:./common"
+    },
+    "dependencies": {
+        "@admin-layout/ant-design-pro": "10.0.2-alpha.4",
+        "@ant-design/static-style-extract": "^1.0.3",
+        "@chakra-ui/react": "^2.8.0",
+        "@emotion/css": "^11.13.5",
+        "@emotion/react": "^11.14.0",
+        "@emotion/server": "^11.11.0",
+        "@emotion/styled": "^11.14.0",
+        "antd": "^5.23.4",
+        "autoprefixer": "^10.4.20",
+        "framer-motion": "^12.4.1",
+        "postcss": "^8.5.1",
+        "tailwindcss": "^4.0.4"
+    },
+    "devDependencies": {},
+    "peerDependencies": {
+        "body-parser": "*"
+    }
+}

package/src/generators/add-frontend/__snapshots__/generator.test.ts.snap

@@ -0,0 +1,33 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`addFrontendGenerator should add missing dependencies and update config.json for antui 1`] = `
+{
+  "dependencies": {
+    "@admin-layout/ant-design-pro": "10.0.2-alpha.4",
+    "@ant-design/static-style-extract": "^1.0.3",
+    "@emotion/css": "^11.13.5",
+    "@emotion/react": "^11.14.0",
+    "@emotion/server": "^11.11.0",
+    "@emotion/styled": "^11.14.0",
+    "antd": "^5.23.4",
+  },
+  "devDependencies": {},
+  "name": "frontend-demo-server",
+}
+`;
+
+exports[`addFrontendGenerator should not override an already existing dependency version 1`] = `
+{
+  "dependencies": {
+    "@admin-layout/ant-design-pro": "10.0.2-alpha.4",
+    "@ant-design/static-style-extract": "^1.0.3",
+    "@emotion/css": "^11.13.5",
+    "@emotion/react": "^11.14.0",
+    "@emotion/server": "^11.11.0",
+    "@emotion/styled": "^11.14.0",
+    "antd": "1.0.0",
+  },
+  "devDependencies": {},
+  "name": "frontend-demo-server",
+}
+`;

package/src/generators/add-frontend/frameworks/antui/src/context.tsx.template

@@ -0,0 +1,8 @@
+// context.tsx
+import React, { createContext } from 'react';
+
+export interface LocaleContextData {
+    locale: string;
+}
+
+export const LocaleContext = createContext<LocaleContextData | null>(null);

package/src/generators/add-frontend/frameworks/antui/{entry.client.tsx.template → src/entry.client.tsx.template}

@@ -13,8 +13,6 @@ import { ApolloProvider } from '@apollo/client/index.js';
 import { SlotFillProvider, removeUniversalPortals } from '@common-stack/components-pro';
 import { InversifyProvider } from '@common-stack/client-react';
 import { Provider as ReduxProvider } from 'react-redux';
-import { PersistGate } from 'redux-persist/integration/react';
-import { persistStore } from 'redux-persist';
 import { CacheProvider } from '@emotion/react';
 import i18next from 'i18next';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
@@ -32,16 +30,22 @@ import clientModules from '@app/frontend-stack-react/modules.js';
 import createEmotionCache from '@app/frontend-stack-react/entries/common/createEmotionCache.js';
 // @ts-ignore
 import config from '@app/cde-webconfig.json';
+import { LocaleContext } from './context';
 
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
-const persistor = persistStore(store);
 const antCache = createCache();
 const cache = createEmotionCache();
 
 (window as any).__remixStore = store;
 removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
 
+function LocaleProvider({ children }: any) {
+    const locale = (window as any).__LOCALE__ || '';
+
+    return <LocaleContext.Provider value={locale}>{children}</LocaleContext.Provider>;
+}
+
 async function hydrate() {
     if (!i18next.isInitialized && config.i18n.enabled) {
         await i18next
@@ -66,25 +70,21 @@ async function hydrate() {
             document,
             (
                 <I18nextProvider i18n={i18next}>
-                    <StrictMode>
+                    <LocaleProvider>
                         <CacheProvider value={cache}>
                             <StyleProvider cache={antCache}>
                                 <ReduxProvider store={store}>
                                     <SlotFillProvider>
                                         <InversifyProvider container={container} modules={clientModules}>
-                                            <PersistGate loading={null} persistor={persistor}>
-                                                {() => (
-                                                    <ApolloProvider client={client}>
-                                                        <RemixBrowser />
-                                                    </ApolloProvider>
-                                                )}
-                                            </PersistGate>
+                                            <ApolloProvider client={client}>
+                                                <RemixBrowser />
+                                            </ApolloProvider>
                                         </InversifyProvider>
                                     </SlotFillProvider>
                                 </ReduxProvider>
                             </StyleProvider>
                         </CacheProvider>
-                    </StrictMode>
+                    </LocaleProvider>
                 </I18nextProvider>
             ) as any,
         );

package/{lib/generators/add-frontend/frameworks/antui → src/generators/add-frontend/frameworks/antui/src}/entry.server.tsx.template

@@ -27,10 +27,14 @@ import Backend from 'i18next-fs-backend';
 import { resolve } from 'node:path';
 // @ts-ignore
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
+// @ts-ignore
 import config from '@app/cde-webconfig.json';
 // @ts-ignore
 import createEmotionCache from '@app/frontend-stack-react/entries/common/createEmotionCache';
 import type { IAppLoadContext } from '@common-stack/client-core';
+// @ts-ignore
+import publicEnv from '@src/config/public-config';
+import { LocaleContext } from './context';
 
 const ABORT_DELAY = 5_000;
 const antdCache = createAntdCache();
@@ -41,18 +45,23 @@ class ConstantsTransform extends Transform {
     _apolloState: any;
     _reduxState: any;
     _styleSheet: string;
+    _lng: string;
 
-    constructor(fills: string[], apolloState: any, reduxState: any, styleSheet: any) {
+    constructor(fills: string[], apolloState: any, reduxState: any, styleSheet: any, lng: string) {
         super();
         this._fills = fills;
         this._apolloState = apolloState;
         this._reduxState = reduxState;
         this._styleSheet = styleSheet;
+        this._lng = lng;
     }
 
     _transform(chunk, encoding, callback) {
         let transformedChunk = chunk.toString();
 
+        if (transformedChunk.includes('[__ENV__]')) {
+            transformedChunk = transformedChunk.replace('[__ENV__]', JSON.stringify(publicEnv));
+        }
         if (transformedChunk.includes('[__APOLLO_STATE__]')) {
             transformedChunk = transformedChunk.replace(
                 '[__APOLLO_STATE__]',
@@ -71,6 +80,9 @@ class ConstantsTransform extends Transform {
         if (transformedChunk.includes('[__STYLESHEET__]')) {
             transformedChunk = transformedChunk.replace('[__STYLESHEET__]', this._styleSheet);
         }
+        if (transformedChunk.includes('[__LOCALE__]')) {
+            transformedChunk = transformedChunk.replace('[__LOCALE__]', `"${this._lng}"`);
+        }
 
         callback(null, transformedChunk);
     }
@@ -86,32 +98,9 @@ export default async function handleRequest(
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     loadContext: IAppLoadContext,
 ) {
-    const instance = createInstance();
-    const lng = await i18next.getLocale(request);
-    const ns = i18next.getRouteNamespaces(remixContext);
-
-    // First, we create a new instance of i18next so every request will have a
-    // completely unique instance and not share any state.
-    if (config.i18n.enabled) {
-        await instance
-            .use(initReactI18next) // Tell our instance to use react-i18next
-            .use(Backend) // Setup our backend.init({
-            .init({
-                fallbackLng: config.i18n.fallbackLng,
-                defaultNS: config.i18n.defaultNS,
-                react: config.i18n.react,
-                supportedLngs: config.i18n.supportedLngs,
-                lng, // The locale we detected above
-                ns, // The namespaces the routes about to render want to use
-                backend: {
-                    loadPath: resolve(config.i18n.backend.loadServerPath),
-                },
-            });
-    }
-
     return isbot(request.headers.get('user-agent') || '')
-        ? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext, instance)
-        : handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext, instance);
+        ? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext)
+        : handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext);
 }
 
 function handleBotRequest(
@@ -120,14 +109,11 @@ function handleBotRequest(
     responseHeaders: Headers,
     remixContext: EntryContext,
     loadContext: IAppLoadContext,
-    i18nInstance: i18next,
 ) {
     return new Promise((resolve, reject) => {
         let shellRendered = false;
         const { pipe, abort } = renderToPipeableStream(
-            <I18nextProvider i18n={i18nInstance}>
-                <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />
-            </I18nextProvider>,
+            <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
             {
                 onAllReady() {
                     shellRendered = true;
@@ -164,14 +150,36 @@ function handleBotRequest(
     });
 }
 
-function handleBrowserRequest(
+async function handleBrowserRequest(
     request: Request,
     responseStatusCode: number,
     responseHeaders: Headers,
     remixContext: EntryContext,
     loadContext: IAppLoadContext,
-    i18nInstance: i18next,
 ) {
+    const instance = createInstance();
+    const lng = await i18next.getLocale(request);
+    const ns = i18next.getRouteNamespaces(remixContext);
+
+    // First, we create a new instance of i18next so every request will have a
+    // completely unique instance and not share any state.
+    if (config.i18n.enabled) {
+        await instance
+            .use(initReactI18next) // Tell our instance to use react-i18next
+            .use(Backend) // Setup our backend.init({
+            .init({
+                fallbackLng: config.i18n.fallbackLng,
+                defaultNS: config.i18n.defaultNS,
+                react: config.i18n.react,
+                supportedLngs: config.i18n.supportedLngs,
+                lng, // The locale we detected above
+                ns, // The namespaces the routes about to render want to use
+                backend: {
+                    loadPath: resolve(config.i18n.backend.loadServerPath),
+                },
+            });
+    }
+
     return new Promise((resolve, reject) => {
         let shellRendered = false;
         const slotFillContext = { fills: {} };
@@ -190,24 +198,26 @@ function handleBrowserRequest(
 
         const { pipe, abort } = renderToPipeableStream(
             (
-                <I18nextProvider i18n={i18nInstance}>
-                    <CacheProvider value={cache}>
-                        <StyleProvider cache={antdCache}>
-                            <ReduxProvider store={store}>
-                                <SlotFillProvider context={slotFillContext}>
-                                    <InversifyProvider container={container} modules={clientModules as any}>
-                                        <ApolloProvider client={client}>
-                                            <RemixServer
-                                                context={remixContext}
-                                                url={request.url}
-                                                abortDelay={ABORT_DELAY}
-                                            />
-                                        </ApolloProvider>
-                                    </InversifyProvider>
-                                </SlotFillProvider>
-                            </ReduxProvider>
-                        </StyleProvider>
-                    </CacheProvider>
+                <I18nextProvider i18n={instance}>
+                    <LocaleContext.Provider value={lng}>
+                        <CacheProvider value={cache}>
+                            <StyleProvider cache={antdCache}>
+                                <ReduxProvider store={store}>
+                                    <SlotFillProvider context={slotFillContext}>
+                                        <InversifyProvider container={container} modules={clientModules as any}>
+                                            <ApolloProvider client={client}>
+                                                <RemixServer
+                                                    context={remixContext}
+                                                    url={request.url}
+                                                    abortDelay={ABORT_DELAY}
+                                                />
+                                            </ApolloProvider>
+                                        </InversifyProvider>
+                                    </SlotFillProvider>
+                                </ReduxProvider>
+                            </StyleProvider>
+                        </CacheProvider>
+                    </LocaleContext.Provider>
                 </I18nextProvider>
             ) as any,
             {
@@ -220,7 +230,7 @@ function handleBrowserRequest(
                     const fills = Object.keys(slotFillContext.fills);
                     const styleSheet = extractStyle(antdCache);
 
-                    const transform = new ConstantsTransform(fills, apolloState, reduxState, styleSheet);
+                    const transform = new ConstantsTransform(fills, apolloState, reduxState, styleSheet, lng);
 
                     responseHeaders.set('Content-Type', 'text/html');
 

package/{lib/generators/add-frontend/frameworks/antui → src/generators/add-frontend/frameworks/antui/src}/root.tsx.template

@@ -1,8 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
 import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
-// @ts-ignore
-import publicEnv from '@src/config/public-config';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
 import { ApplicationErrorHandler } from '@admin-layout/ant-ui';
@@ -13,17 +11,8 @@ import clientModules, { plugins } from '@app/frontend-stack-react/modules.js';
 import { useChangeLanguage } from 'remix-i18next/react';
 import { useTranslation } from 'react-i18next';
 // @ts-ignore
-import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
-// @ts-ignore
 import { ErrorBoundary } from '@app/frontend-stack-react/entries/antui/components/ErrorBoundary';
-
-export const loader = async ({ request }) => {
-    const locale = await i18next.getLocale(request);
-    return json({
-        __ENV__: publicEnv,
-        locale,
-    });
-};
+import { LocaleContext } from './context';
 
 export const handle = {
     i18n: 'common',
@@ -34,8 +23,8 @@ export function shouldRevalidate(params: any) {
 }
 
 export function Layout({ children }: { children: React.ReactNode }) {
-    const data = useRouteLoaderData<{ locale: any }>('root');
-    const locale = data?.locale;
+    // const data = useRouteLoaderData<{ locale: any }>('root');
+    const locale: any = React.useContext(LocaleContext);
 
     const { i18n } = useTranslation();
 
@@ -49,9 +38,10 @@ export function Layout({ children }: { children: React.ReactNode }) {
         if (typeof window === 'undefined') {
             return (
                 <>
+                    <script>window.__ENV__=[__ENV__]</script>
                     <script
                         dangerouslySetInnerHTML={{
-                            __html: `window.__ENV__ = ${JSON.stringify((data as any)?.__ENV__)}`,
+                            __html: `window.process = {} `,
                         }}
                     />
                     <script
@@ -68,6 +58,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
                             __html: `if (global === undefined) { var global = window; }`,
                         }}
                     />
+                    <script>window.__LOCALE__=[__LOCALE__]</script>
                 </>
             );
         }

package/src/generators/add-frontend/frameworks/chakraui/{context.tsx.template → src/context.tsx.template}

@@ -18,3 +18,9 @@ export interface ClientStyleContextData {
 export const ClientStyleContext = createContext<ClientStyleContextData | null>(
   null,
 );
+
+export interface LocaleContextData {
+    locale: string;
+}
+
+export const LocaleContext = createContext<LocaleContextData | null>(null);