From fba4babdcde530e1f251646b5a9bfaf19d2fc2d2 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Wed, 10 May 2017 16:55:17 +0200
Subject: [PATCH] Don't show npm lockfiles by default (#3611)

---
 lib/linguist/generated.rb | 8 ++++----
 test/test_generated.rb    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/linguist/generated.rb b/lib/linguist/generated.rb
index 9699bff9..2d096a04 100644
--- a/lib/linguist/generated.rb
+++ b/lib/linguist/generated.rb
@@ -57,7 +57,7 @@ module Linguist
       composer_lock? ||
       node_modules? ||
       go_vendor? ||
-      npm_shrinkwrap? ||
+      npm_shrinkwrap_or_package_lock? ||
       godeps? ||
       generated_by_zephir? ||
       minified_files? ||
@@ -326,11 +326,11 @@ module Linguist
       !!name.match(/vendor\/((?!-)[-0-9A-Za-z]+(?<!-)\.)+(com|edu|gov|in|me|net|org|fm|io)/)
     end
 
-    # Internal: Is the blob a generated npm shrinkwrap file?
+    # Internal: Is the blob a generated npm shrinkwrap or package lock file?
     #
     # Returns true or false.
-    def npm_shrinkwrap?
-      !!name.match(/npm-shrinkwrap\.json/)
+    def npm_shrinkwrap_or_package_lock?
+      name.match(/npm-shrinkwrap\.json/) || name.match(/package-lock\.json/)
     end
 
     # Internal: Is the blob part of Godeps/,
diff --git a/test/test_generated.rb b/test/test_generated.rb
index d12108d7..2eab13f4 100644
--- a/test/test_generated.rb
+++ b/test/test_generated.rb
@@ -58,6 +58,7 @@ class TestGenerated < Minitest::Test
 
     # npm shrinkwrap file
     generated_sample_without_loading_data("Dummy/npm-shrinkwrap.json")
+    generated_sample_without_loading_data("Dummy/package-lock.json")
 
     # Godep saved dependencies
     generated_sample_without_loading_data("Godeps/Godeps.json")