@nocobase/build 2.0.0-alpha.9 → 2.0.0-beta.2

package/lib/build.js

@@ -32,19 +32,19 @@ __export(build_exports, {
   buildPackages: () => buildPackages
 });
 module.exports = __toCommonJS(build_exports);
-var import_execa = __toESM(require("execa"));
 var import_chalk = __toESM(require("chalk"));
+var import_execa = __toESM(require("execa"));
 var import_path = __toESM(require("path"));
-var import_constant = require("./constant");
-var import_buildClient = require("./buildClient");
 var import_buildCjs = require("./buildCjs");
-var import_buildPlugin = require("./buildPlugin");
+var import_buildClient = require("./buildClient");
 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");
+var import_buildPlugin = require("./buildPlugin");
+var import_constant = require("./constant");
+var import_tarPlugin = require("./tarPlugin");
+var import_utils = require("./utils");
 var import_addlicense = require("./utils/addlicense");
+var import_getPackages = require("./utils/getPackages");
 const BUILD_ERROR = "build-error";
 async function build(pkgs) {
   const isDev = process.argv.includes("--development");

package/lib/buildClient.js

@@ -134,7 +134,8 @@ function buildLocale(cwd, userConfig, log) {
       keepNames: true,
       outDir,
       format: "cjs",
-      skipNodeModulesBundle: true
+      skipNodeModulesBundle: true,
+      loader: { ".json": "copy" }
     })
   );
 }

package/lib/buildPlugin.js

@@ -36,21 +36,21 @@ __export(buildPlugin_exports, {
   writeExternalPackageVersion: () => writeExternalPackageVersion
 });
 module.exports = __toCommonJS(buildPlugin_exports);
+var import_rspack_plugin = require("@rsdoctor/rspack-plugin");
 var import_core = require("@rspack/core");
 var import_ncc = __toESM(require("@vercel/ncc"));
+var bundleRequire = __toESM(require("bundle-require"));
 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 bundleRequire = __toESM(require("bundle-require"));
 var import_constant = require("./constant");
+var import_pluginEsbuildCommercialInject = __toESM(require("./plugins/pluginEsbuildCommercialInject"));
 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");
 var import_obfuscationResult = require("./utils/obfuscationResult");
-var import_pluginEsbuildCommercialInject = __toESM(require("./plugins/pluginEsbuildCommercialInject"));
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
 const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
 const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
@@ -79,6 +79,8 @@ const external = [
   "@nocobase/utils",
   "@nocobase/license-kit",
   "@nocobase/flow-engine",
+  "@nocobase/client-v2",
+  "@nocobase/shared",
   // @nocobase/auth
   "jsonwebtoken",
   // @nocobase/cache
@@ -337,7 +339,11 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
   };
   if (!cwd.includes(import_constant.PLUGIN_COMMERCIAL)) {
     externalOptions.external = [/^[./]/];
-    externalOptions.noExternal = [entryFile, /@nocobase\/plugin-commercial\/server/, /dist\/server\/index\.js/];
+    externalOptions.noExternal = [
+      entryFile,
+      /@nocobase\/plugin-commercial\/server/,
+      /dist\/server\/index\.js/
+    ];
     externalOptions.onSuccess = async () => {
       const serverFiles2 = [import_path.default.join(cwd, target_dir, "server", "index.js")];
       serverFiles2.forEach((file) => {
@@ -346,6 +352,9 @@ async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
     };
     externalOptions.esbuildPlugins = [import_pluginEsbuildCommercialInject.default];
   }
+  if (cwd.includes(import_constant.PLUGIN_COMMERCIAL)) {
+    externalOptions.noExternal = [/@nocobase\/plugin-license/, /dist\/server\/index\.js/];
+  }
   await (0, import_tsup.build)(
     userConfig.modifyTsupConfig({
       entry: [entryFile],

package/lib/constant.js

@@ -36,6 +36,7 @@ __export(constant_exports, {
   PACKAGES_PATH: () => PACKAGES_PATH,
   PLUGINS_DIR: () => PLUGINS_DIR,
   PLUGIN_COMMERCIAL: () => PLUGIN_COMMERCIAL,
+  PLUGIN_LICENSE: () => PLUGIN_LICENSE,
   PRESETS_DIR: () => PRESETS_DIR,
   ROOT_PATH: () => ROOT_PATH,
   TAR_OUTPUT_DIR: () => TAR_OUTPUT_DIR,
@@ -78,8 +79,13 @@ 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");
 const PLUGIN_COMMERCIAL = "@nocobase/plugin-commercial";
+const PLUGIN_LICENSE = "@nocobase/plugin-license";
 const getPluginPackages = (packages) => packages.filter((item) => PLUGINS_DIR.some((pluginDir) => item.location.startsWith(pluginDir))).sort((a, b) => {
-  return a.name === PLUGIN_COMMERCIAL ? -1 : 1;
+  const priority = {
+    [PLUGIN_LICENSE]: 0,
+    [PLUGIN_COMMERCIAL]: 1
+  };
+  return (priority[a.name] ?? 99) - (priority[b.name] ?? 99);
 });
 const getPresetsPackages = (packages) => packages.filter((item) => item.location.startsWith(PRESETS_DIR));
 const CORE_APP = import_path.default.join(PACKAGES_PATH, "core/app");
@@ -104,6 +110,7 @@ const TAR_OUTPUT_DIR = process.env.TAR_PATH ? process.env.TAR_PATH : import_path
   PACKAGES_PATH,
   PLUGINS_DIR,
   PLUGIN_COMMERCIAL,
+  PLUGIN_LICENSE,
   PRESETS_DIR,
   ROOT_PATH,
   TAR_OUTPUT_DIR,

package/lib/utils/getPackages.js

@@ -32,10 +32,10 @@ __export(getPackages_exports, {
 });
 module.exports = __toCommonJS(getPackages_exports);
 var import_topo = __toESM(require("@hapi/topo"));
+var import_project = require("@lerna/project");
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_path = __toESM(require("path"));
 var import_constant = require("../constant");
-var import_project = require("@lerna/project");
 var import_utils = require("./utils");
 function getPackagesPath(pkgs) {
   const allPackageJson = import_fast_glob.default.sync(["*/*/package.json", "*/*/*/package.json"], {
@@ -67,6 +67,9 @@ function getPackages(pkgs) {
 function sortPackages(packages) {
   const sorter = new import_topo.default.Sorter();
   for (const pkg of packages) {
+    if (pkg.name === "@nocobase/docs") {
+      continue;
+    }
     const pkgJson = require(`${pkg.location}/package.json`);
     const after = Object.keys({ ...pkgJson.dependencies, ...pkgJson.devDependencies, ...pkgJson.peerDependencies });
     sorter.add(pkg, { after, group: pkg.name });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.0.0-alpha.9",
+  "version": "2.0.0-beta.2",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -54,5 +54,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "4a9acf96f21a3aa35bccbd188b942595b09da0a9"
+  "gitHead": "b77a33ee933ae6e09d2d5dce017ca15d8552d57b"
 }