Skip to content

Commit 6555426

Browse files
committed
chore: hoist common dev dependencies to workspace (#41)
This will ensure that packages are tested across common versions. Also refactors the clean deps scripts and adds redux to package peer dependencies where missing. Closes #10
1 parent 8508e59 commit 6555426

File tree

7 files changed

+85
-308
lines changed

7 files changed

+85
-308
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defaults: &defaults
2-
docker:
2+
docker:
33
- image: 'circleci/node:8-browsers'
44
working_directory: ~/repo
55

@@ -20,9 +20,9 @@ jobs:
2020
paths:
2121
- ~/repo
2222

23-
install_dependencies:
23+
install_dependencies:
2424
<<: *defaults
25-
steps:
25+
steps:
2626
- restore_cache: *repo_cache
2727
- restore_cache:
2828
keys:
@@ -41,7 +41,7 @@ jobs:
4141
- packages/store/node_modules
4242
<<: *deps_cache
4343

44-
lint:
44+
lint:
4545
<<: *defaults
4646
steps:
4747
- restore_cache: *repo_cache

package.json

+23-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
"build:form": "ng-packagr -p packages/form",
1010
"build:router": "ng-packagr -p packages/router",
1111
"clean": "npm-run-all -p clean:*",
12-
"clean:workspace-deps": "rimraf node_modules",
13-
"clean:package-deps": "rimraf packages/*/node_modules",
12+
"clean:deps": "npm-run-all -p clean:deps:*",
13+
"clean:deps:workspace": "rimraf node_modules",
14+
"clean:deps:packages": "rimraf packages/*/node_modules",
1415
"clean:coverage": "rimraf coverage",
1516
"clean:package-dist": "rimraf packages/*/dist",
1617
"lint": "npm-run-all -p lint:*",
@@ -31,22 +32,40 @@
3132
]
3233
},
3334
"devDependencies": {
35+
"@angular/animations": "6.0.7",
36+
"@angular/common": "6.0.7",
37+
"@angular/compiler": "6.0.7",
38+
"@angular/compiler-cli": "6.0.7",
39+
"@angular/core": "6.0.7",
40+
"@angular/forms": "6.0.7",
41+
"@angular/platform-browser": "6.0.7",
42+
"@angular/platform-browser-dynamic": "6.0.7",
43+
"@angular/router": "6.0.7",
3444
"@commitlint/cli": "7.0.0",
3545
"@commitlint/config-conventional": "7.0.1",
3646
"@commitlint/prompt-cli": "7.0.0",
3747
"@types/jest": "23.1.6",
48+
"babel-core": "6.26.3",
49+
"babel-jest": "23.4.2",
3850
"codelyzer": "4.4.2",
3951
"husky": "0.14.3",
4052
"jest": "23.4.1",
4153
"jest-junit": "5.1.0",
42-
"jest-preset-angular": "5.2.3",
54+
"jest-preset-angular": "6.0.0",
4355
"jest-zone-patch": "0.0.8",
4456
"lerna": "2.11.0",
4557
"lint-staged": "7.2.0",
4658
"ng-packagr": "3.0.6",
4759
"npm-run-all": "4.1.3",
4860
"prettier": "1.13.7",
61+
"redux": "4.0.0",
62+
"redux-logger": "2.10.2",
4963
"rimraf": "2.6.2",
50-
"tslint": "5.11.0"
64+
"rxjs": "6.2.1",
65+
"tsickle": "0.32.1",
66+
"tslib": "1.9.3",
67+
"tslint": "5.11.0",
68+
"typescript": "2.7.2",
69+
"zone.js": "0.8.26"
5170
}
5271
}

packages/form/package.json

+2-13
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,14 @@
2525
"@angular-redux/store": "^9.0.0",
2626
"@angular/core": "^6.0.0",
2727
"@angular/forms": "^6.0.0",
28+
"redux": "^4.0.0",
2829
"rxjs": "^6.0.0"
2930
},
3031
"dependencies": {
3132
"immutable": "3.8.2"
3233
},
3334
"devDependencies": {
34-
"@angular-redux/store": "9.0.0",
35-
"@angular/common": "6.0.7",
36-
"@angular/compiler": "6.0.7",
37-
"@angular/compiler-cli": "6.0.7",
38-
"@angular/core": "6.0.7",
39-
"@angular/forms": "6.0.7",
40-
"@angular/platform-browser": "6.0.7",
41-
"@angular/platform-browser-dynamic": "6.0.7",
42-
"redux": "4.0.0",
43-
"redux-logger": "2.10.2",
44-
"rxjs": "6.2.1",
45-
"typescript": "2.7.2",
46-
"zone.js": "0.8.26"
35+
"@angular-redux/store": "9.0.0"
4736
},
4837
"main": "dist/bundles/angular-redux-form.umd.js",
4938
"module": "dist/fesm5/angular-redux-form.js",

packages/form/src/tests.utilities.ts

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { flushMicrotasks } from '@angular/core/testing';
22

33
import { Iterable } from 'immutable';
44

5+
// redux-logger is a dev dependency in the workspace
6+
// tslint:disable-next-line:no-implicit-dependencies
57
import { createLogger } from 'redux-logger';
68

79
export const logger = createLogger({

packages/router/package.json

+2-12
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,11 @@
2727
"@angular/common": "^6.0.0",
2828
"@angular/core": "^6.0.0",
2929
"@angular/router": "^6.0.0",
30+
"redux": "^4.0.0",
3031
"rxjs": "^6.0.0"
3132
},
3233
"devDependencies": {
33-
"@angular-redux/store": "9.0.0",
34-
"@angular/common": "6.0.7",
35-
"@angular/compiler": "6.0.7",
36-
"@angular/compiler-cli": "6.0.7",
37-
"@angular/core": "6.0.7",
38-
"@angular/platform-browser": "6.0.7",
39-
"@angular/platform-browser-dynamic": "6.0.7",
40-
"@angular/router": "6.0.7",
41-
"redux": "4.0.0",
42-
"rxjs": "6.2.1",
43-
"typescript": "2.7.2",
44-
"zone.js": "0.8.26"
34+
"@angular-redux/store": "9.0.0"
4535
},
4636
"main": "dist/bundles/angular-redux-router.umd.js",
4737
"module": "dist/fesm5/angular-redux-router.js",

packages/store/package.json

+1-14
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,8 @@
3232
"rxjs": "^6.0.0"
3333
},
3434
"devDependencies": {
35-
"@angular/animations": "6.0.7",
36-
"@angular/common": "6.0.7",
37-
"@angular/compiler": "6.0.7",
38-
"@angular/compiler-cli": "6.0.7",
39-
"@angular/core": "6.0.7",
40-
"@angular/http": "6.0.7",
41-
"@angular/platform-browser": "6.0.7",
42-
"@angular/platform-browser-dynamic": "6.0.7",
43-
"@angular/platform-server": "6.0.7",
44-
"redux": "4.0.0",
45-
"rxjs": "6.2.1",
4635
"typedoc": "0.11.1",
47-
"typedoc-plugin-sourcefile-url": "1.0.3",
48-
"typescript": "2.7.2",
49-
"zone.js": "0.8.26"
36+
"typedoc-plugin-sourcefile-url": "1.0.3"
5037
},
5138
"main": "dist/bundles/angular-redux-store.umd.js",
5239
"module": "dist/fesm5/angular-redux-store.js",

0 commit comments

Comments
 (0)