@nocobase/build 2.1.0-beta.34 → 2.1.0-beta.35

package/lib/build.js

@@ -127,12 +127,21 @@ async function build(pkgs) {
     });
     const appClient = packages.find((item) => item.location === import_constant.CORE_APP);
     if (appClient) {
-      await (0, import_utils.runProfiledStage)(profile, "app shell", async () => {
+      await (0, import_utils.runProfiledStage)(profile, "app client shell", async () => {
         await (0, import_utils.runScript)(["rsbuild", "build", "--config", import_path.default.join(import_constant.CORE_APP, "client", "rsbuild.config.ts")], import_constant.ROOT_PATH, {
           APP_ROOT: import_path.default.join(import_constant.CORE_APP, "client"),
           ANALYZE: process.env.BUILD_ANALYZE === "true" ? "1" : void 0
         });
       });
+      await (0, import_utils.runProfiledStage)(profile, "app client-v2 shell", async () => {
+        await (0, import_utils.runScript)(
+          ["rsbuild", "build", "--config", import_path.default.join(import_constant.CORE_APP, "client-v2", "rsbuild.config.ts")],
+          import_constant.ROOT_PATH,
+          {
+            ANALYZE: process.env.BUILD_ANALYZE === "true" ? "1" : void 0
+          }
+        );
+      });
     }
     (0, import_utils.writeToCache)(BUILD_ERROR, {});
   } finally {

package/lib/buildPlugin.js

@@ -318,8 +318,10 @@ async function buildServerDeps(cwd, serverFiles, log) {
     });
     await (0, import_ncc.default)(dep, nccConfig).then(
       ({ code, assets }) => {
+        import_fs_extra.default.ensureDirSync(import_path.default.dirname(mainFile));
         import_fs_extra.default.writeFileSync(mainFile, code, "utf-8");
         Object.entries(assets).forEach(([name, item]) => {
+          import_fs_extra.default.ensureDirSync(import_path.default.dirname(import_path.default.join(outputDir, name)));
           import_fs_extra.default.writeFileSync(import_path.default.join(outputDir, name), item.source, {
             encoding: "utf-8",
             mode: item.permissions

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,23 +60,23 @@ 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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "2.1.0-beta.34",
+  "version": "2.1.0-beta.35",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -53,5 +53,5 @@
     "build": "tsup",
     "build:watch": "tsup --watch"
   },
-  "gitHead": "ca804833299c547f8d49f8d58f73273a4bfcd03c"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }