Skip to content

Commit a6c47ec

Browse files
committed
fix: missing peerDependencies handling in sync-deps
1 parent e61b01d commit a6c47ec

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,5 +167,8 @@
167167
"sinon": "^1.17.3",
168168
"tree-kill": "^1.0.0",
169169
"ts-node": "^1.7.0"
170+
},
171+
"peerDependencies": {
172+
"reflect-metadata": "^0.1.8"
170173
}
171174
}

scripts/sync-deps.js

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,8 @@ function sortObjectKeys(obj) {
3131
}
3232

3333
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(/\/blueprints\//)))
4236
.then((files) => {
4337
return files.reduce((prev, filename) =>
4438
prev.then((sum) =>
@@ -51,19 +45,22 @@ Promise.resolve()
5145
})
5246
.then((jsonArr) => {
5347
const dependencies = _.merge(..._.map(jsonArr, 'dependencies'));
48+
const peerDependencies = _.merge(..._.map(jsonArr, 'peerDependencies'));
5449

55-
const output = path.join(root, 'package.json');
50+
const rootPackageJsonPath = path.join(root, 'package.json');
5651

5752
const ignoredDeps = ['@angular-cli/base-href-webpack', '@ngtools/webpack'];
5853

5954
ignoredDeps.forEach(key => delete dependencies[key])
6055

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);
6460

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]);
6663

67-
return writeFile(output/*.replace('package', 'test')*/, JSON.stringify(json, null, 2) + '\n');
64+
return writeFile(rootPackageJsonPath, JSON.stringify(rootPackageJson, null, 2) + '\n');
6865
})
6966
})

0 commit comments

Comments
 (0)