@common-stack/generate-plugin 7.0.4-alpha.1 → 7.0.4-alpha.11

package/lib/generators/add-package/files/client/tsconfig.json

@@ -1,27 +1,14 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "jsx": "react",
-    "rootDir": "src",
-    "outDir": "lib",
-    "declaration": true,
-    "declarationDir": "lib",
-    "types": [
-      "@types/node",
-      "@types/jest",
-      "../../../typings",
-    ],
-    "skipLibCheck": true
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "../../../node_modules",
-    "node_modules",
-    "lib",
-    "lib",
-    "webpack.config.js",
-    "rollup.config.mjs"
-  ]
-}
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "jsx": "react",
+        "rootDir": "src",
+        "outDir": "lib",
+        "declaration": true,
+        "declarationDir": "lib",
+        "types": ["@types/node", "@types/jest", "../../../typings"],
+        "skipLibCheck": true
+    },
+    "include": ["src"],
+    "exclude": ["../../../node_modules", "node_modules", "lib", "webpack.config.js", "rollup.config.mjs"]
+}

package/lib/generators/add-package/files/core/rollup.config.mjs

@@ -1,65 +1,37 @@
-import graphql from '@rollup/plugin-graphql';
-import image from '@rollup/plugin-image';
-import typescript from '@rollup/plugin-typescript';
-import { string } from 'rollup-plugin-string';
-function appendJsExtensionForMonacoEditor() {
-    return {
-        name: 'append-js-extension-for-monaco-editor',
-        transform(code, id) {
-            // Only modify .ts files and ignore node_modules
-            if (id.includes('node_modules') || !id.endsWith('.ts')) {
-                return null;
-            }
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
 
-            let modifiedCode = code;
-            const monacoImportRegex = /(@vscode-alt\/monaco-editor\/esm\/vs\/[a-zA-Z0-9\/._-]+)(?<!\.js)('|")/g;
+// Define any additional plugins specific to this bundle
+const additionalPlugins = [];
 
-            modifiedCode = modifiedCode.replace(monacoImportRegex, (match, p1, p2) => {
-                // Directly append '.js' to the captured path, excluding if it already ends with '.js'
-                return `${p1}.js${p2}`;
-            });
-
-            return {
-                code: modifiedCode,
-                map: null, // Returning null for simplicity, consider generating source maps if necessary
-            };
-        },
-    };
-}
-
-const bundle = (config) => ({
-    ...config,
-    input: 'src/index.ts',
-    // marking all node modules as external
-    external: (id) => !/^[./]/.test(id),
-});
-const globals = { react: 'React' };
-
-export default [
-    bundle({
-        plugins: [
-            typescript({ noEmitOnError: true }),
-            image(),
-            graphql({
-                include: '**/*.gql',
-            }),
-            string({
-                include: '**/*.graphql',
-            }),
-            appendJsExtensionForMonacoEditor(),
-        ],
-        output: [
+// Use the createRollupConfig function to merge the base and specific configurations
+export default (commandLineArgs) => {
+    const isWatchMode = commandLineArgs.watch;
+    return [
+        createRollupConfig(
+            {
+                input: ['src/index.ts'],
+                plugins: [
+                    // Spread in additional plugins specific to this config
+                    ...additionalPlugins,
+                ],
+                output: [
+                    {
+                        dir: 'lib',
+                        format: 'es',
+                        name: 'Accounts',
+                        compact: true,
+                        exports: 'named',
+                        sourcemap: true,
+                        preserveModules: true,
+                        chunkFileNames: '[name]-[hash].[format].js',
+                        globals: { react: 'React' },
+                    },
+                ],
+            },
             {
-                dir: 'lib',
-                format: 'es',
-                name: 'Core',
-                compact: true,
-                exports: 'named',
-                sourcemap: false,
-                preserveModules: true,
-                chunkFileNames: '[name]-[hash].[format].js',
-                globals,
+                isWatchMode,
+                generateRoutesJSON: false,
             },
-        ],
-    }),
-];
+        ),
+    ];
+};

package/lib/generators/add-package/files/core/tsconfig.json

@@ -1,22 +1,13 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "rootDir": "src",
-    "outDir": "lib",
-    "declaration": true,
-    "preserveConstEnums": true,
-    "declarationDir": "lib"
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "../../../node_modules",
-    "node_modules",
-    "lib",
-    "lib",
-    "webpack.config.js",
-    "rollup.config.mjs"
-  ]
-}
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "rootDir": "src",
+        "outDir": "lib",
+        "declaration": true,
+        "preserveConstEnums": true,
+        "declarationDir": "lib"
+    },
+    "include": ["src"],
+    "exclude": ["../../../node_modules", "node_modules", "lib", "webpack.config.js", "rollup.config.mjs"]
+}

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

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

package/lib/generators/add-package/files/server/rollup.config.mjs

@@ -1,30 +1,37 @@
-import { createRollupConfig } from '../../../rollup.config.base.mjs';
-import json from '@rollup/plugin-json'
+import { createRollupConfig } from '<%= offsetFromRoot %>rollup.config.base.mjs';
+import json from '@rollup/plugin-json';
 
 // Define any additional plugins specific to this bundle
-const additionalPlugins = [
-    json()
-];
+const additionalPlugins = [json()];
 
 // Use the createRollupConfig function to merge the base and specific configurations
-export default [
-    createRollupConfig({
-        input: ['src/index.ts'],
-        plugins: [
-            // Spread in additional plugins specific to this config
-            ...additionalPlugins,         
-        ],
-        output: [
+export default (commandLineArgs) => {
+    const isWatchMode = commandLineArgs.watch;
+    return [
+        createRollupConfig(
             {
-                dir: 'lib',
-                format: 'es',
-                name: 'Server',
-                compact: true,
-                exports: 'named',
-                sourcemap: true,
-                preserveModules: true,
-                chunkFileNames: '[name]-[hash].[format].js',
+                input: ['src/index.ts'],
+                plugins: [
+                    // Spread in additional plugins specific to this config
+                    ...additionalPlugins,
+                ],
+                output: [
+                    {
+                        dir: 'lib',
+                        format: 'es',
+                        name: 'Accounts',
+                        compact: true,
+                        exports: 'named',
+                        sourcemap: true,
+                        preserveModules: true,
+                        chunkFileNames: '[name]-[hash].[format].js',
+                    },
+                ],
             },
-        ],
-    }),
-];
+            {
+                isWatchMode,
+                generateRoutesJSON: false,
+            },
+        ),
+    ];
+};

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

@@ -1,27 +1,17 @@
 {
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "resolveJsonModule": true,
-    "rootDir": "./src",
-    "outDir": "lib",
-    "sourceMap": false,
-    "noEmitOnError": false,
-    "declarationDir": "lib",
-    "skipLibCheck": true,
-    "declaration": true,
-    "declarationMap": true,
-    "types": [
-      "@types/node",
-      "@types/jest",
-      "../../../typings"
-    ]
-  },
-  "include": ["src"],
-  "exclude": [
-    "node_modules",
-    "lib",
-    "dist",
-    "rollup.config.mjs",
-    "webpack.config.js"
-  ]
+    "extends": "<%= offsetFromRoot %>tsconfig.base.json",
+    "compilerOptions": {
+        "resolveJsonModule": true,
+        "rootDir": "./src",
+        "outDir": "lib",
+        "sourceMap": false,
+        "noEmitOnError": false,
+        "declarationDir": "lib",
+        "skipLibCheck": true,
+        "declaration": true,
+        "declarationMap": true,
+        "types": ["@types/node", "@types/jest", "../../../typings"]
+    },
+    "include": ["src"],
+    "exclude": ["node_modules", "lib", "dist", "rollup.config.mjs", "webpack.config.js"]
 }

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

@@ -1,4 +1,4 @@
-'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),filesConfig=require('../../utils/filesConfig.cjs'),syncConfig=require('../../utils/syncConfig.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);function addPackageGenerator(tree, options) {
+'use strict';Object.defineProperty(exports,'__esModule',{value:true});var tslib=require('tslib'),devkit=require('@nx/devkit'),path=require('path'),index=require('../../utils/index.cjs'),filesConfig=require('../../utils/filesConfig.cjs'),syncConfig=require('../../utils/syncConfig.cjs'),copyDotfiles=require('../../utils/copyDotfiles.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);function addPackageGenerator(tree, options) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         if (!index.isValid(options.name)) {
             console.error('Package name can not be empty, please try again!');
@@ -14,7 +14,7 @@
             generatePackage(tree, Object.assign(Object.assign({}, options), { type: packageType.toLocaleLowerCase() }), true);
         }
         else {
-            packages.forEach(pkg => {
+            packages.forEach((pkg) => {
                 const configs = Object.assign(Object.assign({}, options), { type: pkg });
                 generatePackage(tree, configs, true);
             });
@@ -31,20 +31,62 @@
 //     await formatFiles(tree);
 // }
 const generatePackage = (tree_1, options_1, ...args_1) => tslib.__awaiter(void 0, [tree_1, options_1, ...args_1], void 0, function* (tree, options, cmdLine = false) {
-    const basePath = `${options.name}/${options.type}`;
-    const packageRoot = index.isValid(options.directory) ? `${index.getValid(options.directory)}/${basePath}` : basePath;
-    const baseName = index.isValid(options.name) ? `${options.name}-${options.type}` : options.type;
-    const packageName = index.isValid(options.ns) ? `${index.getValid(options.ns)}-${baseName}` : baseName;
-    devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', options.type), packageRoot, options);
-    devkit.updateJson(tree, `${packageRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = packageName;
+    var _a, _b;
+    const packageName = (_a = index.getValid(options.name)) !== null && _a !== void 0 ? _a : 'empty-package';
+    let projectRoot = '';
+    if (index.isValid(options.directory)) {
+        projectRoot = `${index.getValid(options.directory)}/${packageName}`;
+    }
+    else {
+        projectRoot = `packages/${packageName}`;
+    }
+    // Namespace the package if provided
+    let fullPackageName = packageName;
+    if (index.isValid(options.ns)) {
+        fullPackageName = `${index.getValid(options.ns)}-${packageName}`;
+    }
+    // Calculate the offset from root for relative paths in templates
+    const offset = devkit.offsetFromRoot(projectRoot);
+    // Define template options with offsetFromRoot for relative paths
+    const templateOptions = Object.assign(Object.assign({}, options), { name: fullPackageName, offsetFromRoot: offset, template: '', dot: '.' });
+    // Determine the package type and generate files accordingly
+    const packageType = (_b = index.getValid(options.type)) !== null && _b !== void 0 ? _b : 'core';
+    console.log(`Generating ${packageType} package: ${fullPackageName} at ${projectRoot}`);
+    // Generate the appropriate package files based on type
+    switch (packageType) {
+        case 'browser':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'browser'), projectRoot, templateOptions);
+            break;
+        case 'client':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'client'), projectRoot, templateOptions);
+            break;
+        case 'server':
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'server'), projectRoot, templateOptions);
+            break;
+        case 'core':
+        default:
+            devkit.generateFiles(tree, path__namespace.join(__dirname, 'files', 'core'), projectRoot, templateOptions);
+            break;
+    }
+    // Rename underscore-prefixed files to dot files
+    copyDotfiles.renameDotFiles(tree, projectRoot);
+    // Copy .npmrc from the main project root if exists
+    const mainProjectRoot = options.projectRoot || '';
+    copyDotfiles.copyNpmrc(tree, mainProjectRoot, projectRoot);
+    // Update package.json with the correct package name
+    devkit.updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson.name = fullPackageName;
         return packageJson;
     });
     if (cmdLine) {
-        syncConfig.syncConfig(tree, packageRoot, options);
+        syncConfig.syncConfig(tree, projectRoot, options);
     }
     else {
-        filesConfig.processFiles(tree, packageRoot, options);
+        filesConfig.processFiles(tree, projectRoot, options);
         yield devkit.formatFiles(tree);
     }
+    return {
+        packageName: fullPackageName,
+        projectRoot,
+    };
 });exports.addPackageGenerator=addPackageGenerator;exports.default=addPackageGenerator;exports.generatePackage=generatePackage;//# sourceMappingURL=generator.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","formatFiles","__awaiter","generateFiles","path","updateJson","syncConfig","processFiles"],"mappings":"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"}
+{"version":3,"file":"generator.cjs","sources":["../../../src/generators/add-package/generator.ts"],"sourcesContent":[null],"names":["isValid","getValid","formatFiles","__awaiter","offsetFromRoot","generateFiles","path","renameDotFiles","copyNpmrc","updateJson","syncConfig","processFiles"],"mappings":"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"}

package/lib/generators/add-package/generator.d.ts

@@ -1,5 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { AddPackageGeneratorSchema } from './schema';
 export declare function addPackageGenerator(tree: Tree, options: AddPackageGeneratorSchema): Promise<void>;
-export declare const generatePackage: (tree: Tree, options: any, cmdLine?: boolean) => Promise<void>;
+export declare const generatePackage: (tree: Tree, options: any, cmdLine?: boolean) => Promise<{
+    packageName: string;
+    projectRoot: string;
+}>;
 export default addPackageGenerator;

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

@@ -1,4 +1,4 @@
-import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';import {processFiles}from'../../utils/filesConfig.mjs';import {syncConfig}from'../../utils/syncConfig.mjs';function addPackageGenerator(tree, options) {
+import {__awaiter}from'tslib';import {formatFiles,offsetFromRoot,generateFiles,updateJson}from'@nx/devkit';import*as path from'path';import {isValid,getValid}from'../../utils/index.mjs';import {processFiles}from'../../utils/filesConfig.mjs';import {syncConfig}from'../../utils/syncConfig.mjs';import {renameDotFiles,copyNpmrc}from'../../utils/copyDotfiles.mjs';function addPackageGenerator(tree, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!isValid(options.name)) {
             console.error('Package name can not be empty, please try again!');
@@ -14,7 +14,7 @@ import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'
             generatePackage(tree, Object.assign(Object.assign({}, options), { type: packageType.toLocaleLowerCase() }), true);
         }
         else {
-            packages.forEach(pkg => {
+            packages.forEach((pkg) => {
                 const configs = Object.assign(Object.assign({}, options), { type: pkg });
                 generatePackage(tree, configs, true);
             });
@@ -31,20 +31,62 @@ import {__awaiter}from'tslib';import {formatFiles,generateFiles,updateJson}from'
 //     await formatFiles(tree);
 // }
 const generatePackage = (tree_1, options_1, ...args_1) => __awaiter(void 0, [tree_1, options_1, ...args_1], void 0, function* (tree, options, cmdLine = false) {
-    const basePath = `${options.name}/${options.type}`;
-    const packageRoot = isValid(options.directory) ? `${getValid(options.directory)}/${basePath}` : basePath;
-    const baseName = isValid(options.name) ? `${options.name}-${options.type}` : options.type;
-    const packageName = isValid(options.ns) ? `${getValid(options.ns)}-${baseName}` : baseName;
-    generateFiles(tree, path.join(__dirname, 'files', options.type), packageRoot, options);
-    updateJson(tree, `${packageRoot}/package.json`, (packageJson) => {
-        packageJson['name'] = packageName;
+    var _a, _b;
+    const packageName = (_a = getValid(options.name)) !== null && _a !== void 0 ? _a : 'empty-package';
+    let projectRoot = '';
+    if (isValid(options.directory)) {
+        projectRoot = `${getValid(options.directory)}/${packageName}`;
+    }
+    else {
+        projectRoot = `packages/${packageName}`;
+    }
+    // Namespace the package if provided
+    let fullPackageName = packageName;
+    if (isValid(options.ns)) {
+        fullPackageName = `${getValid(options.ns)}-${packageName}`;
+    }
+    // Calculate the offset from root for relative paths in templates
+    const offset = offsetFromRoot(projectRoot);
+    // Define template options with offsetFromRoot for relative paths
+    const templateOptions = Object.assign(Object.assign({}, options), { name: fullPackageName, offsetFromRoot: offset, template: '', dot: '.' });
+    // Determine the package type and generate files accordingly
+    const packageType = (_b = getValid(options.type)) !== null && _b !== void 0 ? _b : 'core';
+    console.log(`Generating ${packageType} package: ${fullPackageName} at ${projectRoot}`);
+    // Generate the appropriate package files based on type
+    switch (packageType) {
+        case 'browser':
+            generateFiles(tree, path.join(__dirname, 'files', 'browser'), projectRoot, templateOptions);
+            break;
+        case 'client':
+            generateFiles(tree, path.join(__dirname, 'files', 'client'), projectRoot, templateOptions);
+            break;
+        case 'server':
+            generateFiles(tree, path.join(__dirname, 'files', 'server'), projectRoot, templateOptions);
+            break;
+        case 'core':
+        default:
+            generateFiles(tree, path.join(__dirname, 'files', 'core'), projectRoot, templateOptions);
+            break;
+    }
+    // Rename underscore-prefixed files to dot files
+    renameDotFiles(tree, projectRoot);
+    // Copy .npmrc from the main project root if exists
+    const mainProjectRoot = options.projectRoot || '';
+    copyNpmrc(tree, mainProjectRoot, projectRoot);
+    // Update package.json with the correct package name
+    updateJson(tree, `${projectRoot}/package.json`, (packageJson) => {
+        packageJson.name = fullPackageName;
         return packageJson;
     });
     if (cmdLine) {
-        syncConfig(tree, packageRoot, options);
+        syncConfig(tree, projectRoot, options);
     }
     else {
-        processFiles(tree, packageRoot, options);
+        processFiles(tree, projectRoot, options);
         yield formatFiles(tree);
     }
+    return {
+        packageName: fullPackageName,
+        projectRoot,
+    };
 });export{addPackageGenerator,addPackageGenerator as default,generatePackage};//# sourceMappingURL=generator.mjs.map

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

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

package/package.json

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

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

@@ -17,6 +17,7 @@
         "autoprefixer": "^10.4.20",
         "framer-motion": "^12.4.1",
         "postcss": "^8.5.1",
+        "tailwind-merge": "^3.0.2",
         "tailwindcss": "^4.0.4"
     },
     "devDependencies": {},

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

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

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

@@ -35,7 +35,12 @@ import { LocaleContext } from './context';
 const { apolloClient: client, container, serviceFunc } = createClientContainer();
 const { store } = createReduxStore(client, serviceFunc(), container);
 const antCache = createCache();
-const cache = createEmotionCache();
+
+const emotionInsertionPoint =
+    document.querySelector('meta[name="emotion-insertion-point"]') || document.createElement('meta');
+const cache = createEmotionCache({
+    insertionPoint: emotionInsertionPoint,
+});
 
 (window as any).__remixStore = store;
 removeUniversalPortals((window as any).__SLOT_FILLS__ || []);
@@ -72,7 +77,7 @@ async function hydrate() {
                 <I18nextProvider i18n={i18next}>
                     <LocaleProvider>
                         <CacheProvider value={cache}>
-                            <StyleProvider cache={antCache}>
+                            <StyleProvider container={document.head} cache={antCache}>
                                 <ReduxProvider store={store}>
                                     <SlotFillProvider>
                                         <InversifyProvider container={container} modules={clientModules}>

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

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import * as React from 'react';
-import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError, json } from '@remix-run/react';
+import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError } from '@remix-run/react';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
 import { ApplicationErrorHandler } from '@admin-layout/ant-ui';
@@ -71,6 +71,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
                 <meta charSet="utf-8" />
                 <meta name="viewport" content="width=device-width, initial-scale=1" />
                 <Meta />
+                <meta name="emotion-insertion-point" content="" />
                 <Links />
                 {typeof window === 'undefined' ? `[__STYLESHEET__]` : ''}
             </head>

package/src/generators/add-frontend/generator.ts

@@ -77,7 +77,7 @@ const frameworkDependencyMap: {
         ]),
     },
     [FRAMEWORK_TAILWINDUI]: {
-        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer']),
+        devDependencies: mapDependencies(['tailwindcss', 'postcss', 'autoprefixer', 'tailwind-merge']),
     },
 };