@@ -31,14 +31,8 @@ function sortObjectKeys(obj) {
31
31
}
32
32
33
33
Promise . resolve ( )
34
- . then ( ( ) => glob ( path . join ( packagesRoot , '*/package.json' ) ) )
35
- . then ( ( files ) => {
36
- return glob ( path . join ( packagesRoot , '*/*/package.json' ) )
37
- . then ( ( extras ) => {
38
- Array . prototype . push . apply ( files , extras ) ;
39
- return files ;
40
- } )
41
- } )
34
+ . then ( ( ) => glob ( path . join ( packagesRoot , '**/package.json' ) ) )
35
+ . then ( ( files ) => files . filter ( p => ! p . match ( / \/ b l u e p r i n t s \/ / ) ) )
42
36
. then ( ( files ) => {
43
37
return files . reduce ( ( prev , filename ) =>
44
38
prev . then ( ( sum ) =>
@@ -51,19 +45,22 @@ Promise.resolve()
51
45
} )
52
46
. then ( ( jsonArr ) => {
53
47
const dependencies = _ . merge ( ..._ . map ( jsonArr , 'dependencies' ) ) ;
48
+ const peerDependencies = _ . merge ( ..._ . map ( jsonArr , 'peerDependencies' ) ) ;
54
49
55
- const output = path . join ( root , 'package.json' ) ;
50
+ const rootPackageJsonPath = path . join ( root , 'package.json' ) ;
56
51
57
52
const ignoredDeps = [ '@angular-cli/base-href-webpack' , '@ngtools/webpack' ] ;
58
53
59
54
ignoredDeps . forEach ( key => delete dependencies [ key ] )
60
55
61
- return readJson ( output )
62
- . then ( ( json ) => {
63
- json . dependencies = sortObjectKeys ( dependencies ) ;
56
+ return readJson ( rootPackageJsonPath )
57
+ . then ( ( rootPackageJson ) => {
58
+ rootPackageJson . dependencies = sortObjectKeys ( dependencies ) ;
59
+ rootPackageJson . peerDependencies = sortObjectKeys ( peerDependencies ) ;
64
60
65
- Object . keys ( dependencies ) . forEach ( key => delete json . devDependencies [ key ] ) ;
61
+ Object . keys ( dependencies ) . forEach ( key => delete rootPackageJson . devDependencies [ key ] ) ;
62
+ Object . keys ( dependencies ) . forEach ( key => delete rootPackageJson . peerDependencies [ key ] ) ;
66
63
67
- return writeFile ( output /*.replace('package', 'test')*/ , JSON . stringify ( json , null , 2 ) + '\n' ) ;
64
+ return writeFile ( rootPackageJsonPath , JSON . stringify ( rootPackageJson , null , 2 ) + '\n' ) ;
68
65
} )
69
66
} )
0 commit comments