@nocobase/devtools 2.3.0-alpha.1 → 3.0.0-alpha.2

package/__tests__/umiConfig.test.js

@@ -0,0 +1,37 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+/* eslint-env jest */
+
+const { getUmiConfig } = require('../umiConfig');
+
+describe('getUmiConfig Settings dev proxy', () => {
+  const originalEnv = { ...process.env };
+
+  beforeEach(() => {
+    process.env.APP_PORT = '13001';
+    process.env.APP_SETTINGS_PORT = '13004';
+    process.env.APP_PUBLIC_PATH = '/nocobase/';
+  });
+
+  afterEach(() => {
+    process.env = { ...originalEnv };
+  });
+
+  test('proxies the outer Settings document path without taking over v1 settings', () => {
+    const { proxy } = getUmiConfig();
+    const rootProxy = proxy['/nocobase/settings{,/**}'];
+
+    expect(rootProxy).toMatchObject({ target: 'http://127.0.0.1:13004', changeOrigin: true, ws: true });
+    expect(rootProxy.pathRewrite).toBeUndefined();
+    expect(proxy['/nocobase/apps/*/settings{,/**}']).toBeUndefined();
+    expect(proxy['/nocobase/_app/*/settings{,/**}']).toBeUndefined();
+    expect(proxy['/nocobase/admin/settings']).toBeUndefined();
+  });
+});

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@nocobase/devtools",
-  "version": "2.3.0-alpha.1",
+  "version": "3.0.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/app": "2.3.0-alpha.1",
-    "@nocobase/build": "2.3.0-alpha.1",
-    "@nocobase/client": "2.3.0-alpha.1",
-    "@nocobase/test": "2.3.0-alpha.1",
-    "@nocobase/utils": "2.3.0-alpha.1",
+    "@nocobase/app": "3.0.0-alpha.2",
+    "@nocobase/build": "3.0.0-alpha.2",
+    "@nocobase/client": "3.0.0-alpha.2",
+    "@nocobase/test": "3.0.0-alpha.2",
+    "@nocobase/utils": "3.0.0-alpha.2",
     "@rsbuild/core": "1.7.3",
     "@rsbuild/plugin-less": "^1.6.2",
     "@rsbuild/plugin-node-polyfill": "1.4.4",
@@ -58,5 +58,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "2377df8ceb12549149017f7f14a61207bf6e49a2"
+  "gitHead": "a3faea21082b30989301de04591ee1b91fd4e6a5"
 }

package/umiConfig.js

@@ -8,6 +8,7 @@ function getUmiConfig() {
   const {
     APP_PORT,
     APP_V2_PORT,
+    APP_SETTINGS_PORT,
     API_BASE_URL,
     API_CLIENT_STORAGE_TYPE,
     API_CLIENT_STORAGE_PREFIX,
@@ -57,6 +58,29 @@ function getUmiConfig() {
     };
   }
 
+  function getSettingsProxy() {
+    if (!APP_SETTINGS_PORT) {
+      return {};
+    }
+
+    const settingsTarget = `http://127.0.0.1:${APP_SETTINGS_PORT}`;
+    const settingsPath = `${normalizedAppPublicPath}settings`;
+    const createProxyOptions = () => ({
+      target: settingsTarget,
+      changeOrigin: true,
+      ws: true,
+      onProxyReq: (proxyReq, req) => {
+        if (req?.ip) {
+          proxyReq.setHeader('X-Forwarded-For', req.ip);
+        }
+      },
+    });
+
+    return {
+      [`${settingsPath}{,/**}`]: createProxyOptions(),
+    };
+  }
+
   return {
     alias: getPackagePaths().reduce((memo, item) => {
       memo[item[0]] = item[1];
@@ -100,6 +124,8 @@ function getUmiConfig() {
       ...getLocalStorageProxy(),
       // v2 shell dev server proxy
       ...getClientV2Proxy(),
+      // standalone Settings dev server proxy
+      ...getSettingsProxy(),
     },
   };
 }