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

package/CHANGELOG.md

@@ -3,6 +3,186 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [6.0.8-alpha.50](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.49...v6.0.8-alpha.50) (2025-02-13)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.49](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.48...v6.0.8-alpha.49) (2025-02-11)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.48](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.47...v6.0.8-alpha.48) (2025-02-10)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.47](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.46...v6.0.8-alpha.47) (2025-02-09)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.46](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.45...v6.0.8-alpha.46) (2025-02-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.45](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.44...v6.0.8-alpha.45) (2025-02-07)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.44](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.43...v6.0.8-alpha.44) (2025-02-05)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.43](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.42...v6.0.8-alpha.43) (2025-02-04)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.42](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.41...v6.0.8-alpha.42) (2025-02-03)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.41](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.40...v6.0.8-alpha.41) (2025-02-02)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.40](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.39...v6.0.8-alpha.40) (2025-02-02)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.39](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.38...v6.0.8-alpha.39) (2025-02-01)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.38](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.37...v6.0.8-alpha.38) (2025-02-01)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.37](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.36...v6.0.8-alpha.37) (2025-02-01)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.36](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.35...v6.0.8-alpha.36) (2025-02-01)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.35](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.34...v6.0.8-alpha.35) (2025-01-31)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.34](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.33...v6.0.8-alpha.34) (2025-01-31)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.33](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.32...v6.0.8-alpha.33) (2025-01-31)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.32](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.31...v6.0.8-alpha.32) (2025-01-31)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.31](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.30...v6.0.8-alpha.31) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.30](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.29...v6.0.8-alpha.30) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.29](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.28...v6.0.8-alpha.29) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.28](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.27...v6.0.8-alpha.28) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.27](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.26...v6.0.8-alpha.27) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.26](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.25...v6.0.8-alpha.26) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.25](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.24...v6.0.8-alpha.25) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.24](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.23...v6.0.8-alpha.24) (2025-01-27)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.23](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.22...v6.0.8-alpha.23) (2025-01-22)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.22](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.21...v6.0.8-alpha.22) (2025-01-20)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.21](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.20...v6.0.8-alpha.21) (2025-01-19)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.20](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.19...v6.0.8-alpha.20) (2025-01-17)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.19](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.18...v6.0.8-alpha.19) (2025-01-14)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.18](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.17...v6.0.8-alpha.18) (2025-01-11)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.17](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.16...v6.0.8-alpha.17) (2025-01-08)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.16](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.15...v6.0.8-alpha.16) (2025-01-08)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.15](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.14...v6.0.8-alpha.15) (2025-01-03)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.14](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.13...v6.0.8-alpha.14) (2024-12-30)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.13](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.12...v6.0.8-alpha.13) (2024-12-30)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.12](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.11...v6.0.8-alpha.12) (2024-12-29)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.11](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.10...v6.0.8-alpha.11) (2024-12-29)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.10](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.9...v6.0.8-alpha.10) (2024-12-20)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.9](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.8...v6.0.8-alpha.9) (2024-12-20)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.8](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.7...v6.0.8-alpha.8) (2024-12-19)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.7](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.6...v6.0.8-alpha.7) (2024-12-19)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
+## [6.0.8-alpha.6](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.5...v6.0.8-alpha.6) (2024-12-19)
+
+**Note:** Version bump only for package @common-stack/generate-plugin
+
 ## [6.0.8-alpha.5](https://github.com/cdmbase/common-stack/compare/v6.0.8-alpha.4...v6.0.8-alpha.5) (2024-12-19)
 
 **Note:** Version bump only for package @common-stack/generate-plugin
@@ -261,18 +441,18 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
--   **server-stack:** apollo server redis cache ([2ef1df3](https://github.com/cdmbase/common-stack/commit/2ef1df30176616baf9816c47168687577f7aa8ff))
+- **server-stack:** apollo server redis cache ([2ef1df3](https://github.com/cdmbase/common-stack/commit/2ef1df30176616baf9816c47168687577f7aa8ff))
 
 ### Features
 
--   enable docker layer caching ([ce2c742](https://github.com/cdmbase/common-stack/commit/ce2c74271a107d5c73580523a4e1822b80e04c8d))
+- enable docker layer caching ([ce2c742](https://github.com/cdmbase/common-stack/commit/ce2c74271a107d5c73580523a4e1822b80e04c8d))
 
 ## [6.0.6-alpha.0](https://github.com/cdmbase/common-stack/compare/v0.0.251...v6.0.6-alpha.0) (2024-12-16)
 
 ### Bug Fixes
 
--   **server-stack:** apollo server redis cache ([2ef1df3](https://github.com/cdmbase/common-stack/commit/2ef1df30176616baf9816c47168687577f7aa8ff))
+- **server-stack:** apollo server redis cache ([2ef1df3](https://github.com/cdmbase/common-stack/commit/2ef1df30176616baf9816c47168687577f7aa8ff))
 
 ### Features
 
--   enable docker layer caching ([ce2c742](https://github.com/cdmbase/common-stack/commit/ce2c74271a107d5c73580523a4e1822b80e04c8d))
+- enable docker layer caching ([ce2c742](https://github.com/cdmbase/common-stack/commit/ce2c74271a107d5c73580523a4e1822b80e04c8d))

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

@@ -0,0 +1,33 @@
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var name = "sample-stack-frontend-server";
+var version = "1.0.0";
+var resolutions = {
+	common: "link:./common"
+};
+var 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"
+};
+var devDependencies = {
+};
+var peerDependencies = {
+	"body-parser": "*"
+};
+var pluginPkg = {
+	name: name,
+	version: version,
+	"private": true,
+	resolutions: resolutions,
+	dependencies: dependencies,
+	devDependencies: devDependencies,
+	peerDependencies: peerDependencies
+};exports.default=pluginPkg;exports.dependencies=dependencies;exports.devDependencies=devDependencies;exports.name=name;exports.peerDependencies=peerDependencies;exports.resolutions=resolutions;exports.version=version;//# sourceMappingURL=package.json.cjs.map

package/lib/common/package-releases/package.json.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"package.json.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/common/package-releases/package.json.mjs

@@ -0,0 +1,33 @@
+var name = "sample-stack-frontend-server";
+var version = "1.0.0";
+var resolutions = {
+	common: "link:./common"
+};
+var 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"
+};
+var devDependencies = {
+};
+var peerDependencies = {
+	"body-parser": "*"
+};
+var pluginPkg = {
+	name: name,
+	version: version,
+	"private": true,
+	resolutions: resolutions,
+	dependencies: dependencies,
+	devDependencies: devDependencies,
+	peerDependencies: peerDependencies
+};export{pluginPkg as default,dependencies,devDependencies,name,peerDependencies,resolutions,version};//# sourceMappingURL=package.json.mjs.map

package/lib/common/package-releases/package.json.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"package.json.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

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

@@ -4,6 +4,7 @@ FROM node:20.16-bullseye
 ENV PYTHON=/usr/bin/python
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
 	&& cd /tmp \
@@ -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-backend/files/package.json

@@ -29,10 +29,11 @@
         "build": "cross-env NODE_ENV=production webpack --config webpack.config.js",
         "build:clean": "rimraf dist .awcache",
         "build:dev": "cross-env NODE_ENV=development ENV_FILE=../../config/development/dev.env webpack --config webpack.config.js",
+        "copycommon": "cp -r ../../packages/common .",
         "db:migrate": "knex -- migrate:latest --cwd . --knexfile ./knexfile.js",
         "db:migrate:rollback": "knex -- migrate:rollback  --cwd . --knexfile ./knexfile.js",
         "db:seed": "yarn db:migrate && knex -- seed:run  --cwd . --knexfile ./knexfile.js",
-        "docker:build": "yarn build && docker build . -t $npm_package_name:$npm_package_version",
+        "docker:build": "yarn copycommon && yarn build && docker build . -t $npm_package_name:$npm_package_version",
         "docker:build:debug": "yarn build:debug && docker build . -t $npm_package_name:$npm_package_version",
         "docker:run": "docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
         "docker:run:debug": "cross-env NODE_ENV=development docker run  --env-file ../../config/staging/docker-staging.env -p 8080:8080 -it $npm_package_name:$npm_package_version",
@@ -57,12 +58,13 @@
         "watch:test": "cross-env NODE_ENV=test ENV_FILE=../../config/test/test.env yarn build:test && yarn start:test"
     },
     "resolutions": {
+        "common": "link:./common",
         "html-to-text": "^8.0.0"
     },
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "6.0.8-alpha.4",
+        "@common-stack/server-stack": "6.0.8-alpha.32",
         "@remix-run/node": "~2.10.1",
         "lodash": "^4.17.15",
         "react": "18.2.0"

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

@@ -1,4 +1,6 @@
-process.env.ENV_FILE !== null && require('dotenv').config({ path: process.env.ENV_FILE });
+if (process.env.ENV_FILE) {
+    require('dotenv').config({ path: process.env.ENV_FILE });
+}
 const webpack = require('webpack');
 const path = require('path');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');

package/lib/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/lib/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/{src/generators/add-frontend/frameworks/antui → lib/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');