@nocobase/build 2.1.0-alpha.4 → 2.1.0-alpha.45

package/lib/buildClient.js

@@ -31,13 +31,14 @@ __export(buildClient_exports, {
   buildLocale: () => buildLocale
 });
 module.exports = __toCommonJS(buildClient_exports);
-var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
+var import_core = require("@rsbuild/core");
+var import_plugin_less = require("@rsbuild/plugin-less");
+var import_plugin_react = require("@rsbuild/plugin-react");
+var import_plugin_svgr = require("@rsbuild/plugin-svgr");
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_tsup = require("tsup");
-var import_vite = require("vite");
-var import_vite_plugin_lib_inject_css = require("vite-plugin-lib-inject-css");
 var import_constant = require("./constant");
 var import_utils = require("./utils");
 async function buildClient(cwd, userConfig, sourcemap = false, log) {
@@ -45,7 +46,7 @@ async function buildClient(cwd, userConfig, sourcemap = false, log) {
   const cwdWin = cwd.replaceAll(/\\/g, "/");
   const cwdUnix = cwd.replaceAll(/\//g, "\\");
   const external = function(id) {
-    if (id.startsWith(".") || id.startsWith(cwdUnix) || id.startsWith(cwdWin)) {
+    if (!id || import_path.default.isAbsolute(id) || id.startsWith(".") || id.startsWith(cwdUnix) || id.startsWith(cwdWin)) {
       return false;
     }
     return true;
@@ -54,35 +55,12 @@ async function buildClient(cwd, userConfig, sourcemap = false, log) {
   await buildClientLib(cwd, userConfig, sourcemap, external, log);
   await buildLocale(cwd, userConfig, log);
 }
-function buildClientEsm(cwd, userConfig, sourcemap, external, log) {
+async function buildClientEsm(cwd, userConfig, sourcemap, external, log) {
   log("build client esm");
   const entry = import_path.default.join(cwd, "src/index.ts").replaceAll(/\\/g, "/");
   const outDir = import_path.default.resolve(cwd, "es");
-  return (0, import_vite.build)(
-    userConfig.modifyViteConfig({
-      mode: process.env.NODE_ENV || "production",
-      define: (0, import_utils.getEnvDefine)(),
-      build: {
-        minify: process.env.NODE_ENV === "production",
-        outDir,
-        cssCodeSplit: true,
-        emptyOutDir: true,
-        sourcemap,
-        lib: {
-          entry,
-          formats: ["es"],
-          fileName: "index"
-        },
-        target: ["es2015", "edge88", "firefox78", "chrome87", "safari14"],
-        rollupOptions: {
-          cache: true,
-          treeshake: true,
-          external
-        }
-      },
-      plugins: [(0, import_plugin_react.default)(), (0, import_vite_plugin_lib_inject_css.libInjectCss)()]
-    })
-  );
+  await buildClientWithRsbuild(cwd, userConfig, sourcemap, external, entry, outDir, "esm");
+  await injectEntryStyleReference(import_path.default.join(outDir, "index.mjs"), 'import "./index.css";');
 }
 async function buildClientLib(cwd, userConfig, sourcemap, external, log) {
   log("build client lib");
@@ -91,32 +69,114 @@ async function buildClientLib(cwd, userConfig, sourcemap, external, log) {
   const entry = import_path.default.join(esDir, "index.ts");
   import_fs_extra.default.removeSync(entry);
   import_fs_extra.default.linkSync(import_path.default.join(cwd, "es/index.mjs"), entry);
-  await (0, import_vite.build)(
-    userConfig.modifyViteConfig({
-      mode: process.env.NODE_ENV || "production",
-      esbuild: {
-        format: "cjs"
+  try {
+    await buildClientWithRsbuild(cwd, userConfig, sourcemap, external, entry, outDir, "cjs");
+  } finally {
+    import_fs_extra.default.removeSync(entry);
+  }
+  await injectEntryStyleReference(import_path.default.join(outDir, "index.js"), 'require("./index.css");');
+}
+async function buildClientWithRsbuild(cwd, userConfig, sourcemap, external, entry, outDir, format) {
+  const config = createClientRsbuildConfig(cwd, entry, outDir, sourcemap, external, format);
+  const rsbuild = await (0, import_core.createRsbuild)({
+    cwd,
+    config: userConfig.modifyRsbuildConfig?.(config) ?? config
+  });
+  const result = await rsbuild.build();
+  await result.close();
+}
+function createClientRsbuildConfig(cwd, entry, outDir, sourcemap, external, format) {
+  return {
+    plugins: [(0, import_plugin_react.pluginReact)(), (0, import_plugin_less.pluginLess)(), (0, import_plugin_svgr.pluginSvgr)()],
+    source: {
+      entry: {
+        index: {
+          import: entry,
+          html: false
+        }
+      },
+      tsconfigPath: import_path.default.join(cwd, "tsconfig.json"),
+      define: (0, import_utils.getEnvDefine)(),
+      decorators: {
+        version: "legacy"
+      }
+    },
+    output: {
+      target: "web",
+      distPath: {
+        root: outDir,
+        js: ".",
+        jsAsync: ".",
+        css: ".",
+        cssAsync: ".",
+        svg: ".",
+        font: ".",
+        image: ".",
+        media: ".",
+        assets: "."
       },
-      build: {
-        outDir,
-        minify: process.env.NODE_ENV === "production",
-        sourcemap,
-        lib: {
-          entry: import_path.default.join(cwd, "es/index.ts"),
-          formats: ["cjs"],
-          fileName: "index"
-        },
-        rollupOptions: {
-          external
+      filename: {
+        js: format === "esm" ? "[name].mjs" : "[name].js",
+        css: "[name].css",
+        svg: "[name][ext][query]",
+        font: "[name][ext][query]",
+        image: "[name][ext][query]",
+        media: "[name][ext][query]",
+        assets: "[name][ext][query]"
+      },
+      cleanDistPath: true,
+      sourceMap: sourcemap,
+      minify: process.env.NODE_ENV === "production",
+      emitCss: true,
+      externals: [
+        function({ request }, callback) {
+          if (request && external(request)) {
+            return callback(null, true);
+          }
+          callback();
         }
+      ]
+    },
+    performance: {
+      chunkSplit: {
+        strategy: "all-in-one"
       }
-    })
-  );
-  import_fs_extra.default.removeSync(entry);
-  const css = import_fast_glob.default.sync("*.css", { cwd: esDir, absolute: true });
-  css.forEach((file) => {
-    import_fs_extra.default.copySync(file, import_path.default.join(outDir, import_path.default.basename(file)));
-  });
+    },
+    tools: {
+      rspack(config) {
+        config.output = config.output || {};
+        config.output.asyncChunks = false;
+        if (format === "esm") {
+          config.output.library = { type: "module" };
+          config.output.module = true;
+          config.output.chunkFormat = "module";
+          config.output.chunkLoading = "import";
+          config.output.workerChunkLoading = "import";
+          config.experiments = {
+            ...config.experiments,
+            outputModule: true
+          };
+          config.externalsType = "module-import";
+        } else {
+          config.output.library = { type: "commonjs-static" };
+        }
+        config.performance = false;
+        config.stats = "errors-warnings";
+      }
+    }
+  };
+}
+async function injectEntryStyleReference(entryFile, styleReference) {
+  const cssFile = import_path.default.join(import_path.default.dirname(entryFile), "index.css");
+  if (!import_fs_extra.default.existsSync(entryFile) || !import_fs_extra.default.existsSync(cssFile)) {
+    return;
+  }
+  const content = await import_fs_extra.default.readFile(entryFile, "utf8");
+  if (content.startsWith(styleReference)) {
+    return;
+  }
+  await import_fs_extra.default.writeFile(entryFile, `${styleReference}
+${content}`);
 }
 function buildLocale(cwd, userConfig, log) {
   log("build client locale");

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,7 +160,18 @@ const external = [
   "ahooks",
   "lodash",
   "china-division",
-  "file-saver"
+  // langChain
+  "langchain",
+  "@langchain/core",
+  "@langchain/classic",
+  "@langchain/langgraph",
+  "@langchain/langgraph-checkpoint",
+  "@langchain/openai",
+  "@langchain/anthropic",
+  "@langchain/google-genai",
+  "@langchain/deepseek",
+  "@langchain/ollama",
+  "@langchain/mcp-adapters"
 ];
 const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
 const target_dir = "dist";
@@ -218,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"));
@@ -257,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(
@@ -306,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
@@ -337,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,
@@ -353,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"
       }
     })
   );
@@ -372,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"),
@@ -401,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"
       }
     })
   );
@@ -449,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
     })
@@ -457,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, {
@@ -468,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
       }
@@ -569,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[\\/]/,
@@ -660,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: {
@@ -717,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);
@@ -732,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
+});