miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(core): pnpm should not error when fetching migrations with install

Browse Source
This commit is contained in:
AgentEnder 2023-05-18 11:58:39 -04:00 committed by Victor Savkin
parent d786fae2d0
commit faba24995d
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/generated/devkit/nx_devkit.md
View File

@ -1351,7 +1351,7 @@ Returns the list of outputs that will be cached.
### getPackageManagerCommand
▸ **getPackageManagerCommand**(`packageManager?`): `PackageManagerCommands`
▸ **getPackageManagerCommand**(`packageManager?`, `root?`): `PackageManagerCommands`
Returns commands for the package manager used in the workspace.
By default, the package manager is derived based on the lock file,
@ -1365,9 +1365,10 @@ execSync(`${getPackageManagerCommand().addDev} my-dev-package`);
#### Parameters
| Name | Type |
| :--------------- | :------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](../../devkit/documents/nx_devkit#packagemanager) |
| Name | Type | Default value | Description |
| :--------------- | :------------------------------------------------------------------ | :-------------- | :------------------------------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](../../devkit/documents/nx_devkit#packagemanager) | `undefined` | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root` | `string` | `workspaceRoot` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |
#### Returns

9
docs/generated/packages/devkit/documents/nx_devkit.md
View File

@ -1351,7 +1351,7 @@ Returns the list of outputs that will be cached.
### getPackageManagerCommand
▸ **getPackageManagerCommand**(`packageManager?`): `PackageManagerCommands`
▸ **getPackageManagerCommand**(`packageManager?`, `root?`): `PackageManagerCommands`
Returns commands for the package manager used in the workspace.
By default, the package manager is derived based on the lock file,
@ -1365,9 +1365,10 @@ execSync(`${getPackageManagerCommand().addDev} my-dev-package`);
#### Parameters
| Name | Type |
| :--------------- | :------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](../../devkit/documents/nx_devkit#packagemanager) |
| Name | Type | Default value | Description |
| :--------------- | :------------------------------------------------------------------ | :-------------- | :------------------------------------------------------------------------------------------ |
| `packageManager` | [`PackageManager`](../../devkit/documents/nx_devkit#packagemanager) | `undefined` | The package manager to use. If not provided, it will be detected based on the lock file. |
| `root` | `string` | `workspaceRoot` | The directory the commands will be ran inside of. Defaults to the current workspace's root. |
#### Returns

2
packages/nx/src/command-line/migrate/migrate.ts
View File

@ -1028,7 +1028,7 @@ async function getPackageMigrationsUsingInstall(
let result: ResolvedMigrationConfiguration;
try {
const pmc = getPackageManagerCommand(detectPackageManager(dir));
const pmc = getPackageManagerCommand(detectPackageManager(dir), dir);
await execAsync(`${pmc.add} ${packageName}@${packageVersion}`, {
cwd: dir,

8
packages/nx/src/utils/package-manager.ts
View File

@ -50,9 +50,13 @@ export function detectPackageManager(dir: string = ''): PackageManager {
* ```javascript
* execSync(`${getPackageManagerCommand().addDev} my-dev-package`);
* ```
*
* @param packageManager The package manager to use. If not provided, it will be detected based on the lock file.
* @param root The directory the commands will be ran inside of. Defaults to the current workspace's root.
*/
export function getPackageManagerCommand(
packageManager: PackageManager = detectPackageManager()
packageManager: PackageManager = detectPackageManager(),
root: string = workspaceRoot
): PackageManagerCommands {
const commands: { [pm in PackageManager]: () => PackageManagerCommands } = {
yarn: () => {
@ -76,7 +80,7 @@ export function getPackageManagerCommand(
const pnpmVersion = getPackageManagerVersion('pnpm');
const useExec = gte(pnpmVersion, '6.13.0');
const includeDoubleDashBeforeArgs = lt(pnpmVersion, '7.0.0');
const isPnpmWorkspace = existsSync('pnpm-workspace.yaml');
const isPnpmWorkspace = existsSync(join(root, 'pnpm-workspace.yaml'));
return {
install: 'pnpm install --no-frozen-lockfile', // explicitly disable in case of CI