@nocobase/build 1.5.0-beta.2 → 1.5.0-beta.4

package/lib/build.js

@@ -80,7 +80,8 @@ async function build(pkgs) {
   const appClient = packages.find((item) => item.location === import_constant.CORE_APP);
   if (appClient) {
     await runScript(["umi", "build"], import_constant.ROOT_PATH, {
-      APP_ROOT: import_path.default.join(import_constant.CORE_APP, "client")
+      APP_ROOT: import_path.default.join(import_constant.CORE_APP, "client"),
+      ANALYZE: process.env.BUILD_ANALYZE === "true" ? "1" : void 0
     });
   }
   (0, import_utils.writeToCache)(BUILD_ERROR, {});

package/lib/buildEsm.js

@@ -32,8 +32,8 @@ __export(buildEsm_exports, {
 module.exports = __toCommonJS(buildEsm_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("./utils");
-var import_vite = require("vite");
 var import_fast_glob = __toESM(require("fast-glob"));
+var import_core = require("@rspack/core");
 const clientExt = ".{ts,tsx,js,jsx}";
 function getSingleEntry(file, cwd) {
   return import_fast_glob.default.sync([`${file}${clientExt}`], { cwd, absolute: true, onlyFiles: true })?.[0]?.replaceAll(/\\/g, "/");
@@ -67,30 +67,134 @@ function build(cwd, entry, outDir, userConfig, sourcemap = false, log) {
     }
     return true;
   };
-  return (0, import_vite.build)(
-    userConfig.modifyViteConfig({
-      mode: process.env.NODE_ENV || "production",
-      define: (0, import_utils.getEnvDefine)(),
-      build: {
-        minify: false,
-        outDir,
-        cssCodeSplit: true,
-        emptyOutDir: true,
-        sourcemap,
-        lib: {
-          entry,
-          formats: ["es"],
-          fileName: "index"
+  return (0, import_core.rspack)({
+    entry: {
+      index: entry
+    },
+    output: {
+      path: outDir,
+      library: {
+        type: "module"
+      },
+      clean: true
+    },
+    target: ["node16"],
+    mode: process.env.NODE_ENV === "production" ? "production" : "development",
+    resolve: {
+      tsConfig: import_path.default.join(process.cwd(), "tsconfig.json"),
+      extensions: [".js", ".jsx", ".ts", ".tsx", ".json", ".less", ".css"]
+    },
+    module: {
+      rules: [
+        {
+          test: /\.less$/,
+          use: [
+            { loader: "style-loader" },
+            { loader: "css-loader" },
+            { loader: require.resolve("less-loader") },
+            {
+              loader: "postcss-loader",
+              options: {
+                postcssOptions: {
+                  plugins: {
+                    "postcss-preset-env": {
+                      browsers: ["last 2 versions", "> 1%", "cover 99.5%", "not dead"]
+                    },
+                    autoprefixer: {}
+                  }
+                }
+              }
+            }
+          ],
+          type: "javascript/auto"
         },
-        target: ["node16"],
-        rollupOptions: {
-          cache: true,
-          treeshake: true,
-          external
+        {
+          test: /\.css$/,
+          use: [
+            "style-loader",
+            "css-loader",
+            {
+              loader: "postcss-loader",
+              options: {
+                postcssOptions: {
+                  plugins: {
+                    "postcss-preset-env": {
+                      browsers: ["last 2 versions", "> 1%", "cover 99.5%", "not dead"]
+                    },
+                    autoprefixer: {}
+                  }
+                }
+              }
+            }
+          ],
+          type: "javascript/auto"
+        },
+        {
+          test: /\.(png|jpe?g|gif)$/i,
+          type: "asset"
+        },
+        {
+          test: /\.svg$/i,
+          issuer: /\.[jt]sx?$/,
+          use: ["@svgr/webpack"]
+        },
+        {
+          test: /\.jsx$/,
+          exclude: /[\\/]node_modules[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "ecmascript",
+                jsx: true
+              },
+              target: "es5"
+            }
+          }
+        },
+        {
+          test: /\.tsx$/,
+          exclude: /[\\/]node_modules[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript",
+                tsx: true
+              },
+              target: "es5"
+            }
+          }
+        },
+        {
+          test: /\.ts$/,
+          exclude: /[\\/]node_modules[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript"
+              },
+              target: "es5"
+            }
+          }
+        }
+      ]
+    },
+    externals: [
+      function({ request }, callback) {
+        if (external(request)) {
+          return callback(null, true);
         }
+        callback();
       }
-    })
-  );
+    ],
+    plugins: [new import_core.rspack.DefinePlugin((0, import_utils.getEnvDefine)())],
+    stats: "errors-warnings"
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/buildPlugin.js

@@ -35,19 +35,18 @@ __export(buildPlugin_exports, {
   writeExternalPackageVersion: () => writeExternalPackageVersion
 });
 module.exports = __toCommonJS(buildPlugin_exports);
+var import_core = require("@rspack/core");
 var import_ncc = __toESM(require("@vercel/ncc"));
-var import_plugin_react = __toESM(require("@vitejs/plugin-react"));
 var import_chalk = __toESM(require("chalk"));
 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_css_injected_by_js = __toESM(require("vite-plugin-css-injected-by-js"));
 var import_constant = require("./constant");
 var import_utils = require("./utils");
 var import_buildPluginUtils = require("./utils/buildPluginUtils");
 var import_getDepsConfig = require("./utils/getDepsConfig");
+var import_rspack_plugin = require("@rsdoctor/rspack-plugin");
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
 const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
 const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
@@ -62,8 +61,10 @@ const external = [
   "@nocobase/database",
   "@nocobase/data-source-manager",
   "@nocobase/evaluators",
+  "@nocobase/lock-manager",
   "@nocobase/logger",
   "@nocobase/resourcer",
+  "@nocobase/telemetry",
   "@nocobase/sdk",
   "@nocobase/server",
   "@nocobase/test",
@@ -133,7 +134,8 @@ const external = [
   "@emotion/css",
   "ahooks",
   "lodash",
-  "china-division"
+  "china-division",
+  "file-saver"
 ];
 const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
 const target_dir = "dist";
@@ -187,7 +189,9 @@ async function buildServerDeps(cwd, serverFiles, log) {
   if (excludePackages.length) {
     tips.push(`These packages ${import_chalk.default.yellow(excludePackages.join(", "))} will be ${import_chalk.default.italic("exclude")}.`);
   }
-  tips.push(`For more information, please refer to: ${import_chalk.default.blue("https://docs.nocobase.com/development/deps")}.`);
+  tips.push(
+    `For more information, please refer to: ${import_chalk.default.blue("https://docs.nocobase.com/development/others/deps")}.`
+  );
   log(tips.join(" "));
   if (!includePackages.length) return;
   const deps = (0, import_getDepsConfig.getDepsConfig)(cwd, outDir, includePackages, external);
@@ -287,48 +291,184 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log) {
   const outDir = import_path.default.join(cwd, target_dir, "client");
   const globals = excludePackages.reduce((prev, curr) => {
     if (curr.startsWith("@nocobase")) {
-      prev[`${curr}/client`] = curr;
+      prev[`${curr}/client`] = `${curr}/client`;
     }
     prev[curr] = curr;
     return prev;
   }, {});
-  const entry = import_fast_glob.default.globSync("src/client/index.{ts,tsx,js,jsx}", { absolute: true, cwd });
+  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";
-  await (0, import_vite.build)(
-    userConfig.modifyViteConfig({
-      mode: process.env.NODE_ENV || "production",
-      define: (0, import_utils.getEnvDefine)(),
-      logLevel: "warn",
-      build: {
-        minify: process.env.NODE_ENV === "production",
-        outDir,
-        cssCodeSplit: false,
-        emptyOutDir: true,
-        sourcemap,
-        lib: {
-          entry,
-          formats: ["umd"],
-          name: packageJson.name,
-          fileName: () => outputFileName
+  const compiler = (0, import_core.rspack)({
+    mode: "production",
+    // mode: "development",
+    context: cwd,
+    entry: "./src/client/" + entry[0],
+    target: ["web", "es5"],
+    output: {
+      path: outDir,
+      filename: outputFileName,
+      chunkFilename: "[chunkhash].js",
+      publicPath: `/static/plugins/${packageJson.name}/dist/client/`,
+      clean: true,
+      library: {
+        name: packageJson.name,
+        type: "umd",
+        umdNamedDefine: true
+      }
+    },
+    resolve: {
+      tsConfig: import_path.default.join(process.cwd(), "tsconfig.json"),
+      extensions: [".js", ".jsx", ".ts", ".tsx", ".json", ".less", ".css"]
+    },
+    module: {
+      rules: [
+        {
+          test: /\.less$/,
+          use: [
+            { loader: "style-loader" },
+            { loader: "css-loader" },
+            { loader: require.resolve("less-loader") },
+            {
+              loader: "postcss-loader",
+              options: {
+                postcssOptions: {
+                  plugins: {
+                    "postcss-preset-env": {
+                      browsers: ["last 2 versions", "> 1%", "cover 99.5%", "not dead"]
+                    },
+                    autoprefixer: {}
+                  }
+                }
+              }
+            }
+          ],
+          type: "javascript/auto"
+        },
+        {
+          test: /\.css$/,
+          use: [
+            "style-loader",
+            "css-loader",
+            {
+              loader: "postcss-loader",
+              options: {
+                postcssOptions: {
+                  plugins: {
+                    "postcss-preset-env": {
+                      browsers: ["last 2 versions", "> 1%", "cover 99.5%", "not dead"]
+                    },
+                    autoprefixer: {}
+                  }
+                }
+              }
+            }
+          ],
+          type: "javascript/auto"
+        },
+        {
+          test: /\.(png|jpe?g|gif)$/i,
+          type: "asset"
+        },
+        {
+          test: /\.svg$/i,
+          issuer: /\.[jt]sx?$/,
+          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[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "ecmascript",
+                jsx: true
+              },
+              target: "es5"
+            }
+          }
+        },
+        {
+          test: /\.tsx$/,
+          exclude: /[\\/]node_modules[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript",
+                tsx: true
+              },
+              target: "es5"
+            }
+          }
         },
-        target: ["es2015", "edge88", "firefox78", "chrome87", "safari14"],
-        rollupOptions: {
-          cache: true,
-          external: [...Object.keys(globals), "react", "react/jsx-runtime"],
-          output: {
-            exports: "named",
-            globals: {
-              react: "React",
-              "react/jsx-runtime": "jsxRuntime",
-              ...globals
+        {
+          test: /\.ts$/,
+          exclude: /[\\/]node_modules[\\/]/,
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript"
+              },
+              target: "es5"
             }
           }
         }
-      },
-      plugins: [(0, import_plugin_react.default)(), (0, import_vite_plugin_css_injected_by_js.default)({ styleId: packageJson.name })]
-    })
-  );
-  (0, import_buildPluginUtils.checkFileSize)(outDir, log);
+      ]
+    },
+    plugins: [
+      new import_core.rspack.DefinePlugin({
+        "process.env.NODE_ENV": JSON.stringify("production")
+      }),
+      process.env.BUILD_ANALYZE === "true" && new import_rspack_plugin.RsdoctorRspackPlugin({
+        // plugin options
+        // supports: {
+        //   generateTileGraph: true,
+        // },
+        mode: "brief"
+      })
+    ].filter(Boolean),
+    node: {
+      global: true
+    },
+    externals: {
+      react: "React",
+      lodash: "lodash",
+      // 'react/jsx-runtime': 'jsxRuntime',
+      ...globals
+    },
+    stats: "errors-warnings"
+  });
+  return new Promise((resolve, reject) => {
+    compiler.run((err, stats) => {
+      const compilationErrors = stats?.compilation.errors;
+      const infos = stats.toString({
+        colors: true
+      });
+      if (err || compilationErrors?.length) {
+        reject(err || infos);
+        return;
+      }
+      console.log(infos);
+      resolve(null);
+    });
+  });
 }
 async function buildPlugin(cwd, userConfig, sourcemap, log) {
   await buildPluginClient(cwd, userConfig, sourcemap, log);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.5.0-beta.2",
+  "version": "1.5.0-beta.4",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -9,29 +9,35 @@
   },
   "typings": "./index.d.ts",
   "dependencies": {
-    "@babel/core": "7.25.2",
+    "@babel/core": "^7.26.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-modules-amd": "7.24.7",
-    "@babel/preset-env": "7.25.4",
+    "@babel/preset-env": "^7.26.0",
     "@hapi/topo": "^6.0.0",
     "@lerna/project": "4.0.0",
-    "@rspack/core": "1.0.14",
+    "@rsbuild/plugin-babel": "^1.0.3",
+    "@rsdoctor/rspack-plugin": "^0.4.8",
+    "@rspack/core": "1.1.1",
     "@svgr/webpack": "^8.1.0",
     "@types/gulp": "^4.0.13",
     "@types/lerna__package": "5.1.0",
     "@types/lerna__project": "5.1.0",
     "@types/tar": "^6.1.5",
     "@vercel/ncc": "0.36.1",
+    "babel-loader": "^9.2.1",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "chalk": "2.4.2",
     "css-loader": "^6.8.1",
     "esbuild-register": "^3.4.2",
     "fast-glob": "^3.3.1",
     "gulp": "4.0.2",
     "gulp-typescript": "6.0.0-alpha.1",
-    "less": "^4.1.3",
-    "less-loader": "11.1.0",
+    "less": "^4.2.0",
+    "less-loader": "^12.2.0",
     "postcss": "^8.4.29",
     "postcss-loader": "^7.3.3",
     "postcss-preset-env": "^9.1.2",
+    "react-imported-component": "^6.5.4",
     "style-loader": "^3.3.3",
     "tar": "^6.2.0",
     "tsup": "8.2.4",
@@ -45,5 +51,5 @@
   "scripts": {
     "build": "tsup"
   },
-  "gitHead": "8a9c29fdac5c6295dcc7abf00c3fa81bd9e01a36"
+  "gitHead": "f5ca1548fe8d8eda32699137434306c44a5df84c"
 }