remove format-shrinkwrap property and name condition

npm · Sep 12, 2019 · 9f31a4b · 9f31a4b
1 parent 5ad00eb
commit 9f31a4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/doc/misc/npm-config.md b/doc/misc/npm-config.md
@@ -392,14 +392,7 @@ Makes various commands more forceful.
 * Default: true
 * Type: Boolean
 
-Format `package-lock.json` as a human readable file.
-
-### format-shrinkwrap
-
-* Default: true
-* Type: Boolean
-
-Format `npm-shrinkwrap.json` as a human readable file.
+Format `package-lock.json` or `npm-shrinkwrap.json` as a human readable file.
 
 ### fetch-retries
 

diff --git a/lib/config/defaults.js b/lib/config/defaults.js
@@ -142,7 +142,6 @@ Object.defineProperty(exports, 'defaults', {get: function () {
     'engine-strict': false,
     force: false,
     'format-package-lock': true,
-    'format-shrinkwrap': true,
 
     'fetch-retries': 2,
     'fetch-retry-factor': 10,
@@ -285,7 +284,6 @@ exports.types = {
   'engine-strict': Boolean,
   force: Boolean,
   'format-package-lock': Boolean,
-  'format-shrinkwrap': Boolean,
   'fetch-retries': Number,
   'fetch-retry-factor': Number,
   'fetch-retry-mintimeout': Number,

diff --git a/lib/shrinkwrap.js b/lib/shrinkwrap.js
@@ -284,15 +284,10 @@ function checkPackageFile (dir, name) {
   ).then((data) => {
     let indent
     let newline
-    if (name === PKGLOCK && npm.config.get('format-package-lock') === false) {
+    if (npm.config.get('format-package-lock') === false) {
       indent = 0
       newline = 0
-    }
-    else if (name === SHRINKWRAP && npm.config.get('format-shrinkwrap') === false) {
-      indent = 0
-      newline = 0
-    }
-    else {
+    } else {
       indent = detectIndent(data).indent
       newline = detectNewline(data)
     }