@nocobase/build 2.1.0-beta.9 → 2.2.0-beta.1

package/lib/buildDeclaration.js

@@ -53,7 +53,11 @@ const diagnosticHost = {
   getCanonicalFileName: (fileName) => import_typescript.default.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase(),
   getNewLine: () => import_typescript.default.sys.newLine
 };
+let cachedBaseCompilerOptions = null;
 function loadCompilerOptions() {
+  if (cachedBaseCompilerOptions) {
+    return { ...cachedBaseCompilerOptions };
+  }
   const configPath = import_path.default.join(import_constant.ROOT_PATH, "tsconfig.json");
   const configFile = import_typescript.default.readConfigFile(configPath, import_typescript.default.sys.readFile);
   if (configFile.error) {
@@ -70,7 +74,8 @@ function loadCompilerOptions() {
     ...parsedConfig.options
   };
   delete options.paths;
-  return options;
+  cachedBaseCompilerOptions = Object.freeze({ ...options });
+  return { ...cachedBaseCompilerOptions };
 }
 const buildDeclaration = async (cwd, targetDir) => {
   const srcPath = import_path.default.join(cwd, "src");
@@ -92,7 +97,17 @@ const buildDeclaration = async (cwd, targetDir) => {
     outDir: targetPath,
     rootDir: srcPath
   };
-  const program = import_typescript.default.createProgram(files, compilerOptions);
+  const host = import_typescript.default.createCompilerHost(compilerOptions);
+  const originalDirectoryExists = host.directoryExists?.bind(host);
+  const rootPrefix = import_constant.ROOT_PATH.endsWith(import_path.default.sep) ? import_constant.ROOT_PATH : import_constant.ROOT_PATH + import_path.default.sep;
+  host.directoryExists = (dirPath) => {
+    const resolved = import_path.default.resolve(dirPath);
+    if (resolved !== import_constant.ROOT_PATH && !resolved.startsWith(rootPrefix) && resolved.includes(`${import_path.default.sep}node_modules`)) {
+      return false;
+    }
+    return originalDirectoryExists ? originalDirectoryExists(dirPath) : import_typescript.default.sys.directoryExists(dirPath);
+  };
+  const program = import_typescript.default.createProgram(files, compilerOptions, host);
   const emitResult = program.emit(void 0, void 0, void 0, true);
   const diagnostics = import_typescript.default.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
   if (diagnostics.length) {

package/lib/buildPlugin.js

@@ -32,7 +32,6 @@ __export(buildPlugin_exports, {
   buildPluginServer: () => buildPluginServer,
   buildProPluginServer: () => buildProPluginServer,
   buildServerDeps: () => buildServerDeps,
-  deleteServerFiles: () => deleteServerFiles,
   writeExternalPackageVersion: () => writeExternalPackageVersion
 });
 module.exports = __toCommonJS(buildPlugin_exports);
@@ -47,14 +46,34 @@ var import_path = __toESM(require("path"));
 var import_tsup = require("tsup");
 var import_constant = require("./constant");
 var import_pluginEsbuildCommercialInject = __toESM(require("./plugins/pluginEsbuildCommercialInject"));
+var import_deleteServerFiles = require("./deleteServerFiles");
 var import_utils = require("./utils");
 var import_buildPluginUtils = require("./utils/buildPluginUtils");
 var import_getDepsConfig = require("./utils/getDepsConfig");
 var import_obfuscationResult = require("./utils/obfuscationResult");
+var import_injectPublicPathPlugin = require("./injectPublicPathPlugin");
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
-const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
-const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
+const serverGlobalFiles = ["src/**", "!src/client/**", "!src/client-v2/**", ...import_constant.globExcludeFiles];
 const sourceGlobalFiles = ["src/**/*.{ts,js,tsx,jsx,mjs}", "!src/**/__tests__", "!src/**/__benchmarks__"];
+const pluginClientLaneConfig = {
+  client: {
+    distDir: "client",
+    entryDir: "client",
+    rootEntryFile: "client.js",
+    externalSubpaths: ["client", "client-v2"]
+  },
+  "client-v2": {
+    distDir: "client-v2",
+    entryDir: "client-v2",
+    rootEntryFile: "client-v2.js",
+    externalSubpaths: ["client", "client-v2"]
+  }
+};
+function getClientGlobalFiles(lane) {
+  const entryDir = pluginClientLaneConfig[lane].entryDir;
+  const excludedClientDirs = Object.values(pluginClientLaneConfig).map((item) => item.entryDir).filter((dir) => dir !== entryDir).map((dir) => `!src/${dir}/**`);
+  return ["src/**", "!src/server/**", ...excludedClientDirs, ...import_constant.globExcludeFiles];
+}
 const external = [
   // nocobase
   "@nocobase/ai",
@@ -141,21 +160,20 @@ const external = [
   "ahooks",
   "lodash",
   "china-division",
-  "file-saver",
   // langChain
   "langchain",
   "@langchain/core",
   "@langchain/classic",
   "@langchain/langgraph",
   "@langchain/langgraph-checkpoint",
-  "@langchain/community",
   "@langchain/openai",
   "@langchain/anthropic",
   "@langchain/google-genai",
   "@langchain/deepseek",
-  "@langchain/ollama"
+  "@langchain/ollama",
+  "@langchain/mcp-adapters"
 ];
-const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
+const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-").split(",");
 const target_dir = "dist";
 function appendAiFiles(cwd, files) {
   const aiFiles = import_fast_glob.default.globSync(["src/ai/**/*.md"], { cwd, absolute: true });
@@ -230,24 +248,6 @@ async function copyAiDocSources(cwd, log) {
     await import_fs_extra.default.writeJSON(rootMetaPath, Array.from(rootMetaMap.values()), { spaces: 2 });
   }
 }
-function deleteServerFiles(cwd, log) {
-  log("delete server files");
-  const files = import_fast_glob.default.globSync(["*"], {
-    cwd: import_path.default.join(cwd, target_dir),
-    absolute: true,
-    deep: 1,
-    onlyFiles: true
-  });
-  const dirs = import_fast_glob.default.globSync(["*", "!client", "!node_modules"], {
-    cwd: import_path.default.join(cwd, target_dir),
-    absolute: true,
-    deep: 1,
-    onlyDirectories: true
-  });
-  [...files, ...dirs].forEach((item) => {
-    import_fs_extra.default.removeSync(item);
-  });
-}
 function writeExternalPackageVersion(cwd, log) {
   log("write external version");
   const sourceFiles = import_fast_glob.default.globSync(sourceGlobalFiles, { cwd, absolute: true }).map((item) => import_fs_extra.default.readFileSync(item, "utf-8"));
@@ -269,7 +269,7 @@ async function buildServerDeps(cwd, serverFiles, log) {
   const sourcePackages = (0, import_buildPluginUtils.getSourcePackages)(serverFileSource);
   const includePackages = (0, import_buildPluginUtils.getIncludePackages)(sourcePackages, external, pluginPrefix);
   const excludePackages = (0, import_buildPluginUtils.getExcludePackages)(sourcePackages, external, pluginPrefix);
-  let tips = [];
+  const tips = [];
   if (includePackages.length) {
     tips.push(
       `These packages ${import_chalk.default.yellow(includePackages.join(", "))} will be ${import_chalk.default.italic(
@@ -318,8 +318,10 @@ async function buildServerDeps(cwd, serverFiles, log) {
     });
     await (0, import_ncc.default)(dep, nccConfig).then(
       ({ code, assets }) => {
+        import_fs_extra.default.ensureDirSync(import_path.default.dirname(mainFile));
         import_fs_extra.default.writeFileSync(mainFile, code, "utf-8");
         Object.entries(assets).forEach(([name, item]) => {
+          import_fs_extra.default.ensureDirSync(import_path.default.dirname(import_path.default.join(outputDir, name)));
           import_fs_extra.default.writeFileSync(import_path.default.join(outputDir, name), item.source, {
             encoding: "utf-8",
             mode: item.permissions
@@ -349,7 +351,7 @@ async function buildPluginServer(cwd, userConfig, sourcemap, log) {
   if (otherExts.length) {
     log("%s will not be processed, only be copied to the dist directory.", import_chalk.default.yellow(otherExts.join(",")));
   }
-  deleteServerFiles(cwd, log);
+  (0, import_deleteServerFiles.deleteServerFiles)(cwd, log);
   await (0, import_tsup.build)(
     userConfig.modifyTsupConfig({
       entry: serverFiles,
@@ -365,7 +367,8 @@ async function buildPluginServer(cwd, userConfig, sourcemap, log) {
       skipNodeModulesBundle: true,
       loader: {
         ...otherExts.reduce((prev, cur) => ({ ...prev, [cur]: "copy" }), {}),
-        ".json": "copy"
+        ".json": "copy",
+        ".txt": "copy"
       }
     })
   );
@@ -384,7 +387,7 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   if (otherExts.length) {
     log("%s will not be processed, only be copied to the dist directory.", import_chalk.default.yellow(otherExts.join(",")));
   }
-  deleteServerFiles(cwd, log);
+  (0, import_deleteServerFiles.deleteServerFiles)(cwd, log);
   let tsconfig = bundleRequire.loadTsConfig(import_path.default.join(cwd, "tsconfig.json"));
   import_fs_extra.default.writeFileSync(
     import_path.default.join(cwd, "tsconfig.json"),
@@ -413,7 +416,8 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
       skipNodeModulesBundle: true,
       loader: {
         ...otherExts.reduce((prev, cur) => ({ ...prev, [cur]: "copy" }), {}),
-        ".json": "copy"
+        ".json": "copy",
+        ".txt": "copy"
       }
     })
   );
@@ -461,7 +465,8 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
       tsconfig: tsconfig.path,
       loader: {
         ...otherExts.reduce((prev, cur) => ({ ...prev, [cur]: "copy" }), {}),
-        ".json": "copy"
+        ".json": "copy",
+        ".txt": "copy"
       },
       ...externalOptions
     })
@@ -469,9 +474,27 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   import_fs_extra.default.removeSync(tsconfig.path);
   await buildServerDeps(cwd, serverFiles, log);
 }
-async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial = false) {
-  log("build plugin client");
+async function buildPluginClient(cwd, userConfig, sourcemap, log, lane = "client", isCommercial = false) {
+  const laneConfig = pluginClientLaneConfig[lane];
+  const entryDir = import_path.default.join(cwd, "src", laneConfig.entryDir);
+  const rootEntryFile = import_path.default.join(cwd, laneConfig.rootEntryFile);
+  if (!import_fs_extra.default.existsSync(rootEntryFile)) {
+    log("skip plugin %s build, root entry not found", lane);
+    return false;
+  }
+  if (!import_fs_extra.default.existsSync(entryDir)) {
+    log("Missing %s. Please create it.", import_chalk.default.red(`src/${laneConfig.entryDir}`));
+    process.exit(-1);
+  }
+  const entry = import_fast_glob.default.globSync("index.{ts,tsx,js,jsx}", { absolute: false, cwd: entryDir });
+  if (!entry[0]) {
+    log("Missing %s entry file.", import_chalk.default.red(`src/${laneConfig.entryDir}/index.{ts,tsx,js,jsx}`));
+    process.exit(-1);
+    return false;
+  }
+  log("build plugin %s", lane);
   const packageJson = (0, import_utils.getPackageJson)(cwd);
+  const clientGlobalFiles = getClientGlobalFiles(lane);
   const clientFiles = import_fast_glob.default.globSync(clientGlobalFiles, { cwd, absolute: true });
   if (isCommercial) {
     const commercialFiles = import_fast_glob.default.globSync(clientGlobalFiles, {
@@ -480,36 +503,41 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
     });
     clientFiles.push(...commercialFiles);
   }
-  const clientFileSource = clientFiles.map((item) => import_fs_extra.default.readFileSync(item, "utf-8"));
-  const sourcePackages = (0, import_buildPluginUtils.getPackagesFromFiles)(clientFileSource);
+  const sourceCwds = [cwd];
+  if (isCommercial) {
+    sourceCwds.push(import_path.default.join(process.cwd(), "packages/pro-plugins", import_constant.PLUGIN_COMMERCIAL));
+  }
+  const sourcePackages = (0, import_buildPluginUtils.getPluginBrowserSourcePackages)(sourceCwds, import_constant.globExcludeFiles);
   const excludePackages = (0, import_buildPluginUtils.getExcludePackages)(sourcePackages, external, pluginPrefix);
+  const browserExternalPackages = excludePackages.filter((packageName) => packageName !== "file-saver");
   (0, import_buildPluginUtils.checkRequire)(clientFiles, log);
-  (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: "client", files: clientFiles, log });
-  const outDir = import_path.default.join(cwd, target_dir, "client");
-  const globals = excludePackages.reduce((prev, curr) => {
+  (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: lane, files: clientFiles, log });
+  const outDir = import_path.default.join(cwd, target_dir, laneConfig.distDir);
+  const globals = browserExternalPackages.reduce((prev, curr) => {
     if (curr.startsWith("@nocobase")) {
-      prev[`${curr}/client`] = `${curr}/client`;
+      laneConfig.externalSubpaths.forEach((subpath) => {
+        prev[`${curr}/${subpath}`] = `${curr}/${subpath}`;
+      });
     }
     prev[curr] = curr;
     return prev;
   }, {});
-  const entry = import_fast_glob.default.globSync("index.{ts,tsx,js,jsx}", { absolute: false, cwd: import_path.default.join(cwd, "src/client") });
   const outputFileName = "index.js";
   const compiler = (0, import_core.rspack)({
     mode: "production",
     // mode: "development",
     context: cwd,
-    entry: "./src/client/" + entry[0],
+    entry: `./src/${laneConfig.entryDir}/` + entry[0],
     target: ["web", "es5"],
     output: {
       path: outDir,
       filename: outputFileName,
-      chunkFilename: "[chunkhash].js",
+      chunkFilename: "[name].[contenthash].js",
       publicPath: `auto`,
       // will be generated by the custom plugin
       clean: true,
       library: {
-        name: packageJson.name,
+        name: lane === "client-v2" ? `${packageJson.name}/client-v2` : packageJson.name,
         type: "umd",
         umdNamedDefine: true
       }
@@ -581,18 +609,6 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
           // *.svg?react
           use: ["@svgr/webpack"]
         },
-        {
-          test: /\.(?:js|mjs|cjs|ts|tsx)$/,
-          exclude: /node_modules/,
-          use: {
-            loader: "babel-loader",
-            options: {
-              targets: "defaults",
-              // presets: [['@babel/preset-env']],
-              plugins: ["react-imported-component/babel"]
-            }
-          }
-        },
         {
           test: /\.jsx$/,
           exclude: /[\\/]node_modules[\\/]/,
@@ -672,27 +688,7 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
         "process.env.NODE_ENV": JSON.stringify("production"),
         "process.env.NODE_DEBUG": false
       }),
-      {
-        apply(compiler2) {
-          compiler2.hooks.compilation.tap("CustomPublicPathPlugin", (compilation) => {
-            compilation.hooks.runtimeModule.tap("CustomPublicPathPlugin", (module2) => {
-              if (module2.name === "auto_public_path") {
-                module2.source = {
-                  source: `
-__webpack_require__.p = (function() {
-  var publicPath = window['__webpack_public_path__'] || '/';
-  // \u786E\u4FDD\u8DEF\u5F84\u4EE5 / \u7ED3\u5C3E
-  if (!publicPath.endsWith('/')) {
-    publicPath += '/';
-  }
-  return publicPath + 'static/plugins/${packageJson.name}/dist/client/';
-})();`
-                };
-              }
-            });
-          });
-        }
-      },
+      new import_injectPublicPathPlugin.AutoInjectPublicPathPlugin(packageJson.name, laneConfig.distDir),
       process.env.BUILD_ANALYZE === "true" && new import_rspack_plugin.RsdoctorRspackPlugin({
         // plugin options
         // supports: {
@@ -729,10 +725,12 @@ __webpack_require__.p = (function() {
 }
 async function buildPlugin(cwd, userConfig, sourcemap, log) {
   if (cwd.includes("/pro-plugins/") && import_fs_extra.default.existsSync(import_path.default.join(process.cwd(), "packages/pro-plugins/", import_constant.PLUGIN_COMMERCIAL))) {
-    await buildPluginClient(cwd, userConfig, sourcemap, log, true);
+    await buildPluginClient(cwd, userConfig, sourcemap, log, "client", true);
+    await buildPluginClient(cwd, userConfig, sourcemap, log, "client-v2", true);
     await buildProPluginServer(cwd, userConfig, sourcemap, log);
   } else {
-    await buildPluginClient(cwd, userConfig, sourcemap, log);
+    await buildPluginClient(cwd, userConfig, sourcemap, log, "client");
+    await buildPluginClient(cwd, userConfig, sourcemap, log, "client-v2");
     await buildPluginServer(cwd, userConfig, sourcemap, log);
   }
   writeExternalPackageVersion(cwd, log);
@@ -744,6 +742,5 @@ async function buildPlugin(cwd, userConfig, sourcemap, log) {
   buildPluginServer,
   buildProPluginServer,
   buildServerDeps,
-  deleteServerFiles,
   writeExternalPackageVersion
 });

package/lib/constant.js

@@ -30,6 +30,7 @@ __export(constant_exports, {
   CJS_EXCLUDE_PACKAGES: () => CJS_EXCLUDE_PACKAGES,
   CORE_APP: () => CORE_APP,
   CORE_CLIENT: () => CORE_CLIENT,
+  CORE_CLIENT_V2: () => CORE_CLIENT_V2,
   ESM_PACKAGES: () => ESM_PACKAGES,
   EsbuildSupportExts: () => EsbuildSupportExts,
   NODE_MODULES: () => NODE_MODULES,
@@ -90,20 +91,31 @@ const getPluginPackages = (packages) => packages.filter((item) => PLUGINS_DIR.so
 const getPresetsPackages = (packages) => packages.filter((item) => item.location.startsWith(PRESETS_DIR));
 const CORE_APP = import_path.default.join(PACKAGES_PATH, "core/app");
 const CORE_CLIENT = import_path.default.join(PACKAGES_PATH, "core/client");
+const CORE_CLIENT_V2 = import_path.default.join(PACKAGES_PATH, "core/client-v2");
 const ESM_PACKAGES = ["@nocobase/test"];
 const CJS_EXCLUDE_PACKAGES = [
   import_path.default.join(PACKAGES_PATH, "core/build"),
+  import_path.default.join(PACKAGES_PATH, "core/cli-v1"),
   import_path.default.join(PACKAGES_PATH, "core/cli"),
-  CORE_CLIENT
+  CORE_CLIENT,
+  CORE_CLIENT_V2
 ];
 const getCjsPackages = (packages) => packages.filter((item) => !PLUGINS_DIR.some((dir) => item.location.startsWith(dir))).filter((item) => !item.location.startsWith(PRESETS_DIR)).filter((item) => !ESM_PACKAGES.includes(item.name)).filter((item) => !CJS_EXCLUDE_PACKAGES.includes(item.location));
 const tarIncludesFiles = ["package.json", "README.md", "LICENSE", "dist", "!node_modules"];
-const TAR_OUTPUT_DIR = process.env.TAR_PATH ? process.env.TAR_PATH : import_path.default.join(ROOT_PATH, "storage", "tar");
+function resolveStorageRoot() {
+  const raw = process.env.STORAGE_PATH;
+  if (raw) {
+    return import_path.default.isAbsolute(raw) ? raw : import_path.default.resolve(process.cwd(), raw);
+  }
+  return import_path.default.join(ROOT_PATH, "storage");
+}
+const TAR_OUTPUT_DIR = process.env.TAR_PATH || import_path.default.join(resolveStorageRoot(), "tar");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CJS_EXCLUDE_PACKAGES,
   CORE_APP,
   CORE_CLIENT,
+  CORE_CLIENT_V2,
   ESM_PACKAGES,
   EsbuildSupportExts,
   NODE_MODULES,

package/lib/deleteServerFiles.js

@@ -0,0 +1,68 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var deleteServerFiles_exports = {};
+__export(deleteServerFiles_exports, {
+  deleteServerFiles: () => deleteServerFiles,
+  shouldPreserveDistEntry: () => shouldPreserveDistEntry
+});
+module.exports = __toCommonJS(deleteServerFiles_exports);
+var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = __toESM(require("fs-extra"));
+var import_path = __toESM(require("path"));
+const targetDir = "dist";
+const preservedDistEntries = /* @__PURE__ */ new Set(["client", "client-v2"]);
+function shouldPreserveDistEntry(item) {
+  return preservedDistEntries.has(import_path.default.win32.basename(item));
+}
+function deleteServerFiles(cwd, log) {
+  log("delete server files");
+  const distDir = import_path.default.join(cwd, targetDir);
+  const files = import_fast_glob.default.globSync(["*"], {
+    cwd: distDir,
+    absolute: true,
+    deep: 1,
+    onlyFiles: true
+  });
+  const dirs = import_fast_glob.default.globSync(["*", "!node_modules"], {
+    cwd: distDir,
+    absolute: true,
+    deep: 1,
+    onlyDirectories: true
+  });
+  [...files, ...dirs].forEach((item) => {
+    if (shouldPreserveDistEntry(item)) {
+      return;
+    }
+    import_fs_extra.default.removeSync(item);
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  deleteServerFiles,
+  shouldPreserveDistEntry
+});

package/lib/index.d.ts

@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-
+import type { RsbuildConfig } from '@rsbuild/core'
 import { Options as TsupConfig } from 'tsup'
-import { InlineConfig as ViteConfig } from 'vite'
 
 export type PkgLog = (msg: string, ...args: any[]) => void;
 
 interface UserConfig {
   modifyTsupConfig?: (config: TsupConfig) => TsupConfig;
-  modifyViteConfig?: (config: ViteConfig) => ViteConfig;
+  modifyRsbuildConfig?: (config: RsbuildConfig) => RsbuildConfig;
   beforeBuild?: (log: PkgLog) => void | Promise<void>;
   afterBuild?: (log: PkgLog) => void | Promise<void>;
 }

package/lib/injectPublicPathPlugin.js

@@ -0,0 +1,111 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injectPublicPathPlugin_exports = {};
+__export(injectPublicPathPlugin_exports, {
+  AutoInjectPublicPathPlugin: () => AutoInjectPublicPathPlugin
+});
+module.exports = __toCommonJS(injectPublicPathPlugin_exports);
+function createPluginClientPublicPathDataUri(packageName, clientDistDir) {
+  const code = `
+var publicPath = '';
+var currentScript = typeof document !== 'undefined' ? document.currentScript : null;
+if (currentScript && currentScript.src) {
+  publicPath = currentScript.src
+    .replace(/^blob:/, '')
+    .replace(/#.*$/, '')
+    .replace(/\\?.*$/, '')
+    .replace(/\\/[^\\/]+$/, '/');
+}
+if (!publicPath) {
+  var runtimeAssetBase = window['__webpack_public_path__'] || '';
+  if (runtimeAssetBase) {
+    if (runtimeAssetBase.charAt(runtimeAssetBase.length - 1) !== '/') {
+      runtimeAssetBase += '/';
+    }
+    publicPath = runtimeAssetBase + 'static/plugins/${packageName}/dist/${clientDistDir}/';
+  }
+}
+if (!publicPath) {
+  var modernPrefix = window['__nocobase_modern_client_prefix__'] || 'v';
+  modernPrefix = String(modernPrefix).replace(/^\\/+|\\/+$/g, '') || 'v';
+  var marker = '/' + modernPrefix + '/';
+  publicPath = window['__nocobase_public_path__'] || '';
+  if (!publicPath && window.location && window.location.pathname) {
+    var pathname = window.location.pathname || '/';
+    var index = pathname.indexOf(marker);
+    publicPath = index >= 0 ? pathname.slice(0, index + 1) : '/';
+  }
+  if (publicPath) {
+    publicPath = publicPath.replace(new RegExp('/' + modernPrefix + '/?$'), '/');
+  }
+  if (!publicPath) {
+    publicPath = '/';
+  }
+  if (publicPath.charAt(publicPath.length - 1) !== '/') {
+    publicPath += '/';
+  }
+  publicPath += 'static/plugins/${packageName}/dist/${clientDistDir}/';
+}
+__webpack_public_path__ = publicPath;
+`;
+  return `data:text/javascript,${encodeURIComponent(code)}`;
+}
+function prependPluginClientPublicPathEntry(entry, packageName, clientDistDir) {
+  const dataUri = createPluginClientPublicPathDataUri(packageName, clientDistDir);
+  if (typeof entry === "string") {
+    return [dataUri, entry];
+  }
+  if (Array.isArray(entry)) {
+    return [dataUri, ...entry];
+  }
+  if (!entry || typeof entry !== "object") {
+    return entry;
+  }
+  const entryConfig = entry;
+  if (entryConfig.import) {
+    return {
+      ...entryConfig,
+      import: Array.isArray(entryConfig.import) ? [dataUri, ...entryConfig.import] : [dataUri, entryConfig.import]
+    };
+  }
+  return Object.fromEntries(
+    Object.entries(entryConfig).map(([name, value]) => [
+      name,
+      prependPluginClientPublicPathEntry(value, packageName, clientDistDir)
+    ])
+  );
+}
+class AutoInjectPublicPathPlugin {
+  constructor(pluginName, clientDistDir = "client") {
+    this.pluginName = pluginName;
+    this.clientDistDir = clientDistDir;
+  }
+  apply(compiler) {
+    compiler.hooks.environment.tap("AutoInjectPublicPathPlugin", () => {
+      compiler.options.entry = prependPluginClientPublicPathEntry(
+        compiler.options.entry,
+        this.pluginName,
+        this.clientDistDir
+      );
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AutoInjectPublicPathPlugin
+});

package/lib/plugins/pluginRspackCommercialLoader.js

@@ -25,7 +25,8 @@ function myLoader(source) {
   if (!options?.isCommercial) {
     return source;
   }
-  const isEntry = this.resourcePath.match(/client\/index\.(ts|tsx)/) && !this.resourcePath.includes("plugin-commercial");
+  const isClientV2Plugin = this.resourcePath.match(/client-v2\/plugin\.(ts|tsx)/) && !this.resourcePath.includes("plugin-commercial");
+  const isEntry = (this.resourcePath.match(/client\/index\.(ts|tsx)/) || isClientV2Plugin) && !this.resourcePath.includes("plugin-commercial");
   if (isEntry) {
     const regex = /export\s+default\s+([a-zA-Z_0-9]+)\s*;?/;
     const match = source.match(regex);
@@ -33,7 +34,7 @@ function myLoader(source) {
       source = source.replace(regex, ``);
       const moduleName = match[1];
       source = `
-        import { withCommercial } from '@nocobase/plugin-commercial/client';
+        import { withCommercial } from '@nocobase/plugin-commercial/${isClientV2Plugin ? "client-v2" : "client"}';
         ${source}
         export default withCommercial(${moduleName});
         `;

package/lib/utils/buildPluginUtils.js

@@ -39,6 +39,7 @@ __export(buildPluginUtils_exports, {
   getPackageJsonPackages: () => getPackageJsonPackages,
   getPackageNameFromString: () => getPackageNameFromString,
   getPackagesFromFiles: () => getPackagesFromFiles,
+  getPluginBrowserSourcePackages: () => getPluginBrowserSourcePackages,
   getSourcePackages: () => getSourcePackages,
   isNotBuiltinModule: () => isNotBuiltinModule,
   isValidPackageName: () => isValidPackageName
@@ -46,6 +47,7 @@ __export(buildPluginUtils_exports, {
 module.exports = __toCommonJS(buildPluginUtils_exports);
 var import_fs = __toESM(require("fs"));
 var import_chalk = __toESM(require("chalk"));
+var import_fast_glob = __toESM(require("fast-glob"));
 var import_module = require("module");
 var import_path = __toESM(require("path"));
 const requireRegex = /require\s*\(['"`](.*?)['"`]\)/g;
@@ -54,7 +56,7 @@ function isNotBuiltinModule(packageName) {
   return !import_module.builtinModules.includes(packageName);
 }
 const isValidPackageName = (str) => {
-  const pattern = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
+  const pattern = /^(?:@[a-zA-Z0-9._-]+\/)?[a-zA-Z0-9._-]+$/;
   return pattern.test(str);
 };
 function getPackageNameFromString(str) {
@@ -76,6 +78,16 @@ function getPackagesFromFiles(files) {
   ]).flat().map(getPackageNameFromString).filter(Boolean).filter(isNotBuiltinModule);
   return [...new Set(packageNames)];
 }
+function getPluginBrowserSourcePackages(cwds, excludeFiles) {
+  const files = cwds.flatMap(
+    (cwd) => import_fast_glob.default.globSync(["src/**/*.{ts,js,tsx,jsx,mjs}", "!src/server/**", ...excludeFiles], {
+      cwd,
+      absolute: true
+    })
+  );
+  const source = files.map((item) => import_fs.default.readFileSync(item, "utf-8"));
+  return getPackagesFromFiles(source);
+}
 function getSourcePackages(fileSources) {
   return getPackagesFromFiles(fileSources);
 }
@@ -163,6 +175,7 @@ function checkFileSize(outDir, log) {
   getPackageJsonPackages,
   getPackageNameFromString,
   getPackagesFromFiles,
+  getPluginBrowserSourcePackages,
   getSourcePackages,
   isNotBuiltinModule,
   isValidPackageName