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

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

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

@@ -6,8 +6,6 @@ import { ApolloProvider } from '@apollo/client/index.js';
 import { SlotFillProvider, removeUniversalPortals } from '@common-stack/components-pro';
 import { InversifyProvider, PluginArea } 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';
 
 // @ts-ignore
@@ -27,12 +25,10 @@ import Backend from 'i18next-http-backend';
 import { getInitialNamespaces } from 'remix-i18next/client';
 import config from '@app/cde-webconfig.json';
 // @ts-ignore
-// import { ClientStyleContext } from '@app/frontend-stack-react/entries/chakraui/context.js';
-import { ClientStyleContext } from './context';
+import { ClientStyleContext, LocaleContext } from './context';
 
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
-const persistor = persistStore(store);
 
 (window as any).__remixStore = store;
 removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
@@ -60,6 +56,13 @@ function ClientCacheProvider({ children }: ClientCacheProviderProps) {
     );
 }
 
+function LocaleProvider({ children }: ClientCacheProviderProps) {
+    const el = (document as any).querySelector('html');
+    const locale = el?.getAttribute('lng') || '';
+
+    return <LocaleContext.Provider value={locale}>{children}</LocaleContext.Provider>;
+}
+
 async function hydrate() {
     if (!i18next.isInitialized && config.i18n.enabled) {
         await i18next
@@ -83,19 +86,19 @@ async function hydrate() {
         document.getElementById('root')!,
         // <StrictMode>
         <I18nextProvider i18n={i18next}>
-            <ClientCacheProvider>
-                <ApolloProvider client={client}>
-                    <ReduxProvider store={store}>
-                        <SlotFillProvider>
-                            <InversifyProvider container={container} modules={clientModules}>
-                                <PersistGate loading={null} persistor={persistor}>
-                                    {() => <RemixBrowser />}
-                                </PersistGate>
-                            </InversifyProvider>
-                        </SlotFillProvider>
-                    </ReduxProvider>
-                </ApolloProvider>
-            </ClientCacheProvider>
+            <LocaleProvider>
+                <ClientCacheProvider>
+                    <ApolloProvider client={client}>
+                        <ReduxProvider store={store}>
+                            <SlotFillProvider>
+                                <InversifyProvider container={container} modules={clientModules}>
+                                    <RemixBrowser />
+                                </InversifyProvider>
+                            </SlotFillProvider>
+                        </ReduxProvider>
+                    </ApolloProvider>
+                </ClientCacheProvider>
+            </LocaleProvider>
         </I18nextProvider>,
         // </StrictMode>,
     );

package/{src/generators/add-frontend/frameworks/chakraui → lib/generators/add-frontend/frameworks/chakraui/src}/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/lib/generators/add-frontend/frameworks/chakraui/{root.tsx.template → src/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-frontend/frameworks/tailwindui → lib/generators/add-frontend/frameworks/tailwindui/src}/entry.client.tsx.template

@@ -12,8 +12,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 i18next from 'i18next';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
@@ -31,7 +29,6 @@ import config from '@app/cde-webconfig.json';
 
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
-const persistor = persistStore(store);
 
 (window as any).__remixStore = store;
 removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
@@ -64,13 +61,9 @@ async function hydrate() {
                         <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>

package/lib/generators/add-frontend/generator.cjs

@@ -1,5 +1,61 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),index=require('../../utils/index.cjs'),constants=require('../../common/constants.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_FRAMEWORK = constants.FRAMEWORK_ANTUI;
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),setupConfig_cjs=require('@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs'),index=require('../../utils/index.cjs'),constants=require('../../common/constants.cjs'),_package=require('../../common/package-releases/package.json.cjs');function _interopNamespaceDefault(e){var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var path__namespace=/*#__PURE__*/_interopNamespaceDefault(path);const DEFAULT_FRAMEWORK = constants.FRAMEWORK_ANTUI;
 const DEFAULT_SERVER_NAME = 'frontend-server';
+/**
+ * Helper to retrieve a package version from pluginPkg.
+ * Throws an error if a version for packageName is not defined.
+ */
+function getPackageVersion(packageName) {
+    // Read the generator's package.json. This file is updated using ncu,
+    // so the generator always picks up the latest dependency versions.
+    // const pluginPkgPath = path.resolve(__dirname, '../../common/package-releases/package.json');
+    // const pluginPkg = JSON.parse(fs.readFileSync(pluginPkgPath, 'utf-8'));
+    const version = (_package.default.dependencies && _package.default.dependencies[packageName]) ||
+        (_package.default.devDependencies && _package.default.devDependencies[packageName]);
+    if (!version) {
+        throw new Error(`Version for package "${packageName}" not found in plugin package.json.`);
+    }
+    return version;
+}
+/**
+ * Helper to map an array of dependency names to an object where each key is a dependency
+ * and its value is obtained via getPackageVersion().
+ */
+function mapDependencies(depNames) {
+    return depNames.reduce((acc, name) => {
+        acc[name] = getPackageVersion(name);
+        return acc;
+    }, {});
+}
+/**
+ * A mapping of frameworks to dependency definitions.
+ * Each dependency's version is obtained dynamically from pluginPkg using a helper.
+ */
+const frameworkDependencyMap = {
+    [constants.FRAMEWORK_ANTUI]: {
+        dependencies: mapDependencies([
+            '@admin-layout/ant-design-pro',
+            '@ant-design/static-style-extract',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+            'antd',
+        ]),
+    },
+    [constants.FRAMEWORK_CHAKRAUI]: {
+        dependencies: mapDependencies([
+            '@chakra-ui/react',
+            'framer-motion',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+        ]),
+    },
+    [constants.FRAMEWORK_TAILWINDUI]: {
+        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer']),
+    },
+};
 function addFrontendGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const projectName = index.isValid(options.name) ? `frontend-${index.getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
@@ -12,55 +68,46 @@ const generateFrontend = (tree, options) => tslib.__awaiter(void 0, void 0, void
     let projectName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${projectName}` : projectName;
     projectName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${projectName}` : projectName;
-    const projectSrc = `${projectRoot}/src`;
     const framework = (_b = index.getValid(options.framework)) !== null && _b !== void 0 ? _b : DEFAULT_FRAMEWORK;
     console.log('UI framework specified: ', framework);
-    // resetProject(`${basePath}/${projectRoot}`);
-    // addProjectConfiguration(tree, framework, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: projectSrc,
-    //     targets: {},
-    // });
     devkit.generateFiles(tree, path__namespace.join(__dirname, 'templates'), projectRoot, {});
-    devkit.generateFiles(tree, path__namespace.join(__dirname, 'frameworks', framework), projectSrc, options);
+    devkit.generateFiles(tree, path__namespace.join(__dirname, 'frameworks', framework), projectRoot, options);
     devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        if (framework === constants.FRAMEWORK_ANTUI) {
-            packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
-            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
-            packageJson['dependencies']["antd"] = "^5.14.0";
-        }
-        else if (framework === constants.FRAMEWORK_CHAKRAUI) {
-            packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
-            packageJson['dependencies']["framer-motion"] = "^11.5.4";
-            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
+        packageJson.name = projectName;
+        packageJson.dependencies = packageJson.dependencies || {};
+        packageJson.devDependencies = packageJson.devDependencies || {};
+        const dependencyOverrides = frameworkDependencyMap[framework] || {};
+        if (dependencyOverrides.dependencies) {
+            Object.entries(dependencyOverrides.dependencies).forEach(([pkg, version]) => {
+                if (!packageJson.dependencies[pkg]) {
+                    packageJson.dependencies[pkg] = version;
+                }
+            });
         }
-        else if (framework === constants.FRAMEWORK_TAILWINDUI) {
-            packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
-            packageJson['devDependencies']["postcss"] = "^8.4.41";
-            packageJson['devDependencies']["autoprefixer"] = "^10.4.20";
+        if (dependencyOverrides.devDependencies) {
+            Object.entries(dependencyOverrides.devDependencies).forEach(([pkg, version]) => {
+                if (!packageJson.devDependencies[pkg]) {
+                    packageJson.devDependencies[pkg] = version;
+                }
+            });
         }
         return packageJson;
     });
     devkit.updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
-        configJson['uiFramework'] = framework;
+        configJson.uiFramework = framework;
         if (framework === constants.FRAMEWORK_ANTUI) {
-            configJson['modules'].push("@admin-layout/ant-design-pro");
+            if (!configJson.modules.includes('@admin-layout/ant-design-pro')) {
+                configJson.modules.push('@admin-layout/ant-design-pro');
+            }
         }
         else if (framework === constants.FRAMEWORK_CHAKRAUI) {
-            configJson['modules'].push("@admin-layout/chakra-design-pro");
+            if (!configJson.modules.includes('@admin-layout/chakra-design-pro')) {
+                configJson.modules.push('@admin-layout/chakra-design-pro');
+            }
         }
         if (options['config.json']) {
-            const addtionalConfigs = options['config.json'];
-            configJson = setupConfig_cjs.deepMerge(configJson, addtionalConfigs);
+            const additionalConfigs = options['config.json'];
+            configJson = setupConfig_cjs.deepMerge(configJson, additionalConfigs);
         }
         return configJson;
     });

package/lib/generators/add-frontend/generator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","deepMerge","formatFiles"],"mappings":"6pBAQA,MAAM,iBAAiB,GAAGA,yBAAe,CAAC;AAC1C,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAExB,SAAA,oBAAoB,CAAC,IAAU,EAAE,OAAmC,EAAA;;QACtF,MAAM,WAAW,GAAGC,aAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,YAAYC,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,GAAG,mBAAmB,CAAC;QAC9G,MAAM,OAAO,mCAAY,OAAO,CAAA,EAAA,EAAE,IAAI,EAAE,WAAW,GAAC,CAAC;AAErD,QAAA,OAAO,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KAChD,CAAA,CAAA;AAAA,CAAA;MAEY,gBAAgB,GAAG,CAAO,IAAU,EAAE,OAAY,KAAIC,eAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;;IAC/D,IAAI,WAAW,GAAG,CAAA,EAAA,GAAAD,cAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,mBAAmB,CAAC;IAChE,MAAM,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAA,EAAGC,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA,CAAA,EAAI,WAAW,CAAA,CAAE,GAAG,WAAW,CAAC;IAC/G,WAAW,GAAGD,aAAO,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAG,EAAAC,cAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAI,CAAA,EAAA,WAAW,EAAE,GAAG,WAAW,CAAC;AAC3F,IAAA,MAAM,UAAU,GAAG,CAAG,EAAA,WAAW,MAAM,CAAC;IAExC,MAAM,SAAS,GAAG,CAAA,EAAA,GAAAA,cAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAI,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAA,iBAAiB,CAAC;AACnE,IAAA,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC;;;;;;;;AAWnD,IAAAE,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,IAAAD,oBAAa,CAAC,IAAI,EAAEC,eAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACxFC,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,eAAe,EAAE,CAAC,WAAW,KAAI;AAC5D,QAAA,WAAW,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;AAClC,QAAA,IAAI,SAAS,KAAKN,yBAAe,EAAE;YAC/B,WAAW,CAAC,cAAc,CAAC,CAAC,8BAA8B,CAAC,GAAG,QAAQ,CAAC;YACvE,WAAW,CAAC,cAAc,CAAC,CAAC,kCAAkC,CAAC,GAAG,QAAQ,CAAC;YAC3E,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;SACnD;AAAM,aAAA,IAAI,SAAS,KAAKO,4BAAkB,EAAE;YACzC,WAAW,CAAC,cAAc,CAAC,CAAC,kBAAkB,CAAC,GAAG,QAAQ,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,GAAG,UAAU,CAAC;YAC3D,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;YAC5D,WAAW,CAAC,cAAc,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,GAAG,UAAU,CAAC;SAE/D;AAAM,aAAA,IAAI,SAAS,KAAKC,8BAAoB,EAAE;YAC3C,WAAW,CAAC,iBAAiB,CAAC,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;YAC1D,WAAW,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YACtD,WAAW,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;SAC/D;AAED,QAAA,OAAO,WAAW,CAAC;AACvB,KAAC,CAAC,CAAC;IACHF,iBAAU,CAAC,IAAI,EAAE,CAAG,EAAA,WAAW,cAAc,EAAE,CAAC,UAAU,KAAI;AAC1D,QAAA,UAAU,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;AACtC,QAAA,IAAI,SAAS,KAAKN,yBAAe,EAAE;YAC/B,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;SAC9D;AAAM,aAAA,IAAI,SAAS,KAAKO,4BAAkB,EAAE;YACzC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;SACjE;AAED,QAAA,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;AACxB,YAAA,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAChD,YAAA,UAAU,GAAGE,yBAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;SACxD;AAED,QAAA,OAAO,UAAU,CAAC;AACtB,KAAC,CAAC,CAAC;AAEH,IAAA,MAAMC,kBAAW,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-frontend/generator.ts"],"sourcesContent":[null],"names":["FRAMEWORK_ANTUI","pluginPkg","FRAMEWORK_CHAKRAUI","FRAMEWORK_TAILWINDUI","isValid","getValid","__awaiter","generateFiles","path","updateJson","deepMerge","formatFiles"],"mappings":"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"}

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

@@ -1,5 +1,61 @@
-import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../common/constants.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
+import {__awaiter}from'tslib';import {generateFiles,updateJson,formatFiles}from'@nx/devkit';import*as path from'path';import {deepMerge}from'@common-stack/rollup-vite-utils/lib/utils/setupConfig.cjs';import {isValid,getValid}from'../../utils/index.mjs';import {FRAMEWORK_ANTUI,FRAMEWORK_CHAKRAUI,FRAMEWORK_TAILWINDUI}from'../../common/constants.mjs';import pluginPkg from'../../common/package-releases/package.json.mjs';const DEFAULT_FRAMEWORK = FRAMEWORK_ANTUI;
 const DEFAULT_SERVER_NAME = 'frontend-server';
+/**
+ * Helper to retrieve a package version from pluginPkg.
+ * Throws an error if a version for packageName is not defined.
+ */
+function getPackageVersion(packageName) {
+    // Read the generator's package.json. This file is updated using ncu,
+    // so the generator always picks up the latest dependency versions.
+    // const pluginPkgPath = path.resolve(__dirname, '../../common/package-releases/package.json');
+    // const pluginPkg = JSON.parse(fs.readFileSync(pluginPkgPath, 'utf-8'));
+    const version = (pluginPkg.dependencies && pluginPkg.dependencies[packageName]) ||
+        (pluginPkg.devDependencies && pluginPkg.devDependencies[packageName]);
+    if (!version) {
+        throw new Error(`Version for package "${packageName}" not found in plugin package.json.`);
+    }
+    return version;
+}
+/**
+ * Helper to map an array of dependency names to an object where each key is a dependency
+ * and its value is obtained via getPackageVersion().
+ */
+function mapDependencies(depNames) {
+    return depNames.reduce((acc, name) => {
+        acc[name] = getPackageVersion(name);
+        return acc;
+    }, {});
+}
+/**
+ * A mapping of frameworks to dependency definitions.
+ * Each dependency's version is obtained dynamically from pluginPkg using a helper.
+ */
+const frameworkDependencyMap = {
+    [FRAMEWORK_ANTUI]: {
+        dependencies: mapDependencies([
+            '@admin-layout/ant-design-pro',
+            '@ant-design/static-style-extract',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+            'antd',
+        ]),
+    },
+    [FRAMEWORK_CHAKRAUI]: {
+        dependencies: mapDependencies([
+            '@chakra-ui/react',
+            'framer-motion',
+            '@emotion/react',
+            '@emotion/server',
+            '@emotion/css',
+            '@emotion/styled',
+        ]),
+    },
+    [FRAMEWORK_TAILWINDUI]: {
+        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer']),
+    },
+};
 function addFrontendGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const projectName = isValid(options.name) ? `frontend-${getValid(options.name)}-server` : DEFAULT_SERVER_NAME;
@@ -12,55 +68,46 @@ const generateFrontend = (tree, options) => __awaiter(void 0, void 0, void 0, fu
     let projectName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : DEFAULT_SERVER_NAME;
     const projectRoot = isValid(options.directory) ? `${getValid(options.directory)}/${projectName}` : projectName;
     projectName = isValid(options.ns) ? `${getValid(options.ns)}-${projectName}` : projectName;
-    const projectSrc = `${projectRoot}/src`;
     const framework = (_b = getValid(options.framework)) !== null && _b !== void 0 ? _b : DEFAULT_FRAMEWORK;
     console.log('UI framework specified: ', framework);
-    // resetProject(`${basePath}/${projectRoot}`);
-    // addProjectConfiguration(tree, framework, {
-    //     root: projectRoot,
-    //     projectType: 'library',
-    //     sourceRoot: projectSrc,
-    //     targets: {},
-    // });
     generateFiles(tree, path.join(__dirname, 'templates'), projectRoot, {});
-    generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectSrc, options);
+    generateFiles(tree, path.join(__dirname, 'frameworks', framework), projectRoot, options);
     updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = projectName;
-        if (framework === FRAMEWORK_ANTUI) {
-            packageJson['dependencies']["@admin-layout/ant-design-pro"] = "latest";
-            packageJson['dependencies']["@ant-design/static-style-extract"] = "^1.0.2";
-            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
-            packageJson['dependencies']["antd"] = "^5.14.0";
-        }
-        else if (framework === FRAMEWORK_CHAKRAUI) {
-            packageJson['dependencies']["@chakra-ui/react"] = "^2.8.2";
-            packageJson['dependencies']["framer-motion"] = "^11.5.4";
-            packageJson['dependencies']["@emotion/react"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/server"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/css"] = "^11.10.0";
-            packageJson['dependencies']["@emotion/styled"] = "^11.10.4";
+        packageJson.name = projectName;
+        packageJson.dependencies = packageJson.dependencies || {};
+        packageJson.devDependencies = packageJson.devDependencies || {};
+        const dependencyOverrides = frameworkDependencyMap[framework] || {};
+        if (dependencyOverrides.dependencies) {
+            Object.entries(dependencyOverrides.dependencies).forEach(([pkg, version]) => {
+                if (!packageJson.dependencies[pkg]) {
+                    packageJson.dependencies[pkg] = version;
+                }
+            });
         }
-        else if (framework === FRAMEWORK_TAILWINDUI) {
-            packageJson['devDependencies']["tailwindcss"] = "^3.4.10";
-            packageJson['devDependencies']["postcss"] = "^8.4.41";
-            packageJson['devDependencies']["autoprefixer"] = "^10.4.20";
+        if (dependencyOverrides.devDependencies) {
+            Object.entries(dependencyOverrides.devDependencies).forEach(([pkg, version]) => {
+                if (!packageJson.devDependencies[pkg]) {
+                    packageJson.devDependencies[pkg] = version;
+                }
+            });
         }
         return packageJson;
     });
     updateJson(tree, `${projectRoot}/config.json`, (configJson) => {
-        configJson['uiFramework'] = framework;
+        configJson.uiFramework = framework;
         if (framework === FRAMEWORK_ANTUI) {
-            configJson['modules'].push("@admin-layout/ant-design-pro");
+            if (!configJson.modules.includes('@admin-layout/ant-design-pro')) {
+                configJson.modules.push('@admin-layout/ant-design-pro');
+            }
         }
         else if (framework === FRAMEWORK_CHAKRAUI) {
-            configJson['modules'].push("@admin-layout/chakra-design-pro");
+            if (!configJson.modules.includes('@admin-layout/chakra-design-pro')) {
+                configJson.modules.push('@admin-layout/chakra-design-pro');
+            }
         }
         if (options['config.json']) {
-            const addtionalConfigs = options['config.json'];
-            configJson = deepMerge(configJson, addtionalConfigs);
+            const additionalConfigs = options['config.json'];
+            configJson = deepMerge(configJson, additionalConfigs);
         }
         return configJson;
     });