Commit17aa895

authored

fix(angular): ensure required peer deps are installed when migrating from angular cli workspaces (#14766)

1 parented5ad1e commit17aa895Copy full SHA for 17aa895

File tree

+41

-4

lines changed

+41

-4

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@`
`56`	`56`	`"webpack-merge":"5.7.3"`
`57`	`57`	`},`
`58`	`58`	`"peerDependencies": {`
`59`		`-"@angular-devkit/architect":">= 0.1400.0 < 0.1600.0",`
`60`	`59`	`"@angular-devkit/build-angular":">= 14.0.0 < 16.0.0",`
`61`	`60`	`"@angular-devkit/schematics":">= 14.0.0 < 16.0.0",`
`62`	`61`	`"@schematics/angular":">= 14.0.0 < 16.0.0",`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ import {`
`18`	`18`	`createWorkspaceFiles,`
`19`	`19`	`deleteAngularJson,`
`20`	`20`	`deleteGitKeepFilesIfNotNeeded,`
	`21`	`+ensureAngularDevKitPeerDependenciesAreInstalled,`
`21`	`22`	`formatFilesTask,`
`22`	`23`	`getAllProjects,`
`23`	`24`	`getWorkspaceRootFileTypesInfo,`
`@@ -40,6 +41,7 @@ export async function migrateFromAngularCli(`
`40`	`41`	`constoptions=normalizeOptions(tree,rawOptions,projects);`
`41`	`42`
`42`	`43`	`constangularJson=readJson(tree,'angular.json')asany;`
	`44`	`+ensureAngularDevKitPeerDependenciesAreInstalled(tree);`
`43`	`45`
`44`	`46`	`if(options.preserveAngularCliLayout){`
`45`	`47`	`addDependenciesToPackageJson(`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+import{addDependenciesToPackageJson,readJson,Tree}from'@nrwl/devkit';`
	`2`	`+import{getPkgVersionForAngularMajorVersion}from'../../../utils/version-utils';`
	`3`	`+import{getInstalledAngularMajorVersion}from'../../utils/version-utils';`
	`4`	`+`
	`5`	`+exportfunctionensureAngularDevKitPeerDependenciesAreInstalled(`
	`6`	`+tree:Tree`
	`7`	`+):void{`
	`8`	`+constpackagesToInstall=[`
	`9`	`+'@angular-devkit/core',`
	`10`	`+'@angular-devkit/schematics',`
	`11`	`+'@schematics/angular',`
	`12`	`+];`
	`13`	`+`
	`14`	`+const{ devDependencies, dependencies}=readJson(tree,'package.json');`
	`15`	`+letangularCliVersion=`
	`16`	`+devDependencies?.['@angular/cli']??dependencies?.['@angular/cli'];`
	`17`	`+`
	`18`	`+if(!angularCliVersion){`
	`19`	`+constangularMajorVersion=getInstalledAngularMajorVersion(tree);`
	`20`	`+constangularDevkitVersion=getPkgVersionForAngularMajorVersion(`
	`21`	`+'angularDevkitVersion',`
	`22`	`+angularMajorVersion`
	`23`	`+);`
	`24`	`+angularCliVersion=angularDevkitVersion;`
	`25`	`+}`
	`26`	`+`
	`27`	`+constfilteredPackages=packagesToInstall`
	`28`	`+.filter((pkg)=>!devDependencies?.[pkg]&&!dependencies?.[pkg])`
	`29`	`+.reduce((allPkgs,pkg)=>{`
	`30`	`+allPkgs[pkg]=angularCliVersion;`
	`31`	`+returnallPkgs;`
	`32`	`+},{}asRecord<string,string>);`
	`33`	`+`
	`34`	`+addDependenciesToPackageJson(tree,{},filteredPackages);`
	`35`	`+}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+export*from'./dependencies';`
`1`	`2`	`export*from'./file-change-recorder';`
`2`	`3`	`export*from'./format-files-task';`
`3`	`4`	`export*from'./logger';`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@ export default async function (tree: Tree) {`
`18`	`18`	`);`
`19`	`19`
`20`	`20`	`constangularCliVersion=`
`21`		`-pkgJson.devDependencies['@angular/cli']??`
`22`		`-pkgJson.dependencies['@angular/cli']??`
	`21`	`+pkgJson.devDependencies?.['@angular/cli']??`
	`22`	`+pkgJson.dependencies?.['@angular/cli']??`
`23`	`23`	`angularDevkitVersion;`
`24`	`24`
`25`	`25`	`constfilteredPackages:Record<string,string>=packagesToInstall`
`26`	`26`	`.filter(`
`27`		`-(pkg)=>!pkgJson.devDependencies[pkg]&&!pkgJson.dependencies[pkg]`
	`27`	`+(pkg)=>!pkgJson.devDependencies?.[pkg]&&!pkgJson.dependencies?.[pkg]`
`28`	`28`	`)`
`29`	`29`	`.reduce((allPkgs,pkg)=>({ ...allPkgs,[pkg]:angularCliVersion}),{});`
`30`	`30`

Comments

(0)