fix: bundle bug

Author: ycjcl868

apps/agent-tars/forge.config.ts

@@ -23,7 +23,7 @@ const keepModules = new Set([
   '@mixmark-io/domino',
   '@modelcontextprotocol/sdk',
 ]);
-const needSubDependencies = ['@modelcontextprotocol/sdk'];
+const needSubDependencies = ['@tavily/core', '@modelcontextprotocol/sdk'];
 const keepLanguages = new Set(['en', 'en_GB', 'en-US', 'en_US']);
 const ignorePattern = new RegExp(
   `^/node_modules/(?!${[...keepModules].join('|')})`,
@@ -95,13 +95,13 @@ async function cleanSources(
         const moduleRoot = getModuleRoot(projectRoot, item);
 
         if (fs.existsSync(moduleRoot)) {
-          console.log('copy_current_node_modules', moduleRoot);
+          // console.log('copy_current_node_modules', moduleRoot);
           return cp(moduleRoot, path.join(buildPath, 'node_modules', item), {
             recursive: true,
           });
         }
       } catch (error) {
-        console.error('copy_current_node_modules', error);
+        console.error('copy_current_node_modules_error', error);
         return;
       }
 
@@ -116,21 +116,20 @@ async function cleanSources(
   console.log('subDependencies', subDependencies);
   await Promise.all(
     subDependencies.map((subDependency) => {
-      console.log(
-        'target_dir',
-        path.join(buildPath, 'node_modules', subDependency.name),
-      );
       const targetDir = path.join(
         buildPath,
         'node_modules',
         subDependency.name,
       );
       const sourceDir = subDependency.path;
       if (!fs.existsSync(targetDir) && fs.existsSync(sourceDir)) {
-        console.log('copy_current_node_modules', sourceDir);
-        return cp(sourceDir, targetDir, {
-          recursive: true,
-        });
+        try {
+          return cp(sourceDir, targetDir, {
+            recursive: true,
+          });
+        } catch (e) {
+          console.error('copy_current_node_modules_error', sourceDir, e);
+        }
       }
       return;
     }),

apps/agent-tars/package.json

@@ -38,10 +38,10 @@
     }
   },
   "dependencies": {
+    "@tavily/core": "0.3.1",
     "@agent-infra/mcp-server-commands": "workspace:*",
     "@agent-infra/mcp-server-filesystem": "workspace:*",
-    "@agent-infra/mcp-server-browser": "workspace:*",
-    "@tavily/core": "0.3.1"
+    "@agent-infra/mcp-server-browser": "workspace:*"
   },
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.7.0",

apps/ui-tars/forge.config.ts

@@ -106,13 +106,12 @@ async function cleanSources(
         const moduleRoot = getModuleRoot(projectRoot, item);
 
         if (fs.existsSync(moduleRoot)) {
-          console.log('copy_current_node_modules', moduleRoot);
           return cp(moduleRoot, path.join(buildPath, 'node_modules', item), {
             recursive: true,
           });
         }
       } catch (error) {
-        console.error('copy_current_node_modules', error);
+        console.error('copy_current_node_modules_error', error);
         return;
       }
 
@@ -133,7 +132,6 @@ async function cleanSources(
       }
 
       if (fs.existsSync(subDependency.path)) {
-        console.log('copy_current_node_modules', subDependency.path);
         return cp(
           subDependency.path,
           path.join(buildPath, 'node_modules', subDependency.name),

packages/common/electron-build/src/getPackageDependencies.ts

@@ -11,12 +11,26 @@ import { dirname } from 'path';
 import { findUpSync } from './findUp';
 
 export const getModuleRoot = (cwd: string, pkgName: string): string => {
-  const moduleEntryPath = dirname(
-    require.resolve(`${pkgName}/package.json`, {
-      paths: [cwd || process.cwd()],
-    }),
-  );
-
+  let moduleEntryPath;
+  try {
+    moduleEntryPath = dirname(
+      require.resolve(`${pkgName}/package.json`, {
+        paths: [cwd || process.cwd()],
+      }),
+    );
+  } catch (error) {
+    moduleEntryPath = dirname(
+      require.resolve(pkgName, {
+        paths: [cwd || process.cwd()],
+      }),
+    );
+    console.warn(
+      'Failed to read package.json:',
+      error,
+      'new_entry_path',
+      moduleEntryPath,
+    );
+  }
   let pkgPath = findUpSync('package.json', {
     cwd: moduleEntryPath,
   });
@@ -71,7 +85,7 @@ export async function getExternalPkgsDependencies(
   for (const pkgName of pkgNames) {
     try {
       const moduleRoot = getModuleRoot(cwd, pkgName);
-      console.log('moduleRoot', moduleRoot);
+      // console.log('moduleRoot', moduleRoot);
 
       const walker = new Walker(moduleRoot);
       // These are private so it's quite nasty!