@jiangood/open-admin 2.2.4 → 2.2.5

package/config/common-plugin.js

@@ -35,6 +35,57 @@ export default (api) => {
         key: 'open-admin',
     });
 
+    // Inject build-time defines and UmiJS defaults from environment variables
+    const servletContext = process.env.SERVLET_CONTEXT || '/change-this-servlet-context';
+    const isProd = process.env.NODE_ENV === 'production';
+    const serverPort = process.env.SERVER_PORT || '8080';
+
+    const theme = {};
+    if (process.env.THEME_PRIMARY_COLOR) theme["primary-color"] = process.env.THEME_PRIMARY_COLOR;
+    if (process.env.THEME_SUCCESS_COLOR) theme["success-color"] = process.env.THEME_SUCCESS_COLOR;
+    if (process.env.THEME_WARNING_COLOR) theme["warning-color"] = process.env.THEME_WARNING_COLOR;
+    if (process.env.THEME_ERROR_COLOR) theme["error-color"] = process.env.THEME_ERROR_COLOR;
+    if (process.env.THEME_BACKGROUND_COLOR) theme["background-color"] = process.env.THEME_BACKGROUND_COLOR;
+
+    api.modifyConfig((memo) => {
+        memo.define = memo.define || {};
+
+        // Define globals
+        memo.define.SERVLET_CONTEXT = servletContext;
+        if (Object.keys(theme).length > 0) {
+            memo.define.OPEN_ADMIN_THEME = theme;
+        }
+        if (process.env.PUBLIC_PAGES) {
+            memo.define.OPEN_ADMIN_PUBLIC_PAGES = process.env.PUBLIC_PAGES;
+        }
+
+        // Build defaults (only if not explicitly set by project config.js)
+        if (memo.publicPath === undefined) {
+            memo.publicPath = isProd ? './' : '/';
+        }
+        if (memo.hash === undefined) memo.hash = true;
+        if (memo.history === undefined) memo.history = { type: 'hash' };
+        if (memo.mfsu === undefined) memo.mfsu = false;
+        if (memo.esbuildMinifyIIFE === undefined) memo.esbuildMinifyIIFE = true;
+
+        // Proxy dev server
+        if (memo.proxy === undefined) memo.proxy = {};
+        if (!memo.proxy[servletContext]) {
+            memo.proxy[servletContext] = {
+                target: `http://127.0.0.1:${serverPort}`,
+                changeOrigin: true,
+                ws: true, // WebSocket 代理支持（http-proxy-middleware）
+            };
+        }
+
+        return memo;
+    });
+
+    api.logger.info(`SERVLET_CONTEXT=${servletContext}, proxy→http://127.0.0.1:${serverPort}`);
+    if (Object.keys(theme).length > 0) {
+        api.logger.info('OPEN_ADMIN_THEME:', theme);
+    }
+
     const isFramework = api.pkg.name === pkgName;
 
     try {

package/config/config.js

@@ -1,55 +1,5 @@
 import {defineConfig} from 'umi';
-import * as fs from "fs";
-import * as path from "path";
-
-// https://umijs.org/docs/api/config
-
-const host = '127.0.0.1:8080';
-
-function getPluginDir() {
-    try {
-        const isFramework = fs.existsSync(path.join(process.cwd(), 'config/common-plugin.js'));
-        console.log('isFramework', isFramework)
-        return isFramework ? './config' : '@jiangood/open-admin/config';
-    } catch (error) {
-        console.error('获取插件目录时出错:', error);
-        return '@jiangood/open-admin/config';
-    }
-}
-
-const pluginDir = getPluginDir();
-
-const SERVLET_CONTEXT = process.env.SERVLET_CONTEXT || '/change-this-servlet-context'; // 见 .env
-
-const proxyConfig = {
-    [SERVLET_CONTEXT]: {
-        target: `http://${host}`,
-        changeOrigin: true,
-    },
-};
 
 export default defineConfig({
-    // 注入全局变量，前端代码可直接使用 SERVLET_CONTEXT
-    define: {
-        SERVLET_CONTEXT: SERVLET_CONTEXT,
-    },
-    // 资源使用相对路径，部署到任意 context-path 下都无需重新构建
-    publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
-    // 配置是否让生成的文件包含 hash 后缀，通常用于增量发布和避免浏览器加载缓存
-    hash: true,
-    // 使用 hash 模式的路由
-    history: { type: 'hash' },
-    // 暂时关闭 MFSU，避免配置复杂性
-    mfsu: false,
-    // 启用 esbuild 压缩 IIFE
-    esbuildMinifyIIFE: true,
-    // 插件配置
-    plugins: [
-       `${pluginDir}/common-plugin`,
-    ],
-    // 代理配置
-    proxy: proxyConfig,
-    
-
-
+    plugins: ['./config/common-plugin'],
 });

package/package.json

@@ -3,7 +3,6 @@
     "@types/lodash": "^4.17.23",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.0.0",
-    "@umijs/plugins": "^4.3.17",
     "babel-plugin-react-compiler": "^1.0.0",
     "typescript": "^6.0.3"
   },
@@ -38,5 +37,5 @@
     "dev": "umi dev",
     "build": "umi build"
   },
-  "version": "2.2.4"
+  "version": "2.2.5"
 }