@nocobase/build 1.5.0-alpha.5 → 1.5.0-beta.1

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,134 +67,30 @@ function build(cwd, entry, outDir, userConfig, sourcemap = false, log) {
     }
     return true;
   };
-  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"
+  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"
         },
-        {
-          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);
+        target: ["node16"],
+        rollupOptions: {
+          cache: true,
+          treeshake: true,
+          external
         }
-        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,13 +35,15 @@ __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");
@@ -60,10 +62,8 @@ 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,8 +133,7 @@ const external = [
   "@emotion/css",
   "ahooks",
   "lodash",
-  "china-division",
-  "file-saver"
+  "china-division"
 ];
 const pluginPrefix = (process.env.PLUGIN_PACKAGE_PREFIX || "@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-").split(",");
 const target_dir = "dist";
@@ -188,9 +187,7 @@ 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/others/deps")}.`
-  );
+  tips.push(`For more information, please refer to: ${import_chalk.default.blue("https://docs.nocobase.com/development/deps")}.`);
   log(tips.join(" "));
   if (!includePackages.length) return;
   const deps = (0, import_getDepsConfig.getDepsConfig)(cwd, outDir, includePackages, external);
@@ -290,164 +287,48 @@ 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}/client`;
+      prev[`${curr}/client`] = curr;
     }
     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 entry = import_fast_glob.default.globSync("src/client/index.{ts,tsx,js,jsx}", { absolute: true, cwd });
   const outputFileName = "index.js";
-  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,
-      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: /\.jsx$/,
-          exclude: /[\\/]node_modules[\\/]/,
-          loader: "builtin:swc-loader",
-          options: {
-            sourceMap: true,
-            jsc: {
-              parser: {
-                syntax: "ecmascript",
-                jsx: true
-              },
-              target: "es5"
-            }
-          }
+  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
         },
-        {
-          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"
+        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
             }
           }
         }
-      ]
-    },
-    plugins: [
-      new import_core.rspack.DefinePlugin({
-        "process.env.NODE_ENV": JSON.stringify("production")
-      })
-    ],
-    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);
-    });
-  });
+      },
+      plugins: [(0, import_plugin_react.default)(), (0, import_vite_plugin_css_injected_by_js.default)({ styleId: packageJson.name })]
+    })
+  );
+  (0, import_buildPluginUtils.checkFileSize)(outDir, log);
 }
 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-alpha.5",
+  "version": "1.5.0-beta.1",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -45,5 +45,5 @@
   "scripts": {
     "build": "tsup"
   },
-  "gitHead": "8d24e8d2c0f3f57ceaa271438fd93db2b4150011"
+  "gitHead": "10c6f1f3d90e91f3aabfa80449c7ef062e90f6af"
 }