From 938ed1c76ddf0eb82b38f7200fe7e79d4b3279a1 Mon Sep 17 00:00:00 2001
From: Joao Dias <alfa.project@gmail.com>
Date: Sat, 29 Oct 2016 12:38:39 +0200
Subject: [PATCH] chore(lint): deduplicate tslint dependency

---
 npm-shrinkwrap.clean.json | 50 +++++---------------------
 npm-shrinkwrap.json       | 74 +++++++--------------------------------
 package.json              |  2 +-
 3 files changed, 22 insertions(+), 104 deletions(-)

diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 0fe1cb49ed..6a8e9ebb16 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -5522,36 +5522,20 @@
       }
     },
     "tslint": {
-      "version": "3.15.0-dev.0",
+      "version": "3.15.1",
       "dev": true,
       "dependencies": {
-        "findup-sync": {
-          "version": "0.3.0",
-          "dev": true,
-          "dependencies": {
-            "glob": {
-              "version": "5.0.15",
-              "dev": true
-            }
-          }
-        },
         "glob": {
-          "version": "7.0.6",
-          "dev": true,
-          "dependencies": {
-            "minimatch": {
-              "version": "3.0.3",
-              "dev": true
-            }
-          }
+          "version": "7.1.1",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.0.3",
+          "dev": true
         },
         "resolve": {
           "version": "1.1.7",
           "dev": true
-        },
-        "underscore.string": {
-          "version": "3.3.4",
-          "dev": true
         }
       }
     },
@@ -5769,25 +5753,7 @@
     },
     "vrsource-tslint-rules": {
       "version": "0.14.1",
-      "dev": true,
-      "dependencies": {
-        "glob": {
-          "version": "7.1.1",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.0.3",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "dev": true
-        },
-        "tslint": {
-          "version": "3.15.1",
-          "dev": true
-        }
-      }
+      "dev": true
     },
     "watchpack": {
       "version": "0.2.9",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a004cba209..4483264c96 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -8050,50 +8050,28 @@
       }
     },
     "tslint": {
-      "version": "3.15.0-dev.0",
-      "from": "tslint@next",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.0-dev.0.tgz",
+      "version": "3.15.1",
+      "from": "tslint@>=3.6.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz",
       "dev": true,
       "dependencies": {
-        "findup-sync": {
-          "version": "0.3.0",
-          "from": "findup-sync@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-          "dev": true,
-          "dependencies": {
-            "glob": {
-              "version": "5.0.15",
-              "from": "glob@>=5.0.0 <5.1.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-              "dev": true
-            }
-          }
-        },
         "glob": {
-          "version": "7.0.6",
+          "version": "7.1.1",
           "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "dev": true,
-          "dependencies": {
-            "minimatch": {
-              "version": "3.0.3",
-              "from": "minimatch@>=3.0.2 <4.0.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-              "dev": true
-            }
-          }
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "3.0.3",
+          "from": "minimatch@>=3.0.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+          "dev": true
         },
         "resolve": {
           "version": "1.1.7",
           "from": "resolve@>=1.1.7 <2.0.0",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
           "dev": true
-        },
-        "underscore.string": {
-          "version": "3.3.4",
-          "from": "underscore.string@>=3.3.4 <4.0.0",
-          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz",
-          "dev": true
         }
       }
     },
@@ -8409,33 +8387,7 @@
       "version": "0.14.1",
       "from": "vrsource-tslint-rules@latest",
       "resolved": "https://registry.npmjs.org/vrsource-tslint-rules/-/vrsource-tslint-rules-0.14.1.tgz",
-      "dev": true,
-      "dependencies": {
-        "glob": {
-          "version": "7.1.1",
-          "from": "glob@>=7.0.3 <8.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz",
-          "dev": true
-        },
-        "minimatch": {
-          "version": "3.0.3",
-          "from": "minimatch@>=3.0.2 <4.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "from": "resolve@>=1.1.7 <2.0.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "dev": true
-        },
-        "tslint": {
-          "version": "3.15.1",
-          "from": "tslint@>=3.6.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/tslint/-/tslint-3.15.1.tgz",
-          "dev": true
-        }
-      }
+      "dev": true
     },
     "watchpack": {
       "version": "0.2.9",
diff --git a/package.json b/package.json
index 15dd0584ad..afc6551843 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "systemjs": "0.18.10",
     "ts-api-guardian": "0.1.4",
     "tsickle": "^0.1.7",
-    "tslint": "^3.15.0-dev.0",
+    "tslint": "^3.15.1",
     "typescript": "^2.0.2",
     "universal-analytics": "^0.3.9",
     "vrsource-tslint-rules": "^0.14.1",