@nocobase/build 0.20.0-alpha.9 → 0.21.0-alpha.2

package/lib/build.js

@@ -43,10 +43,16 @@ var import_buildDeclaration = require("./buildDeclaration");
 var import_utils = require("./utils");
 var import_getPackages = require("./utils/getPackages");
 var import_tarPlugin = require("./tarPlugin");
+var import_buildEsm = require("./buildEsm");
+const BUILD_ERROR = "build-error";
 async function build(pkgs) {
   const isDev = process.argv.includes("--development");
   process.env.NODE_ENV = isDev ? "development" : "production";
-  const packages = (0, import_getPackages.getPackages)(pkgs);
+  let packages = (0, import_getPackages.getPackages)(pkgs);
+  const cachePkg = (0, import_utils.readFromCache)(BUILD_ERROR);
+  if (process.argv.includes("--retry") && cachePkg?.pkg) {
+    packages = packages.slice(packages.findIndex((item) => item.name === cachePkg.pkg));
+  }
   if (packages.length === 0) {
     let msg = "";
     if (pkgs.length) {
@@ -65,6 +71,8 @@ async function build(pkgs) {
   if (clientCore) {
     await buildPackage(clientCore, "es", import_buildClient.buildClient);
   }
+  const esmPackages = cjsPackages.filter((pkg) => import_constant.ESM_PACKAGES.includes(pkg.name));
+  await buildPackages(esmPackages, "es", import_buildEsm.buildEsm);
   await buildPackages(pluginPackages, "dist", import_buildPlugin.buildPlugin);
   await buildPackages(presetsPackages, "lib", import_buildCjs.buildCjs);
   const appClient = packages.find((item) => item.location === import_constant.CORE_APP);
@@ -73,9 +81,11 @@ async function build(pkgs) {
       APP_ROOT: import_path.default.join(import_constant.CORE_APP, "client")
     });
   }
+  (0, import_utils.writeToCache)(BUILD_ERROR, {});
 }
 async function buildPackages(packages, targetDir, doBuildPackage) {
   for await (const pkg of packages) {
+    (0, import_utils.writeToCache)(BUILD_ERROR, { pkg: pkg.name });
     await buildPackage(pkg, targetDir, doBuildPackage);
   }
 }

package/lib/buildClient.js

@@ -28,8 +28,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var buildClient_exports = {};
 __export(buildClient_exports, {
   buildClient: () => buildClient,
-  buildEsm: () => buildEsm,
-  buildLib: () => buildLib,
   buildLocale: () => buildLocale
 });
 module.exports = __toCommonJS(buildClient_exports);
@@ -51,11 +49,11 @@ async function buildClient(cwd, userConfig, sourcemap = false, log) {
     }
     return true;
   };
-  await buildEsm(cwd, userConfig, sourcemap, external, log);
-  await buildLib(cwd, userConfig, sourcemap, external, log);
+  await buildClientEsm(cwd, userConfig, sourcemap, external, log);
+  await buildClientLib(cwd, userConfig, sourcemap, external, log);
   await buildLocale(cwd, userConfig, log);
 }
-function buildEsm(cwd, userConfig, sourcemap, external, log) {
+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");
@@ -89,7 +87,7 @@ function buildEsm(cwd, userConfig, sourcemap, external, log) {
     })
   );
 }
-async function buildLib(cwd, userConfig, sourcemap, external, log) {
+async function buildClientLib(cwd, userConfig, sourcemap, external, log) {
   log("build client lib");
   const outDir = import_path.default.resolve(cwd, "lib");
   const esDir = import_path.default.resolve(cwd, "es");
@@ -146,7 +144,5 @@ function buildLocale(cwd, userConfig, log) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildClient,
-  buildEsm,
-  buildLib,
   buildLocale
 });

package/lib/buildEsm.js

@@ -0,0 +1,94 @@
+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 buildEsm_exports = {};
+__export(buildEsm_exports, {
+  buildEsm: () => buildEsm
+});
+module.exports = __toCommonJS(buildEsm_exports);
+var import_path = __toESM(require("path"));
+var import_vite = require("vite");
+var import_fast_glob = __toESM(require("fast-glob"));
+async function buildEsm(cwd, userConfig, sourcemap = false, log) {
+  log("build esm");
+  const indexEntry = import_path.default.join(cwd, "src/index.ts").replaceAll(/\\/g, "/");
+  const outDir = import_path.default.resolve(cwd, "es");
+  await build(cwd, indexEntry, outDir, userConfig, sourcemap, log);
+  const clientEntry = import_fast_glob.default.sync(["src/client/index.ts", "src/client.ts"], { cwd, absolute: true, onlyFiles: true })?.[0]?.replaceAll(/\\/g, "/");
+  const clientOutDir = import_path.default.resolve(cwd, "es/client");
+  if (clientEntry) {
+    await build(cwd, clientEntry, clientOutDir, userConfig, sourcemap, log);
+  }
+  const pkg = require(import_path.default.join(cwd, "package.json"));
+  if (pkg.name === "@nocobase/test") {
+    const e2eEntry = import_path.default.join(cwd, "src/e2e/index.ts").replaceAll(/\\/g, "/");
+    const e2eOutDir = import_path.default.resolve(cwd, "es/e2e");
+    await build(cwd, e2eEntry, e2eOutDir, userConfig, sourcemap, log);
+  }
+}
+function build(cwd, entry, outDir, 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)) {
+      return false;
+    }
+    return true;
+  };
+  return (0, import_vite.build)(
+    userConfig.modifyViteConfig({
+      mode: process.env.NODE_ENV || "production",
+      define: {
+        "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV || "production"),
+        "process.env.__TEST__": false,
+        "process.env.__E2E__": process.env.__E2E__ ? true : false
+      },
+      build: {
+        minify: false,
+        outDir,
+        cssCodeSplit: true,
+        emptyOutDir: true,
+        sourcemap,
+        lib: {
+          entry,
+          formats: ["es"],
+          fileName: "index"
+        },
+        target: ["node16"],
+        rollupOptions: {
+          cache: true,
+          treeshake: true,
+          external
+        }
+      }
+    })
+  );
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildEsm
+});

package/lib/buildPlugin.js

@@ -60,6 +60,7 @@ const external = [
   "@nocobase/cache",
   "@nocobase/client",
   "@nocobase/database",
+  "@nocobase/data-source-manager",
   "@nocobase/evaluators",
   "@nocobase/logger",
   "@nocobase/resourcer",

package/lib/constant.js

@@ -30,7 +30,9 @@ __export(constant_exports, {
   CJS_EXCLUDE_PACKAGES: () => CJS_EXCLUDE_PACKAGES,
   CORE_APP: () => CORE_APP,
   CORE_CLIENT: () => CORE_CLIENT,
+  ESM_PACKAGES: () => ESM_PACKAGES,
   EsbuildSupportExts: () => EsbuildSupportExts,
+  NODE_MODULES: () => NODE_MODULES,
   PACKAGES_PATH: () => PACKAGES_PATH,
   PLUGINS_DIR: () => PLUGINS_DIR,
   PRESETS_DIR: () => PRESETS_DIR,
@@ -69,6 +71,7 @@ const EsbuildSupportExts = [
   ".data"
 ];
 const ROOT_PATH = import_path.default.join(__dirname, "../../../../");
+const NODE_MODULES = import_path.default.join(ROOT_PATH, "node_modules");
 const PACKAGES_PATH = import_path.default.join(ROOT_PATH, "packages");
 const PLUGINS_DIR = ["plugins", "samples", "pro-plugins"].concat((process.env.PLUGINS_DIRS || "").split(",")).filter(Boolean).map((name) => import_path.default.join(PACKAGES_PATH, name));
 const PRESETS_DIR = import_path.default.join(PACKAGES_PATH, "presets");
@@ -76,20 +79,23 @@ 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 ESM_PACKAGES = ["@nocobase/test"];
 const CJS_EXCLUDE_PACKAGES = [
   import_path.default.join(PACKAGES_PATH, "core/build"),
   import_path.default.join(PACKAGES_PATH, "core/cli"),
   CORE_CLIENT
 ];
 const getCjsPackages = (packages) => packages.filter((item) => !PLUGINS_DIR.some((dir) => item.location.startsWith(dir))).filter((item) => !item.location.startsWith(PRESETS_DIR)).filter((item) => !CJS_EXCLUDE_PACKAGES.includes(item.location));
-const tarIncludesFiles = ["package.json", "README.md", "LICENSE", "dist", "!node_modules", "!src"];
+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");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CJS_EXCLUDE_PACKAGES,
   CORE_APP,
   CORE_CLIENT,
+  ESM_PACKAGES,
   EsbuildSupportExts,
+  NODE_MODULES,
   PACKAGES_PATH,
   PLUGINS_DIR,
   PRESETS_DIR,

package/lib/tarPlugin.js

@@ -41,7 +41,7 @@ function tarPlugin(cwd, log) {
   const npmIgnore = import_path.default.join(cwd, ".npmignore");
   let files = pkg.files || [];
   if (import_fs_extra.default.existsSync(npmIgnore)) {
-    files = import_fs_extra.default.readFileSync(npmIgnore, "utf-8").split("\n").filter((item) => item.trim()).map((item) => `!${item}`);
+    files = import_fs_extra.default.readFileSync(npmIgnore, "utf-8").split("\n").filter((item) => item.trim()).map((item) => item.startsWith("/") ? `.${item}` : item).map((item) => `!${item}`);
     files.push("**/*");
   }
   files.push(...import_constant.tarIncludesFiles);

package/lib/utils/getPackages.js

@@ -55,7 +55,9 @@ function getPackagesPath(pkgs) {
   const relativePaths = pkgNames.length ? pkgs.filter((item) => !pkgNames.includes(item)) : pkgs;
   const pkgPaths = pkgs.map((item) => allPackageInfo[item]);
   const absPaths = allPackagePaths.filter((absPath) => relativePaths.some((relativePath) => absPath.endsWith(relativePath)));
-  return [...pkgPaths, ...absPaths];
+  const dirPaths = import_fast_glob.default.sync(pkgs, { onlyDirectories: true, absolute: true, cwd: import_constant.ROOT_PATH });
+  const dirMatchPaths = allPackagePaths.filter((pkgPath) => dirPaths.some((dirPath) => pkgPath.startsWith(dirPath)));
+  return [.../* @__PURE__ */ new Set([...pkgPaths, ...absPaths, ...dirMatchPaths])];
 }
 function getPackages(pkgs) {
   const packagePaths = getPackagesPath(pkgs);

package/lib/utils/utils.js

@@ -31,13 +31,17 @@ __export(utils_exports, {
   getPackageJson: () => getPackageJson,
   getPkgLog: () => getPkgLog,
   getUserConfig: () => getUserConfig,
-  toUnixPath: () => toUnixPath
+  readFromCache: () => readFromCache,
+  toUnixPath: () => toUnixPath,
+  writeToCache: () => writeToCache
 });
 module.exports = __toCommonJS(utils_exports);
 var import_chalk = __toESM(require("chalk"));
 var import_path = __toESM(require("path"));
 var import_fast_glob = __toESM(require("fast-glob"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_node = require("esbuild-register/dist/node");
+var import_constant = require("../constant");
 let previousColor = "";
 function randomColor() {
   const colors = [
@@ -95,11 +99,26 @@ function getUserConfig(cwd) {
   }
   return config;
 }
+const CACHE_DIR = import_path.default.join(import_constant.NODE_MODULES, ".cache", "nocobase");
+function writeToCache(key, data) {
+  const cachePath = import_path.default.join(CACHE_DIR, `${key}.json`);
+  import_fs_extra.default.ensureDirSync(import_path.default.dirname(cachePath));
+  import_fs_extra.default.writeJsonSync(cachePath, data, { spaces: 2 });
+}
+function readFromCache(key) {
+  const cachePath = import_path.default.join(CACHE_DIR, `${key}.json`);
+  if (import_fs_extra.default.existsSync(cachePath)) {
+    return import_fs_extra.default.readJsonSync(cachePath);
+  }
+  return {};
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defineConfig,
   getPackageJson,
   getPkgLog,
   getUserConfig,
-  toUnixPath
+  readFromCache,
+  toUnixPath,
+  writeToCache
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "0.20.0-alpha.9",
+  "version": "0.21.0-alpha.2",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -36,5 +36,5 @@
   "scripts": {
     "build": "tsup"
   },
-  "gitHead": "5473d9039cfdb649a8c8c625edefc9a3ac464be5"
+  "gitHead": "90628f2e2da846208fb2d7966ddb4e467d187ffb"
 }