@nocobase/build 2.0.22 → 2.1.0-alpha.10

package/lib/buildPlugin.js

@@ -51,6 +51,7 @@ var import_utils = require("./utils");
 var import_buildPluginUtils = require("./utils/buildPluginUtils");
 var import_getDepsConfig = require("./utils/getDepsConfig");
 var import_obfuscationResult = require("./utils/obfuscationResult");
+var import_injectPublicPathPlugin = require("./injectPublicPathPlugin");
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
 const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
 const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
@@ -672,27 +673,7 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
         "process.env.NODE_ENV": JSON.stringify("production"),
         "process.env.NODE_DEBUG": false
       }),
-      {
-        apply(compiler2) {
-          compiler2.hooks.compilation.tap("CustomPublicPathPlugin", (compilation) => {
-            compilation.hooks.runtimeModule.tap("CustomPublicPathPlugin", (module2) => {
-              if (module2.name === "auto_public_path") {
-                module2.source = {
-                  source: `
-__webpack_require__.p = (function() {
-  var publicPath = window['__webpack_public_path__'] || '/';
-  // \u786E\u4FDD\u8DEF\u5F84\u4EE5 / \u7ED3\u5C3E
-  if (!publicPath.endsWith('/')) {
-    publicPath += '/';
-  }
-  return publicPath + 'static/plugins/${packageJson.name}/dist/client/';
-})();`
-                };
-              }
-            });
-          });
-        }
-      },
+      new import_injectPublicPathPlugin.AutoInjectPublicPathPlugin(packageJson.name),
       process.env.BUILD_ANALYZE === "true" && new import_rspack_plugin.RsdoctorRspackPlugin({
         // plugin options
         // supports: {

package/lib/constant.js

@@ -30,6 +30,7 @@ __export(constant_exports, {
   CJS_EXCLUDE_PACKAGES: () => CJS_EXCLUDE_PACKAGES,
   CORE_APP: () => CORE_APP,
   CORE_CLIENT: () => CORE_CLIENT,
+  CORE_CLIENT_V2: () => CORE_CLIENT_V2,
   ESM_PACKAGES: () => ESM_PACKAGES,
   EsbuildSupportExts: () => EsbuildSupportExts,
   NODE_MODULES: () => NODE_MODULES,
@@ -90,11 +91,13 @@ 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 CORE_CLIENT_V2 = import_path.default.join(PACKAGES_PATH, "core/client-v2");
+const ESM_PACKAGES = ["@nocobase/client-v2", "@nocobase/test"];
 const CJS_EXCLUDE_PACKAGES = [
   import_path.default.join(PACKAGES_PATH, "core/build"),
   import_path.default.join(PACKAGES_PATH, "core/cli"),
-  CORE_CLIENT
+  CORE_CLIENT,
+  CORE_CLIENT_V2
 ];
 const getCjsPackages = (packages) => packages.filter((item) => !PLUGINS_DIR.some((dir) => item.location.startsWith(dir))).filter((item) => !item.location.startsWith(PRESETS_DIR)).filter((item) => !ESM_PACKAGES.includes(item.name)).filter((item) => !CJS_EXCLUDE_PACKAGES.includes(item.location));
 const tarIncludesFiles = ["package.json", "README.md", "LICENSE", "dist", "!node_modules"];
@@ -104,6 +107,7 @@ const TAR_OUTPUT_DIR = process.env.TAR_PATH ? process.env.TAR_PATH : import_path
   CJS_EXCLUDE_PACKAGES,
   CORE_APP,
   CORE_CLIENT,
+  CORE_CLIENT_V2,
   ESM_PACKAGES,
   EsbuildSupportExts,
   NODE_MODULES,

package/lib/injectPublicPathPlugin.js

@@ -0,0 +1,68 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var injectPublicPathPlugin_exports = {};
+__export(injectPublicPathPlugin_exports, {
+  AutoInjectPublicPathPlugin: () => AutoInjectPublicPathPlugin
+});
+module.exports = __toCommonJS(injectPublicPathPlugin_exports);
+function createPluginClientPublicPathDataUri(packageName) {
+  const code = `
+var publicPath = window['__webpack_public_path__'] || '/';
+if (publicPath.charAt(publicPath.length - 1) !== '/') {
+  publicPath += '/';
+}
+__webpack_public_path__ = publicPath + 'static/plugins/${packageName}/dist/client/';
+`;
+  return `data:text/javascript,${encodeURIComponent(code)}`;
+}
+function prependPluginClientPublicPathEntry(entry, packageName) {
+  const dataUri = createPluginClientPublicPathDataUri(packageName);
+  if (typeof entry === "string") {
+    return [dataUri, entry];
+  }
+  if (Array.isArray(entry)) {
+    return [dataUri, ...entry];
+  }
+  if (!entry || typeof entry !== "object") {
+    return entry;
+  }
+  const entryConfig = entry;
+  if (entryConfig.import) {
+    return {
+      ...entryConfig,
+      import: Array.isArray(entryConfig.import) ? [dataUri, ...entryConfig.import] : [dataUri, entryConfig.import]
+    };
+  }
+  return Object.fromEntries(
+    Object.entries(entryConfig).map(([name, value]) => [name, prependPluginClientPublicPathEntry(value, packageName)])
+  );
+}
+class AutoInjectPublicPathPlugin {
+  constructor(pluginName) {
+    this.pluginName = pluginName;
+  }
+  apply(compiler) {
+    compiler.hooks.environment.tap("AutoInjectPublicPathPlugin", () => {
+      compiler.options.entry = prependPluginClientPublicPathEntry(compiler.options.entry, this.pluginName);
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AutoInjectPublicPathPlugin
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.0.22",
+  "version": "2.1.0-alpha.10",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -17,7 +17,7 @@
     "@lerna/project": "4.0.0",
     "@rsbuild/plugin-babel": "^1.0.3",
     "@rsdoctor/rspack-plugin": "^0.4.8",
-    "@rspack/core": "1.3.2",
+    "@rspack/core": "1.7.8",
     "@svgr/webpack": "^8.1.0",
     "@types/lerna__package": "5.1.0",
     "@types/lerna__project": "5.1.0",
@@ -51,5 +51,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "7b703580c4bb60f1e5e44c8fd685141bb8b3a47c"
+  "gitHead": "ce790d46c0a5768ca9618c7d0d77ab8300de75c8"
 }