-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(angular): ensure required peer deps are installed when migrating …
…from angular cli workspaces (#14766)
- Loading branch information
1 parent
ed5ad1e
commit 17aa895
Showing
5 changed files
with
41 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
packages/angular/src/generators/ng-add/utilities/dependencies.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
import { addDependenciesToPackageJson, readJson, Tree } from '@nrwl/devkit'; | ||
import { getPkgVersionForAngularMajorVersion } from '../../../utils/version-utils'; | ||
import { getInstalledAngularMajorVersion } from '../../utils/version-utils'; | ||
|
||
export function ensureAngularDevKitPeerDependenciesAreInstalled( | ||
tree: Tree | ||
): void { | ||
const packagesToInstall = [ | ||
'@angular-devkit/core', | ||
'@angular-devkit/schematics', | ||
'@schematics/angular', | ||
]; | ||
|
||
const { devDependencies, dependencies } = readJson(tree, 'package.json'); | ||
let angularCliVersion = | ||
devDependencies?.['@angular/cli'] ?? dependencies?.['@angular/cli']; | ||
|
||
if (!angularCliVersion) { | ||
const angularMajorVersion = getInstalledAngularMajorVersion(tree); | ||
const angularDevkitVersion = getPkgVersionForAngularMajorVersion( | ||
'angularDevkitVersion', | ||
angularMajorVersion | ||
); | ||
angularCliVersion = angularDevkitVersion; | ||
} | ||
|
||
const filteredPackages = packagesToInstall | ||
.filter((pkg) => !devDependencies?.[pkg] && !dependencies?.[pkg]) | ||
.reduce((allPkgs, pkg) => { | ||
allPkgs[pkg] = angularCliVersion; | ||
return allPkgs; | ||
}, {} as Record<string, string>); | ||
|
||
addDependenciesToPackageJson(tree, {}, filteredPackages); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters