fix: packages generator overrides field when use npm (#3655)

caohuilin · web-flow · commit 3c0c5bb55aa7 · 2023-05-11T10:41:26.000Z
* fix: packages generator overrides field when use npm

* fix: generator test packageManager

* feat: integration test add max workers params

* feat: node 14 pnpm install use flat struct

* fix: npm overrides install error

* fix: run packages generator position
diff --git a/.changeset/warm-moons-sneeze.md b/.changeset/warm-moons-sneeze.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/packages-generator': patch
+---
+
+fix: packages generator overrides field when use npm
+
+fix: 修复当使用 npm 安装依赖时 packages-generator overrides 字段
diff --git a/packages/generator/generators/mwa-generator/src/index.ts b/packages/generator/generators/mwa-generator/src/index.ts
@@ -204,13 +204,6 @@ export const handleTemplateFile = async (
   }
 
   const { packagesInfo, buildTools } = context.config;
-  if (packagesInfo && Object.keys(packagesInfo).length > 0) {
-    await appApi.runSubGenerator(
-      getGeneratorPath(PackagesGenerator, context.config.distTag),
-      undefined,
-      context.config,
-    );
-  }
 
   if (buildTools === BuildTools.Rspack) {
     await appApi.runSubGenerator(
@@ -225,6 +218,14 @@ export const handleTemplateFile = async (
     );
   }
 
+  if (packagesInfo && Object.keys(packagesInfo).length > 0) {
+    await appApi.runSubGenerator(
+      getGeneratorPath(PackagesGenerator, context.config.distTag),
+      undefined,
+      context.config,
+    );
+  }
+
   return { projectPath };
 };
 
diff --git a/packages/generator/generators/packages-generator/src/index.ts b/packages/generator/generators/packages-generator/src/index.ts
@@ -22,7 +22,7 @@ const handleTemplateFile = async (
         $set: update,
       },
     });
-  } else {
+  } else if (packageManager === PackageManager.Yarn) {
     const pkgInfo = fs.readJSONSync(
       path.join(context.materials.default.basePath, 'package.json'),
       'utf-8',
@@ -45,6 +45,29 @@ const handleTemplateFile = async (
         $set: update,
       },
     });
+  } else {
+    const pkgInfo = fs.readJSONSync(
+      path.join(context.materials.default.basePath, 'package.json'),
+      'utf-8',
+    );
+    const { dependencies = {}, devDependencies = {} } = pkgInfo;
+
+    const update: Record<string, string> = {};
+    Object.entries(packagesInfo || {}).forEach(([name, version]) => {
+      update[`overrides.${name}`] = version as string;
+      if (dependencies[name]) {
+        update[`dependencies.${name}`] = version as string;
+      }
+      if (devDependencies[name]) {
+        update[`devDependencies.${name}`] = version as string;
+      }
+    });
+    await jsonAPI.update(context.materials.default.get('package.json'), {
+      query: {},
+      update: {
+        $set: update,
+      },
+    });
   }
 };
 
diff --git a/tests/generator/module.ts b/tests/generator/module.ts
@@ -1,9 +1,13 @@
 import path from 'path';
 import { getModuleCases, getModuleNewCases } from '@modern-js/generator-cases';
-import { fs, nanoid } from '@modern-js/utils';
+import { fs, nanoid, semver } from '@modern-js/utils';
 import { ModuleNewAction } from '@modern-js/new-action';
 import { prepare } from './utils/prepare';
-import { execaWithStreamLog, usingTempDir } from './utils/tools';
+import {
+  execaWithStreamLog,
+  getPackageManager,
+  usingTempDir,
+} from './utils/tools';
 import {
   runLintProject,
   runCreteCommand,
@@ -62,10 +66,10 @@ async function runNewInModuleProject(
       cwd: path.join(tmpDir, project),
     },
   );
-  const packageManager = project.includes('pnpm') ? 'pnpm' : 'npm';
+  const packageManager = getPackageManager(project);
   const cases = getModuleNewCases();
   for (const config of cases) {
-    await runModuleNewCommand(isLocal, packageManager, {
+    await runModuleNewCommand(isLocal, project, {
       cwd: path.join(tmpDir, project),
       config: JSON.stringify({
         noNeedInstall: true,
@@ -83,7 +87,7 @@ async function runNewInModuleProject(
 
 async function runModuleNewCommand(
   isLocal: boolean,
-  packageManager: 'pnpm' | 'npm',
+  project: string,
   options: {
     config: string;
     cwd: string;
@@ -101,13 +105,6 @@ async function runModuleNewCommand(
       config,
       cwd,
     });
-    await execaWithStreamLog(
-      packageManager,
-      ['install', '--ignore-scripts', '--force'],
-      {
-        cwd,
-      },
-    );
   } else {
     await execaWithStreamLog(
       'npm',
@@ -128,13 +125,19 @@ async function runModuleNewCommand(
         },
       },
     );
-    await execaWithStreamLog(
-      packageManager,
-      ['install', '--ignore-scripts', '--force'],
-      {
-        cwd,
-      },
-    );
+  }
+  const isNode16 = semver.gte(process.versions.node, '16.0.0');
+  const params = ['install', '--ignore-scripts', '--force'];
+  const packageManager = getPackageManager(project);
+  if (isNode16 || project.includes('pnpm')) {
+    await execaWithStreamLog(packageManager, params, {
+      cwd,
+    });
+  } else {
+    params.push('--shamefully-hoist');
+    await execaWithStreamLog(packageManager, params, {
+      cwd,
+    });
   }
 }
 
diff --git a/tests/generator/mwa.ts b/tests/generator/mwa.ts
@@ -1,9 +1,13 @@
 import path from 'path';
 import { getMWACases, getMWANewCases } from '@modern-js/generator-cases';
-import { fs, nanoid } from '@modern-js/utils';
+import { fs, nanoid, semver } from '@modern-js/utils';
 import { MWANewAction } from '@modern-js/new-action';
 import { prepare } from './utils/prepare';
-import { execaWithStreamLog, usingTempDir } from './utils/tools';
+import {
+  execaWithStreamLog,
+  getPackageManager,
+  usingTempDir,
+} from './utils/tools';
 import {
   runLintProject,
   runCreteCommand,
@@ -63,7 +67,7 @@ async function runNewMWAProject(
       cwd: path.join(tmpDir, project),
     },
   );
-  const packageManager = project.includes('pnpm') ? 'pnpm' : 'npm';
+  const packageManager = getPackageManager(project);
   const cases = getMWANewCases(isSimple ? 5 : undefined);
   let hasMicroFrontend = false;
   let hasSSG = false;
@@ -110,7 +114,7 @@ async function runNewMWAProject(
     if (config.actionType === 'refactor') {
       continue;
     }
-    await runMWANewCommand(isLocal, packageManager, {
+    await runMWANewCommand(isLocal, project, {
       cwd: path.join(tmpDir, project),
       config: JSON.stringify({
         noNeedInstall: true,
@@ -128,7 +132,7 @@ async function runNewMWAProject(
 
 async function runMWANewCommand(
   isLocal: boolean,
-  packageManager: 'pnpm' | 'npm',
+  project: string,
   options: {
     config: string;
     cwd: string;
@@ -146,13 +150,6 @@ async function runMWANewCommand(
       config,
       cwd,
     });
-    await execaWithStreamLog(
-      packageManager,
-      ['install', '--ignore-scripts', '--force'],
-      {
-        cwd,
-      },
-    );
   } else {
     await execaWithStreamLog(
       'npm',
@@ -173,13 +170,19 @@ async function runMWANewCommand(
         },
       },
     );
-    await execaWithStreamLog(
-      packageManager,
-      ['install', '--ignore-scripts', '--force'],
-      {
-        cwd,
-      },
-    );
+  }
+  const isNode16 = semver.gte(process.versions.node, '16.0.0');
+  const params = ['install', '--ignore-scripts', '--force'];
+  const packageManager = getPackageManager(project);
+  if (isNode16 || project.includes('pnpm')) {
+    await execaWithStreamLog(packageManager, params, {
+      cwd,
+    });
+  } else {
+    params.push('--shamefully-hoist');
+    await execaWithStreamLog(packageManager, params, {
+      cwd,
+    });
   }
 }
 
diff --git a/tests/generator/utils/command.ts b/tests/generator/utils/command.ts
@@ -1,6 +1,6 @@
 import path from 'path';
-import { fs } from '@modern-js/utils';
-import { execaWithStreamLog } from './tools';
+import { fs, semver } from '@modern-js/utils';
+import { execaWithStreamLog, getPackageManager } from './tools';
 
 export async function runCreteCommand(
   repoDir: string,
@@ -17,6 +17,7 @@ export async function runCreteCommand(
   const debug =
     process.env.DEBUG === 'true' || process.env.CUSTOM_DEBUG === 'true';
   const packages = process.env.PACKAGES;
+  const packageManager = getPackageManager(projectName);
   if (isLocal) {
     return execaWithStreamLog(
       'node',
@@ -27,6 +28,7 @@ export async function runCreteCommand(
         JSON.stringify({
           packageName: projectName,
           ...config,
+          packageManager,
         }),
         '--dist-tag',
         'next',
@@ -57,6 +59,7 @@ export async function runCreteCommand(
       JSON.stringify({
         packageName: projectName,
         ...config,
+        packageManager,
       }),
       debug ? '--debug' : '',
       platform ? '--platform' : '',
@@ -81,14 +84,19 @@ export async function runInstallAndBuildProject(type: string, tmpDir: string) {
       .filter(project => project.includes(type))
       .map(async project => {
         console.info('install and build process', project);
-        const packageManager = project.includes('pnpm') ? 'pnpm' : 'npm';
-        await execaWithStreamLog(
-          packageManager,
-          ['install', '--ignore-scripts', '--force'],
-          {
+        const packageManager = getPackageManager(project);
+        const isNode16 = semver.gte(process.versions.node, '16.0.0');
+        const params = ['install', '--ignore-scripts', '--force'];
+        if (isNode16 || project.includes('pnpm')) {
+          await execaWithStreamLog(packageManager, params, {
             cwd: path.join(tmpDir, project),
-          },
-        );
+          });
+        } else {
+          params.push('--shamefully-hoist');
+          await execaWithStreamLog(packageManager, params, {
+            cwd: path.join(tmpDir, project),
+          });
+        }
         if (project.includes('monorepo')) {
           return Promise.resolve();
         }
@@ -109,7 +117,7 @@ export async function runLintProject(type: string, tmpDir: string) {
       )
       .map(async project => {
         console.info('lint process', project);
-        const packageManager = project.includes('pnpm') ? 'pnpm' : 'npm';
+        const packageManager = getPackageManager(project);
         await execaWithStreamLog(packageManager, ['run', 'lint'], {
           cwd: path.join(tmpDir, project),
         });
diff --git a/tests/generator/utils/tools.ts b/tests/generator/utils/tools.ts
@@ -1,4 +1,6 @@
-import { fs, execa } from '@modern-js/utils';
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable consistent-return */
+import { fs, execa, semver } from '@modern-js/utils';
 
 export async function usingTempDir(
   tmpDir: string,
@@ -29,3 +31,16 @@ export async function execaWithStreamLog(
     process.exit(1);
   }
 }
+
+export function getPackageManager(projectName: string) {
+  const isNode16 = semver.gte(process.versions.node, '16.0.0');
+  if (!isNode16) {
+    return 'pnpm';
+  }
+  // eslint-disable-next-line no-nested-ternary
+  return projectName.includes('pnpm')
+    ? 'pnpm'
+    : projectName.includes('yarn')
+    ? 'yarn'
+    : 'npm';
+}
diff --git a/tests/package.json b/tests/package.json
@@ -8,7 +8,7 @@
     "test:rspack": "jest -w 1 builder-rspack && pnpm test:builder:rspack",
     "test:builder:rspack": "cd e2e/builder && pnpm test:rspack",
     "test:doc": "cd integration && jest -w 1 --testMatch **/doc/**/*.test.ts",
-    "test": "pnpm test --filter api-service-koa & jest",
+    "test": "pnpm test --filter api-service-koa & jest -w 8",
     "test:ut": "node --conditions=jsnext:source -r btsm ./node_modules/jest/bin/jest.js -c jest-ut.config.js --maxWorkers=2",
     "cypress:test": "pnpm --parallel --filter '@cypress-test/*' run dev & cypress open",
     "prepare": "node node_modules/puppeteer/install.js",
