@nocobase/build 2.1.0-alpha.10 → 2.1.0-alpha.11

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/buildPlugin.js

@@ -53,9 +53,27 @@ 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": {
+    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",
@@ -154,7 +172,8 @@ const external = [
   "@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 target_dir = "dist";
@@ -245,7 +264,19 @@ function deleteServerFiles(cwd, log) {
     deep: 1,
     onlyDirectories: true
   });
-  [...files, ...dirs].forEach((item) => {
+  const extraClientDirs = import_fast_glob.default.globSync(["client-v2"], {
+    cwd: import_path.default.join(cwd, target_dir),
+    absolute: true,
+    deep: 1,
+    onlyDirectories: true
+  });
+  [...files, ...dirs.filter((item) => !extraClientDirs.includes(item)), ...extraClientDirs].forEach((item) => {
+    if (item.endsWith(`${import_path.default.sep}client-v2`)) {
+      return;
+    }
+    if (item.endsWith(`${import_path.default.sep}client`)) {
+      return;
+    }
     import_fs_extra.default.removeSync(item);
   });
 }
@@ -470,9 +501,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, {
@@ -485,22 +534,23 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
   const sourcePackages = (0, import_buildPluginUtils.getPackagesFromFiles)(clientFileSource);
   const excludePackages = (0, import_buildPluginUtils.getExcludePackages)(sourcePackages, external, pluginPrefix);
   (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");
+  (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: lane, files: clientFiles, log });
+  const outDir = import_path.default.join(cwd, target_dir, laneConfig.distDir);
   const globals = excludePackages.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,
@@ -582,18 +632,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[\\/]/,
@@ -673,7 +711,7 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
         "process.env.NODE_ENV": JSON.stringify("production"),
         "process.env.NODE_DEBUG": false
       }),
-      new import_injectPublicPathPlugin.AutoInjectPublicPathPlugin(packageJson.name),
+      new import_injectPublicPathPlugin.AutoInjectPublicPathPlugin(packageJson.name, laneConfig.distDir),
       process.env.BUILD_ANALYZE === "true" && new import_rspack_plugin.RsdoctorRspackPlugin({
         // plugin options
         // supports: {
@@ -710,10 +748,12 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
 }
 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);

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

@@ -20,18 +20,30 @@ __export(injectPublicPathPlugin_exports, {
   AutoInjectPublicPathPlugin: () => AutoInjectPublicPathPlugin
 });
 module.exports = __toCommonJS(injectPublicPathPlugin_exports);
-function createPluginClientPublicPathDataUri(packageName) {
+function createPluginClientPublicPathDataUri(packageName, clientDistDir) {
   const code = `
-var publicPath = window['__webpack_public_path__'] || '/';
+var publicPath = window['__nocobase_public_path__'] || '';
+if (!publicPath && window.location && window.location.pathname) {
+  var marker = '/v2/';
+  var pathname = window.location.pathname || '/';
+  var index = pathname.indexOf(marker);
+  publicPath = index >= 0 ? pathname.slice(0, index + 1) : '/';
+}
+if (publicPath) {
+  publicPath = publicPath.replace(/\\/v2\\/?$/, '/');
+}
+if (!publicPath) {
+  publicPath = '/';
+}
 if (publicPath.charAt(publicPath.length - 1) !== '/') {
   publicPath += '/';
 }
-__webpack_public_path__ = publicPath + 'static/plugins/${packageName}/dist/client/';
+__webpack_public_path__ = publicPath + 'static/plugins/${packageName}/dist/${clientDistDir}/';
 `;
   return `data:text/javascript,${encodeURIComponent(code)}`;
 }
-function prependPluginClientPublicPathEntry(entry, packageName) {
-  const dataUri = createPluginClientPublicPathDataUri(packageName);
+function prependPluginClientPublicPathEntry(entry, packageName, clientDistDir) {
+  const dataUri = createPluginClientPublicPathDataUri(packageName, clientDistDir);
   if (typeof entry === "string") {
     return [dataUri, entry];
   }
@@ -49,16 +61,24 @@ function prependPluginClientPublicPathEntry(entry, packageName) {
     };
   }
   return Object.fromEntries(
-    Object.entries(entryConfig).map(([name, value]) => [name, prependPluginClientPublicPathEntry(value, packageName)])
+    Object.entries(entryConfig).map(([name, value]) => [
+      name,
+      prependPluginClientPublicPathEntry(value, packageName, clientDistDir)
+    ])
   );
 }
 class AutoInjectPublicPathPlugin {
-  constructor(pluginName) {
+  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);
+      compiler.options.entry = prependPluginClientPublicPathEntry(
+        compiler.options.entry,
+        this.pluginName,
+        this.clientDistDir
+      );
     });
   }
 }

package/lib/utils/utils.js

@@ -86,7 +86,7 @@ function defineConfig(config) {
 function getUserConfig(cwd) {
   const config = defineConfig({
     modifyTsupConfig: (config2) => config2,
-    modifyViteConfig: (config2) => config2
+    modifyRsbuildConfig: (config2) => config2
   });
   const buildConfigs = import_fast_glob.default.sync(["build.config.js", "build.config.ts"], { cwd });
   if (buildConfigs.length > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.1.0-alpha.10",
+  "version": "2.1.0-alpha.11",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,7 +15,11 @@
     "@babel/preset-env": "^7.26.0",
     "@hapi/topo": "^6.0.0",
     "@lerna/project": "4.0.0",
+    "@rsbuild/core": "1.7.3",
     "@rsbuild/plugin-babel": "^1.0.3",
+    "@rsbuild/plugin-less": "^1.6.2",
+    "@rsbuild/plugin-react": "1.4.6",
+    "@rsbuild/plugin-svgr": "^1.3.1",
     "@rsdoctor/rspack-plugin": "^0.4.8",
     "@rspack/core": "1.7.8",
     "@svgr/webpack": "^8.1.0",
@@ -42,8 +46,6 @@
     "tsup": "8.2.4",
     "typescript": "5.1.3",
     "update-notifier": "3.0.0",
-    "vite-plugin-css-injected-by-js": "^3.2.1",
-    "vite-plugin-lib-inject-css": "1.2.0",
     "yargs-parser": "13.1.2"
   },
   "license": "Apache-2.0",
@@ -51,5 +53,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "ce790d46c0a5768ca9618c7d0d77ab8300de75c8"
+  "gitHead": "bb96d633a6371afb586072ff516bd0613c757db0"
 }