@nocobase/build 2.1.0-alpha.4 → 2.1.0-alpha.40

package/lib/injectPublicPathPlugin.js

@@ -0,0 +1,109 @@
+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, clientDistDir) {
+  const code = `
+var publicPath = '';
+var currentScript = typeof document !== 'undefined' ? document.currentScript : null;
+if (currentScript && currentScript.src) {
+  publicPath = currentScript.src
+    .replace(/^blob:/, '')
+    .replace(/#.*$/, '')
+    .replace(/\\?.*$/, '')
+    .replace(/\\/[^\\/]+$/, '/');
+}
+if (!publicPath) {
+  var runtimeAssetBase = window['__webpack_public_path__'] || '';
+  if (runtimeAssetBase) {
+    if (runtimeAssetBase.charAt(runtimeAssetBase.length - 1) !== '/') {
+      runtimeAssetBase += '/';
+    }
+    publicPath = runtimeAssetBase + 'static/plugins/${packageName}/dist/${clientDistDir}/';
+  }
+}
+if (!publicPath) {
+  publicPath = window['__nocobase_public_path__'] || '';
+  if (!publicPath && window.location && window.location.pathname) {
+    var marker = '/v2/';
+    var pathname = window.location.pathname || '/';
+    var index = pathname.indexOf(marker);
+    publicPath = index >= 0 ? pathname.slice(0, index + 1) : '/';
+  }
+  if (publicPath) {
+    publicPath = publicPath.replace(/\\/v2\\/?$/, '/');
+  }
+  if (!publicPath) {
+    publicPath = '/';
+  }
+  if (publicPath.charAt(publicPath.length - 1) !== '/') {
+    publicPath += '/';
+  }
+  publicPath += 'static/plugins/${packageName}/dist/${clientDistDir}/';
+}
+__webpack_public_path__ = publicPath;
+`;
+  return `data:text/javascript,${encodeURIComponent(code)}`;
+}
+function prependPluginClientPublicPathEntry(entry, packageName, clientDistDir) {
+  const dataUri = createPluginClientPublicPathDataUri(packageName, clientDistDir);
+  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, clientDistDir)
+    ])
+  );
+}
+class AutoInjectPublicPathPlugin {
+  constructor(pluginName, clientDistDir = "client") {
+    this.pluginName = pluginName;
+    this.clientDistDir = clientDistDir;
+  }
+  apply(compiler) {
+    compiler.hooks.environment.tap("AutoInjectPublicPathPlugin", () => {
+      compiler.options.entry = prependPluginClientPublicPathEntry(
+        compiler.options.entry,
+        this.pluginName,
+        this.clientDistDir
+      );
+    });
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AutoInjectPublicPathPlugin
+});

package/lib/utils/buildPluginUtils.js

@@ -39,6 +39,7 @@ __export(buildPluginUtils_exports, {
   getPackageJsonPackages: () => getPackageJsonPackages,
   getPackageNameFromString: () => getPackageNameFromString,
   getPackagesFromFiles: () => getPackagesFromFiles,
+  getPluginBrowserSourcePackages: () => getPluginBrowserSourcePackages,
   getSourcePackages: () => getSourcePackages,
   isNotBuiltinModule: () => isNotBuiltinModule,
   isValidPackageName: () => isValidPackageName
@@ -46,6 +47,7 @@ __export(buildPluginUtils_exports, {
 module.exports = __toCommonJS(buildPluginUtils_exports);
 var import_fs = __toESM(require("fs"));
 var import_chalk = __toESM(require("chalk"));
+var import_fast_glob = __toESM(require("fast-glob"));
 var import_module = require("module");
 var import_path = __toESM(require("path"));
 const requireRegex = /require\s*\(['"`](.*?)['"`]\)/g;
@@ -54,7 +56,7 @@ function isNotBuiltinModule(packageName) {
   return !import_module.builtinModules.includes(packageName);
 }
 const isValidPackageName = (str) => {
-  const pattern = /^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$/;
+  const pattern = /^(?:@[a-zA-Z0-9._-]+\/)?[a-zA-Z0-9._-]+$/;
   return pattern.test(str);
 };
 function getPackageNameFromString(str) {
@@ -76,6 +78,16 @@ function getPackagesFromFiles(files) {
   ]).flat().map(getPackageNameFromString).filter(Boolean).filter(isNotBuiltinModule);
   return [...new Set(packageNames)];
 }
+function getPluginBrowserSourcePackages(cwds, excludeFiles) {
+  const files = cwds.flatMap(
+    (cwd) => import_fast_glob.default.globSync(["src/**/*.{ts,js,tsx,jsx,mjs}", "!src/server/**", ...excludeFiles], {
+      cwd,
+      absolute: true
+    })
+  );
+  const source = files.map((item) => import_fs.default.readFileSync(item, "utf-8"));
+  return getPackagesFromFiles(source);
+}
 function getSourcePackages(fileSources) {
   return getPackagesFromFiles(fileSources);
 }
@@ -163,6 +175,7 @@ function checkFileSize(outDir, log) {
   getPackageJsonPackages,
   getPackageNameFromString,
   getPackagesFromFiles,
+  getPluginBrowserSourcePackages,
   getSourcePackages,
   isNotBuiltinModule,
   isValidPackageName

package/lib/utils/getDepsConfig.js

@@ -33,6 +33,7 @@ __export(getDepsConfig_exports, {
   winPath: () => winPath
 });
 module.exports = __toCommonJS(getDepsConfig_exports);
+var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 function winPath(path2) {
   const isExtendedLengthPath = /^\\\\\?\\/.test(path2);
@@ -41,6 +42,9 @@ function winPath(path2) {
   }
   return path2.replace(/\\/g, "/");
 }
+function realpathSync(filePath) {
+  return import_fs.default.realpathSync.native?.(filePath) ?? import_fs.default.realpathSync(filePath);
+}
 function getRltExternalsFromDeps(depExternals, current) {
   return Object.entries(depExternals).reduce(
     (r, [dep, target]) => {
@@ -56,27 +60,27 @@ function getRltExternalsFromDeps(depExternals, current) {
 }
 function getDepPkgPath(dep, cwd) {
   try {
-    return require.resolve(`${dep}/package.json`, { paths: [cwd] });
+    return realpathSync(require.resolve(`${dep}/package.json`, { paths: [cwd] }));
   } catch {
     const mainFile = require.resolve(`${dep}`, { paths: cwd ? [cwd] : void 0 });
     const packageDir = mainFile.slice(0, mainFile.indexOf(dep.replace("/", import_path.default.sep)) + dep.length);
-    return import_path.default.join(packageDir, "package.json");
+    return realpathSync(import_path.default.join(packageDir, "package.json"));
   }
 }
 function getDepsConfig(cwd, outDir, depsName, external) {
   const pkgExternals = external.reduce((r, dep) => ({ ...r, [dep]: dep }), {});
   const depExternals = {};
   const deps = depsName.reduce((acc, packageName) => {
-    const depEntryPath = require.resolve(packageName, { paths: [cwd] });
+    const depEntryPath = realpathSync(require.resolve(packageName, { paths: [cwd] }));
     const depPkgPath = getDepPkgPath(packageName, cwd);
     const depPkg = require(depPkgPath);
     const depDir = import_path.default.dirname(depPkgPath);
     const outputDir = import_path.default.join(outDir, packageName);
-    const mainFile = import_path.default.join(outputDir, depEntryPath.replace(depDir, ""));
+    const mainFile = import_path.default.join(outputDir, import_path.default.relative(depDir, depEntryPath));
     acc[depEntryPath] = {
       nccConfig: {
         minify: true,
-        target: "es5",
+        target: "es2020",
         quiet: true,
         externals: {}
       },

package/lib/utils/getPackages.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var getPackages_exports = {};
 __export(getPackages_exports, {
   getPackages: () => getPackages,
+  groupPackagesByTopoLevel: () => groupPackagesByTopoLevel,
   sortPackages: () => sortPackages
 });
 module.exports = __toCommonJS(getPackages_exports);
@@ -76,8 +77,55 @@ function sortPackages(packages) {
   }
   return sorter.nodes;
 }
+function groupPackagesByTopoLevel(packages) {
+  const filteredPackages = packages.filter((pkg) => pkg.name !== "@nocobase/docs");
+  const packageMap = new Map(filteredPackages.map((pkg) => [pkg.name, pkg]));
+  const dependencyMap = /* @__PURE__ */ new Map();
+  const reverseDependencyMap = /* @__PURE__ */ new Map();
+  for (const pkg of filteredPackages) {
+    const pkgJson = require(`${pkg.location}/package.json`);
+    const internalDeps = Object.keys({
+      ...pkgJson.dependencies,
+      ...pkgJson.devDependencies,
+      ...pkgJson.peerDependencies
+    }).filter((dep) => packageMap.has(dep));
+    dependencyMap.set(pkg.name, new Set(internalDeps));
+    for (const dep of internalDeps) {
+      if (!reverseDependencyMap.has(dep)) {
+        reverseDependencyMap.set(dep, /* @__PURE__ */ new Set());
+      }
+      reverseDependencyMap.get(dep).add(pkg.name);
+    }
+  }
+  const remainingDeps = new Map(
+    Array.from(dependencyMap.entries()).map(([name, deps]) => [name, new Set(deps)])
+  );
+  const pending = new Set(filteredPackages.map((pkg) => pkg.name));
+  const layers = [];
+  while (pending.size > 0) {
+    const layer = Array.from(pending).filter((name) => (remainingDeps.get(name)?.size ?? 0) === 0).map((name) => packageMap.get(name)).filter(Boolean);
+    if (layer.length === 0) {
+      throw new Error(
+        `Unable to group packages by topo level, possible circular dependency among: ${Array.from(pending).join(", ")}`
+      );
+    }
+    layers.push(layer);
+    for (const pkg of layer) {
+      pending.delete(pkg.name);
+      const dependents = reverseDependencyMap.get(pkg.name);
+      if (!dependents) {
+        continue;
+      }
+      for (const dependent of dependents) {
+        remainingDeps.get(dependent)?.delete(pkg.name);
+      }
+    }
+  }
+  return layers;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getPackages,
+  groupPackagesByTopoLevel,
   sortPackages
 });

package/lib/utils/utils.js

@@ -27,17 +27,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  createBuildProfileCollector: () => createBuildProfileCollector,
   defineConfig: () => defineConfig,
+  formatDuration: () => formatDuration,
   getEnvDefine: () => getEnvDefine,
   getPackageJson: () => getPackageJson,
   getPkgLog: () => getPkgLog,
   getUserConfig: () => getUserConfig,
+  nowMs: () => nowMs,
+  printBuildProfile: () => printBuildProfile,
   readFromCache: () => readFromCache,
+  runProfiledStage: () => runProfiledStage,
+  runScript: () => runScript,
+  runWithConcurrency: () => runWithConcurrency,
   toUnixPath: () => toUnixPath,
   writeToCache: () => writeToCache
 });
 module.exports = __toCommonJS(utils_exports);
 var import_chalk = __toESM(require("chalk"));
+var import_execa = __toESM(require("execa"));
 var import_path = __toESM(require("path"));
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs_extra = __toESM(require("fs-extra"));
@@ -86,7 +94,7 @@ function defineConfig(config) {
 function getUserConfig(cwd) {
   const config = defineConfig({
     modifyTsupConfig: (config2) => config2,
-    modifyViteConfig: (config2) => config2
+    modifyRsbuildConfig: (config2) => config2
   });
   const buildConfigs = import_fast_glob.default.sync(["build.config.js", "build.config.ts"], { cwd });
   if (buildConfigs.length > 1) {
@@ -121,14 +129,128 @@ function getEnvDefine() {
     "process.env.APP_ENV": process.env.APP_ENV
   };
 }
+function createBuildProfileCollector() {
+  return {
+    stages: [],
+    layers: [],
+    packages: []
+  };
+}
+async function runProfiledStage(profile, stageName, task) {
+  const startedAt = nowMs();
+  await task();
+  if (profile) {
+    profile.stages.push({
+      name: stageName,
+      durationMs: nowMs() - startedAt
+    });
+  }
+}
+async function runWithConcurrency(items, concurrency, worker) {
+  const queue = [...items];
+  const workers = Array.from({ length: Math.min(concurrency, queue.length) }, async () => {
+    while (queue.length > 0) {
+      const item = queue.shift();
+      if (!item) {
+        return;
+      }
+      await worker(item);
+    }
+  });
+  await Promise.all(workers);
+}
+function printBuildProfile(profile, totalDurationMs) {
+  const phaseTotals = /* @__PURE__ */ new Map();
+  for (const pkg of profile.packages) {
+    for (const [phaseName, duration] of Object.entries(pkg.phases)) {
+      phaseTotals.set(phaseName, (phaseTotals.get(phaseName) || 0) + duration);
+    }
+  }
+  console.log(import_chalk.default.cyan(`[@nocobase/build:profile] total build time ${formatDuration(totalDurationMs)}`));
+  if (profile.stages.length > 0) {
+    console.log(import_chalk.default.cyan("[@nocobase/build:profile] stage totals"));
+    for (const stage of [...profile.stages].sort((a, b) => b.durationMs - a.durationMs)) {
+      console.log(import_chalk.default.gray(`  ${stage.name}: ${formatDuration(stage.durationMs)}`));
+    }
+  }
+  if (profile.layers.length > 0) {
+    console.log(import_chalk.default.cyan("[@nocobase/build:profile] slowest layers"));
+    for (const layer of [...profile.layers].sort((a, b) => b.durationMs - a.durationMs).slice(0, 12)) {
+      console.log(
+        import_chalk.default.gray(
+          `  ${layer.stageName} layer ${layer.layerIndex}/${layer.layerCount} (${layer.packageCount} packages): ${formatDuration(layer.durationMs)}`
+        )
+      );
+    }
+  }
+  if (phaseTotals.size > 0) {
+    console.log(import_chalk.default.cyan("[@nocobase/build:profile] aggregated package phases"));
+    for (const [phaseName, duration] of [...phaseTotals.entries()].sort((a, b) => b[1] - a[1])) {
+      console.log(import_chalk.default.gray(`  ${phaseName}: ${formatDuration(duration)}`));
+    }
+  }
+  if (profile.packages.length > 0) {
+    const sourcePackages = profile.packages.filter((pkg) => pkg.kind === "source");
+    const declarationPackages = profile.packages.filter((pkg) => pkg.kind === "declaration");
+    console.log(import_chalk.default.cyan("[@nocobase/build:profile] slowest source packages"));
+    for (const pkg of [...sourcePackages].sort((a, b) => b.durationMs - a.durationMs).slice(0, 20)) {
+      const summary = Object.entries(pkg.phases).sort((a, b) => b[1] - a[1]).slice(0, 4).map(([name, duration]) => `${name}=${formatDuration(duration)}`).join(", ");
+      console.log(
+        import_chalk.default.gray(
+          `  ${pkg.name} [${pkg.status}] ${formatDuration(pkg.durationMs)}${summary ? ` (${summary})` : ""}`
+        )
+      );
+    }
+    console.log(import_chalk.default.cyan("[@nocobase/build:profile] slowest declaration packages"));
+    for (const pkg of [...declarationPackages].sort((a, b) => b.durationMs - a.durationMs).slice(0, 20)) {
+      const summary = Object.entries(pkg.phases).sort((a, b) => b[1] - a[1]).slice(0, 4).map(([name, duration]) => `${name}=${formatDuration(duration)}`).join(", ");
+      console.log(
+        import_chalk.default.gray(
+          `  ${pkg.name} [${pkg.status}] ${formatDuration(pkg.durationMs)}${summary ? ` (${summary})` : ""}`
+        )
+      );
+    }
+  }
+}
+function nowMs() {
+  return Date.now();
+}
+function formatDuration(durationMs) {
+  if (durationMs >= 6e4) {
+    return `${(durationMs / 6e4).toFixed(2)}m`;
+  }
+  if (durationMs >= 1e3) {
+    return `${(durationMs / 1e3).toFixed(2)}s`;
+  }
+  return `${Math.round(durationMs)}ms`;
+}
+function runScript(args, cwd, envs = {}) {
+  return (0, import_execa.default)("yarn", args, {
+    cwd,
+    stdio: "inherit",
+    env: {
+      ...process.env,
+      ...envs,
+      sourcemap: process.argv.includes("--sourcemap") ? "sourcemap" : void 0,
+      NODE_ENV: process.env.NODE_ENV || "production"
+    }
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createBuildProfileCollector,
   defineConfig,
+  formatDuration,
   getEnvDefine,
   getPackageJson,
   getPkgLog,
   getUserConfig,
+  nowMs,
+  printBuildProfile,
   readFromCache,
+  runProfiledStage,
+  runScript,
+  runWithConcurrency,
   toUnixPath,
   writeToCache
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.1.0-alpha.4",
+  "version": "2.1.0-alpha.40",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,9 +15,13 @@
     "@babel/preset-env": "^7.26.0",
     "@hapi/topo": "^6.0.0",
     "@lerna/project": "4.0.0",
+    "@rsbuild/core": "1.7.3",
     "@rsbuild/plugin-babel": "^1.0.3",
+    "@rsbuild/plugin-less": "^1.6.2",
+    "@rsbuild/plugin-react": "1.4.6",
+    "@rsbuild/plugin-svgr": "^1.3.1",
     "@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",
@@ -38,18 +42,16 @@
     "postcss-preset-env": "^9.1.2",
     "react-imported-component": "^6.5.4",
     "style-loader": "^3.3.3",
-    "tar": "^7.4.3",
+    "tar": "^7.5.15",
     "tsup": "8.2.4",
     "typescript": "5.1.3",
     "update-notifier": "3.0.0",
-    "vite-plugin-css-injected-by-js": "^3.2.1",
-    "vite-plugin-lib-inject-css": "1.2.0",
     "yargs-parser": "13.1.2"
   },
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "32c682485e5f1878b9165be2e9de18000d98f935"
+  "gitHead": "e73f99dd0abefe847f2e50ff0fea1f41a82fd048"
 }