@nocobase/devtools 2.0.22 → 2.1.0-alpha.10

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "@nocobase/devtools",
-  "version": "2.0.22",
+  "version": "2.1.0-alpha.10",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "2.0.22",
-    "@nocobase/client": "2.0.22",
-    "@nocobase/test": "2.0.22",
+    "@nocobase/build": "2.1.0-alpha.10",
+    "@nocobase/client": "2.1.0-alpha.10",
+    "@nocobase/test": "2.1.0-alpha.10",
+    "@rsbuild/core": "1.7.3",
+    "@rsbuild/plugin-less": "^1.6.2",
+    "@rsbuild/plugin-node-polyfill": "1.4.4",
+    "@rsbuild/plugin-react": "1.4.6",
     "@types/koa": "^2.15.0",
     "@types/koa-bodyparser": "^4.3.4",
     "@types/lodash": "^4.14.177",
@@ -50,5 +54,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "7b703580c4bb60f1e5e44c8fd685141bb8b3a47c"
+  "gitHead": "ce790d46c0a5768ca9618c7d0d77ab8300de75c8"
 }

package/rsbuildConfig.d.ts

@@ -0,0 +1 @@
+export declare function getRsbuildAlias(): Record<string, string>;

package/rsbuildConfig.js

@@ -0,0 +1,46 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { resolve, sep } from 'node:path';
+import glob from 'fast-glob';
+
+function getTsconfigPaths() {
+  const content = readFileSync(resolve(process.cwd(), 'tsconfig.paths.json'), 'utf-8');
+  const json = JSON.parse(content);
+  return json.compilerOptions.paths;
+}
+
+function getPackagePaths() {
+  const paths = getTsconfigPaths();
+  const pkgs = [];
+  for (const key in paths) {
+    if (Object.hasOwnProperty.call(paths, key)) {
+      for (const dir of paths[key]) {
+        if (dir.includes('*')) {
+          const files = glob.sync(dir, { cwd: process.cwd(), onlyDirectories: true });
+          for (const file of files) {
+            const dirname = resolve(process.cwd(), file);
+            if (existsSync(dirname)) {
+              const re = new RegExp(dir.replace('*', '(.+)'));
+              const normalized = dirname
+                .substring(process.cwd().length + 1)
+                .split(sep)
+                .join('/');
+              const match = re.exec(normalized);
+              pkgs.push([key.replace('*', match?.[1]), dirname]);
+            }
+          }
+        } else {
+          const dirname = resolve(process.cwd(), dir);
+          pkgs.push([key, dirname]);
+        }
+      }
+    }
+  }
+  return pkgs;
+}
+
+export function getRsbuildAlias() {
+  return getPackagePaths().reduce((memo, item) => {
+    memo[item[0]] = item[1];
+    return memo;
+  }, {});
+}

package/umiConfig.js

@@ -4,12 +4,22 @@ const packageJson = require('./package.json');
 const fs = require('fs');
 const glob = require('fast-glob');
 const path = require('path');
+const { resolvePublicPath, resolveV2PublicPath } = require('../cli/src/util');
 
 console.log('VERSION: ', packageJson.version);
 
 function getUmiConfig() {
-  const { APP_PORT, API_BASE_URL, API_CLIENT_STORAGE_TYPE, API_CLIENT_STORAGE_PREFIX, APP_PUBLIC_PATH } = process.env;
+  const {
+    APP_PORT,
+    APP_V2_PORT,
+    API_BASE_URL,
+    API_CLIENT_STORAGE_TYPE,
+    API_CLIENT_STORAGE_PREFIX,
+    APP_PUBLIC_PATH,
+  } = process.env;
   const API_BASE_PATH = process.env.API_BASE_PATH || '/api/';
+  const normalizedAppPublicPath = resolvePublicPath(APP_PUBLIC_PATH || '/');
+  const V2_PUBLIC_PATH = resolveV2PublicPath(APP_PUBLIC_PATH || '/');
   const PROXY_TARGET_URL = process.env.PROXY_TARGET_URL || `http://127.0.0.1:${APP_PORT}`;
   const LOCAL_STORAGE_BASE_URL = 'storage/uploads/';
   const STATIC_PATH = 'static/';
@@ -20,17 +30,37 @@ function getUmiConfig() {
     }
 
     return {
-      [APP_PUBLIC_PATH + LOCAL_STORAGE_BASE_URL]: {
+      [normalizedAppPublicPath + LOCAL_STORAGE_BASE_URL]: {
         target: PROXY_TARGET_URL,
         changeOrigin: true,
       },
-      [APP_PUBLIC_PATH + STATIC_PATH]: {
+      [normalizedAppPublicPath + STATIC_PATH]: {
         target: PROXY_TARGET_URL,
         changeOrigin: true,
       },
     };
   }
 
+  function getClientV2Proxy() {
+    if (!APP_V2_PORT) {
+      return {};
+    }
+
+    return {
+      [V2_PUBLIC_PATH]: {
+        target: `http://127.0.0.1:${APP_V2_PORT}`,
+        changeOrigin: true,
+        ws: true,
+        pathRewrite: { [`^${V2_PUBLIC_PATH}`]: V2_PUBLIC_PATH },
+        onProxyReq: (proxyReq, req, res) => {
+          if (req?.ip) {
+            proxyReq.setHeader('X-Forwarded-For', req.ip);
+          }
+        },
+      },
+    };
+  }
+
   return {
     alias: getPackagePaths().reduce((memo, item) => {
       memo[item[0]] = item[1];
@@ -72,6 +102,8 @@ function getUmiConfig() {
       },
       // for local storage
       ...getLocalStorageProxy(),
+      // v2 shell dev server proxy
+      ...getClientV2Proxy(),
     },
   };
 }