From b03d8761134cbde23b6af9d83961ad1b0b7b68bc Mon Sep 17 00:00:00 2001
From: Perreal Guillaume <guillaume.perreal@irstea.fr>
Date: Wed, 9 Oct 2019 14:44:24 +0200
Subject: [PATCH] Require additionnal rules instead of listing them as
 peerDependencies.

---
 package.json | 16 ++++++----------
 tslint.json  | 12 ++++++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 6495e96..5a027b7 100644
--- a/package.json
+++ b/package.json
@@ -11,29 +11,25 @@
   "author": "Pôle IS Irstea <dsi.poleis@lists.irstea.fr>",
   "license": "MIT",
   "main": "tslint.json",
-  "peerDependencies": {
+  "dependencies": {
     "codelyzer": "^5.0.0",
-    "prettier": "^1.15.0",
     "prettier-tslint": "^0.4.2",
     "rxjs-tslint-rules": "^4.10",
-    "tslint": "^5.9.1",
     "tslint-config-prettier": "^1.15.0",
     "tslint-defocus": "^2.0.6",
-    "tslint-plugin-prettier": "^2.0.1",
+    "tslint-plugin-prettier": "^2.0.1"
+  },
+  "peerDependencies": {
+    "prettier": "^1.15.0",
+    "tslint": "^5.9.1",
     "typescript": ">=2.9.0"
   },
   "devDependencies": {
     "@angular/compiler": "^8.2.9",
     "@angular/core": "^8.2.9",
-    "codelyzer": "^5.0.0",
     "prettier": "^1.15.0",
-    "prettier-tslint": "^0.4.2",
     "rxjs": "^6",
-    "rxjs-tslint-rules": "^4.10",
     "tslint": "^5.9.1",
-    "tslint-config-prettier": "^1.15.0",
-    "tslint-defocus": "^2.0.6",
-    "tslint-plugin-prettier": "^2.0.1",
     "tsutils": "^3",
     "typescript": ">=2.9.0"
   },
diff --git a/tslint.json b/tslint.json
index b065787..a6a2859 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,11 +1,15 @@
 {
   "extends": [
     "tslint:recommended",
-    "tslint-defocus",
-    "rxjs-tslint-rules",
-    "tslint-config-prettier"
+    "./node_modules/tslint-defocus",
+    "./node_modules/rxjs-tslint-rules",
+    "./node_modules/tslint-config-prettier/lib/index.json"
+  ],
+  "rulesDirectory": [
+    "./node_modules/codelyzer",
+    "./node_modules/tslint-defocus/dist",
+    "./node_modules/tslint-plugin-prettier/rules"
   ],
-  "rulesDirectory": ["tslint-plugin-prettier"],
   "rules": {
     "arrow-return-shorthand": true,
     "array-type": [true, "array-simple"],
-- 
GitLab