Merge pull request #95 from kne-union/linzp

Linzp

Author: zhipenglin

lib/craco-fix-plugin.js

@@ -3,7 +3,7 @@ const env = require("./env");
 module.exports = {
     overrideWebpackConfig({webpackConfig, context}) {
         if (context.env === 'production') {
-            when(env === 'production', () => {
+            when(context.env === 'production', () => {
                 // 查找 MiniCssExtractPlugin 实例
                 const miniCssExtractPlugin = webpackConfig.plugins.find(plugin => plugin.constructor && plugin.constructor.name === 'MiniCssExtractPlugin');
 

lib/modulefederation.config.js

@@ -40,10 +40,10 @@ module.exports = {
             singleton: true, requiredVersion: false
         }, '@kne/react-form-antd': {
             singleton: true, requiredVersion: false
-        }, '@kne/with-layer': {
-            singleton: true, requiredVersion: false
         }, '@kne/remote-loader': {
             singleton: true, requiredVersion: false
+        }, '@kne/react-intl': {
+            singleton: true, requiredVersion: false
         }, '@kne/use-event': {
             singleton: true, requiredVersion: false
         }, '@kne/global-context': {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/modules-dev",
-  "version": "2.1.7",
+  "version": "2.1.10",
   "description": "用于辅助在项目内启动一个规范化组件开发的环境",
   "publishConfig": {
     "access": "public",
@@ -32,7 +32,6 @@
   "author": "linzp",
   "license": "ISC",
   "dependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@kne/apply-template": "^0.1.1",
     "@kne/camel-case": "^0.1.1",
     "@kne/craco-module-federation": "^1.1.5",

src/index.js

@@ -1,5 +1,5 @@
 import React, {useEffect, useState} from 'react';
-import {BrowserRouter, Navigate, Route, Routes, useLocation, useNavigate, Outlet} from 'react-router-dom';
+import {Navigate, Route, Routes, useLocation, useNavigate, Outlet} from 'react-router-dom';
 import {createWithRemoteLoader} from '@kne/remote-loader';
 import ensureSlash from '@kne/ensure-slash';
 import {Result, FloatButton} from 'antd';
@@ -41,73 +41,31 @@ const MainLayout = createWithRemoteLoader({
     }}><Outlet/></Layout></Global>;
 });
 
-const PostCat = createWithRemoteLoader({
-    modules: ["components-function:PostCat", "components-function:PostCat@defaultApis"]
-})((remoteModules, preset, projectName) => {
-    const [PostCat, defaultApis] = remoteModules;
-    useEffect(() => {
-        if (!preset.ajax) {
-            return;
-        }
-        preset.ajax.interceptors.request.use((config) => {
-            config.startTime = new Date();
-            return config;
-        });
-        preset.ajax.interceptors.response.use((response) => {
-            !/^\/node-api\//.test(response.config.url) && preset.ajax({
-                url: '/node-api/api-manager/history/add', method: 'POST', data: {
-                    url: response.config.url, props: {
-                        request: {
-                            method: response.config.method,
-                            headers: response.config.headers,
-                            data: response.config.data,
-                            params: response.config.params,
-                            baseUrl: response.config.baseURL
-                        }, response: {
-                            data: response.data,
-                            headers: response.headers,
-                            status: response.status,
-                            statusText: response.statusText
-                        }
-                    }, duration: (new Date()) - response.config.startTime, projectTag: projectName
-                }, showError: false
-            });
-            return response;
-        });
-    }, [preset.ajax]);
-    return <PostCat apis={defaultApis} tag={projectName}/>;
-});
-
-const ExampleRoutes = ({preset, themeToken, projectName, paths, readme, pageProps, children, ...props}) => {
+const ExampleRoutes = ({
+                           preset, themeToken, projectName, paths = [{
+        key: 'index', path: '/', title: '首页'
+    }, {
+        key: 'components', path: '/components', title: '组件'
+    }, {
+        key: 'postcat', path: '/postcat', title: '接口'
+    }], readme, pageProps, children, ...props
+                       }) => {
     const componentsPath = paths.find((item) => item.key === 'components');
     const componentsBaseUrl = ensureSlash(get(componentsPath, 'path', '/'), true);
-    const postcatPath = paths.find((item) => item.key === 'postcat');
-    const postcatUrl = get(postcatPath, 'path', '/postcat');
     return <Routes>
         <Route element={<MainLayout paths={paths} preset={preset} themeToken={themeToken} {...props}/>}>
             {componentsPath &&
                 <Route path={componentsBaseUrl} element={<ModulesIsEmpty baseUrl={componentsBaseUrl} readme={readme}/>}>
-                    <Route path=":id" element={<Example baseUrl={componentsBaseUrl} readme={readme} pageProps={pageProps}/>}/>
-                    <Route path=":id/*" element={<Example baseUrl={componentsBaseUrl} readme={readme} pageProps={pageProps}/>}/>
+                    <Route path=":id"
+                           element={<Example baseUrl={componentsBaseUrl} readme={readme} pageProps={pageProps}/>}/>
+                    <Route path=":id/*"
+                           element={<Example baseUrl={componentsBaseUrl} readme={readme} pageProps={pageProps}/>}/>
                 </Route>}
-            {postcatPath && <Route path={postcatUrl}
-                                   element={projectName ? <PostCat preset={preset} projectName={projectName}/> :
-                                       <Result status='404' title="请传入projectName以开启PostCat"/>}/>}
         </Route>
         <Route path='*' element={children}/>
     </Routes>
 };
 
-ExampleRoutes.defaultProps = {
-    paths: [{
-        key: 'index', path: '/', title: '首页'
-    }, {
-        key: 'components', path: '/components', title: '组件'
-    }, {
-        key: 'postcat', path: '/postcat', title: '接口'
-    }]
-};
-
 
 const createEntry = (WrappedComponents) => (({remoteModules, preset, projectName, themeToken, pageProps, ...props}) => {
     const [readme, setReadme] = useState({});
@@ -123,9 +81,7 @@ const createEntry = (WrappedComponents) => (({remoteModules, preset, projectName
                                key: 'index', path: '/', title: '首页'
                            }, {
                                key: 'components', path: '/modules-dev-components', title: '组件'
-                           }, ...([projectName ? {
-                               key: 'postcat', path: '/modules-dev-postcat', title: '接口'
-                           } : []])]}
+                           }]}
                            themeToken={themeToken}>
                 <WrappedComponents {...props}/><EntryButton/>
             </ExampleRoutes> : <WrappedComponents {...props}/>}