@nocobase/build 1.9.25 → 1.9.26

package/lib/buildPlugin.js

@@ -336,7 +336,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) => {
@@ -345,6 +349,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.9.25",
+  "version": "1.9.26",
   "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": "263145e2a39b6c3a636168c0bb574c9f44af8398"
+  "gitHead": "794e25d4aca20fbc68769ad7b1266860bd45ac5c"
 }