chore: hoist common dev dependencies to workspace

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
angular-redux · Sep 5, 2018 · e31d15a · e31d15a
1 parent dfb2a02
commit e31d15a
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 308 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,5 +1,5 @@
 defaults: &defaults
-  docker: 
+  docker:
     - image: 'circleci/node:8-browsers'
   working_directory: ~/repo
 
@@ -20,9 +20,9 @@ jobs:
           paths:
             - ~/repo
 
-  install_dependencies: 
+  install_dependencies:
     <<: *defaults
-    steps: 
+    steps:
       - restore_cache: *repo_cache
       - restore_cache:
           keys:
@@ -41,7 +41,7 @@ jobs:
             - packages/store/node_modules
           <<: *deps_cache
 
-  lint: 
+  lint:
     <<: *defaults
     steps:
       - restore_cache: *repo_cache

diff --git a/package.json b/package.json
@@ -9,8 +9,9 @@
     "build:form": "ng-packagr -p packages/form",
     "build:router": "ng-packagr -p packages/router",
     "clean": "npm-run-all -p clean:*",
-    "clean:workspace-deps": "rimraf node_modules",
-    "clean:package-deps": "rimraf packages/*/node_modules",
+    "clean:deps": "npm-run-all -p clean:deps:*",
+    "clean:deps:workspace": "rimraf node_modules",
+    "clean:deps:packages": "rimraf packages/*/node_modules",
     "clean:coverage": "rimraf coverage",
     "clean:package-dist": "rimraf packages/*/dist",
     "lint": "npm-run-all -p lint:*",
@@ -31,22 +32,40 @@
     ]
   },
   "devDependencies": {
+    "@angular/animations": "6.0.7",
+    "@angular/common": "6.0.7",
+    "@angular/compiler": "6.0.7",
+    "@angular/compiler-cli": "6.0.7",
+    "@angular/core": "6.0.7",
+    "@angular/forms": "6.0.7",
+    "@angular/platform-browser": "6.0.7",
+    "@angular/platform-browser-dynamic": "6.0.7",
+    "@angular/router": "6.0.7",
     "@commitlint/cli": "7.0.0",
     "@commitlint/config-conventional": "7.0.1",
     "@commitlint/prompt-cli": "7.0.0",
     "@types/jest": "23.1.6",
+    "babel-core": "6.26.3",
+    "babel-jest": "23.4.2",
     "codelyzer": "4.4.2",
     "husky": "0.14.3",
     "jest": "23.4.1",
     "jest-junit": "5.1.0",
-    "jest-preset-angular": "5.2.3",
+    "jest-preset-angular": "6.0.0",
     "jest-zone-patch": "0.0.8",
     "lerna": "2.11.0",
     "lint-staged": "7.2.0",
     "ng-packagr": "3.0.6",
     "npm-run-all": "4.1.3",
     "prettier": "1.13.7",
+    "redux": "4.0.0",
+    "redux-logger": "2.10.2",
     "rimraf": "2.6.2",
-    "tslint": "5.11.0"
+    "rxjs": "6.2.1",
+    "tsickle": "0.32.1",
+    "tslib": "1.9.3",
+    "tslint": "5.11.0",
+    "typescript": "2.7.2",
+    "zone.js": "0.8.26"
   }
 }
diff --git a/packages/form/package.json b/packages/form/package.json
@@ -25,25 +25,14 @@
     "@angular-redux/store": "^9.0.0",
     "@angular/core": "^6.0.0",
     "@angular/forms": "^6.0.0",
+    "redux": "^4.0.0",
     "rxjs": "^6.0.0"
   },
   "dependencies": {
     "immutable": "3.8.2"
   },
   "devDependencies": {
-    "@angular-redux/store": "9.0.0",
-    "@angular/common": "6.0.7",
-    "@angular/compiler": "6.0.7",
-    "@angular/compiler-cli": "6.0.7",
-    "@angular/core": "6.0.7",
-    "@angular/forms": "6.0.7",
-    "@angular/platform-browser": "6.0.7",
-    "@angular/platform-browser-dynamic": "6.0.7",
-    "redux": "4.0.0",
-    "redux-logger": "2.10.2",
-    "rxjs": "6.2.1",
-    "typescript": "2.7.2",
-    "zone.js": "0.8.26"
+    "@angular-redux/store": "9.0.0"
   },
   "main": "dist/bundles/angular-redux-form.umd.js",
   "module": "dist/fesm5/angular-redux-form.js",

diff --git a/packages/form/src/tests.utilities.ts b/packages/form/src/tests.utilities.ts
@@ -2,6 +2,8 @@ import { flushMicrotasks } from '@angular/core/testing';
 
 import { Iterable } from 'immutable';
 
+// redux-logger is a dev dependency in the workspace
+// tslint:disable-next-line:no-implicit-dependencies
 import { createLogger } from 'redux-logger';
 
 export const logger = createLogger({

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -27,21 +27,11 @@
     "@angular/common": "^6.0.0",
     "@angular/core": "^6.0.0",
     "@angular/router": "^6.0.0",
+    "redux": "^4.0.0",
     "rxjs": "^6.0.0"
   },
   "devDependencies": {
-    "@angular-redux/store": "9.0.0",
-    "@angular/common": "6.0.7",
-    "@angular/compiler": "6.0.7",
-    "@angular/compiler-cli": "6.0.7",
-    "@angular/core": "6.0.7",
-    "@angular/platform-browser": "6.0.7",
-    "@angular/platform-browser-dynamic": "6.0.7",
-    "@angular/router": "6.0.7",
-    "redux": "4.0.0",
-    "rxjs": "6.2.1",
-    "typescript": "2.7.2",
-    "zone.js": "0.8.26"
+    "@angular-redux/store": "9.0.0"
   },
   "main": "dist/bundles/angular-redux-router.umd.js",
   "module": "dist/fesm5/angular-redux-router.js",

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -32,21 +32,8 @@
     "rxjs": "^6.0.0"
   },
   "devDependencies": {
-    "@angular/animations": "6.0.7",
-    "@angular/common": "6.0.7",
-    "@angular/compiler": "6.0.7",
-    "@angular/compiler-cli": "6.0.7",
-    "@angular/core": "6.0.7",
-    "@angular/http": "6.0.7",
-    "@angular/platform-browser": "6.0.7",
-    "@angular/platform-browser-dynamic": "6.0.7",
-    "@angular/platform-server": "6.0.7",
-    "redux": "4.0.0",
-    "rxjs": "6.2.1",
     "typedoc": "0.11.1",
-    "typedoc-plugin-sourcefile-url": "1.0.3",
-    "typescript": "2.7.2",
-    "zone.js": "0.8.26"
+    "typedoc-plugin-sourcefile-url": "1.0.3"
   },
   "main": "dist/bundles/angular-redux-store.umd.js",
   "module": "dist/fesm5/angular-redux-store.js",