@nocobase/build 2.1.0-beta.30 → 2.1.0-beta.33

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,6 +46,7 @@ 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");
@@ -160,7 +160,6 @@ const external = [
   "ahooks",
   "lodash",
   "china-division",
-  "file-saver",
   // langChain
   "langchain",
   "@langchain/core",
@@ -249,36 +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
-  });
-  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`) || item.endsWith(`/client-v2`)) {
-      return;
-    }
-    if (item.endsWith(`${import_path.default.sep}client`) || item.endsWith(`/client`)) {
-      return;
-    }
-    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"));
@@ -380,7 +349,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,
@@ -415,7 +384,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"),
@@ -535,10 +504,11 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, lane = "client
   }
   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: lane, files: clientFiles, log });
   const outDir = import_path.default.join(cwd, target_dir, laneConfig.distDir);
-  const globals = excludePackages.reduce((prev, curr) => {
+  const globals = browserExternalPackages.reduce((prev, curr) => {
     if (curr.startsWith("@nocobase")) {
       laneConfig.externalSubpaths.forEach((subpath) => {
         prev[`${curr}/${subpath}`] = `${curr}/${subpath}`;
@@ -562,7 +532,7 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, lane = "client
       // 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
       }
@@ -767,6 +737,5 @@ async function buildPlugin(cwd, userConfig, sourcemap, log) {
   buildPluginServer,
   buildProPluginServer,
   buildServerDeps,
-  deleteServerFiles,
   writeExternalPackageVersion
 });

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.1.0-beta.30",
+  "version": "2.1.0-beta.33",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -53,5 +53,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "1a493069cd0d8a4f403668bfe592879678c894b2"
+  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
 }