fix: extend config correctly

EndemolShineGroup · Oct 8, 2018 · 18e5ace · 18e5ace
1 parent f29f28e
commit 18e5ace
Show file tree

Hide file tree

Showing 4 changed files with 1,019 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,9 @@
     "semantic-release": "semantic-release"
   },
   "peerDependencies": {
-    "tslint": ">=5.6.0"
+    "tslint": ">=5.6.0",
+    "tslint-eslint-rules": ">=5.4.0",
+    "tslint-config-prettier": ">=1.15.0"
   },
   "dependencies": {},
   "devDependencies": {
@@ -49,8 +51,8 @@
     "semantic-release": "^15",
     "ts-jest": "^23.10.0-beta.1",
     "tslint": "^5",
-    "tslint-config-esg": "github:EndemolShineGroup/tslint-config-esg",
-    "tslint-config-prettier": "^1",
+    "tslint-eslint-rules": "^5.4.0",
+    "tslint-config-prettier": "^1.15.0",
     "typedoc": "^0.12.0",
     "typescript": "^3"
   },

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
 export = {
+  extends: ['tslint-eslint-rules', 'tslint-config-prettier'],
   rules: {
     /**
      * ES6

diff --git a/tslint.json b/tslint.json
@@ -1,7 +1,8 @@
 {
   "defaultSeverity": "warning",
   "extends": [
-    "tslint-config-esg",
+    "tslint-eslint-rules",
+    ".",
     "tslint-config-prettier"
   ]
 }