update-browserslist-db 1.0.8 → 1.0.10

package/index.js

@@ -4,7 +4,7 @@ let pico = require('picocolors')
 let path = require('path')
 let fs = require('fs')
 
-const { detectIndent } = require('./utils')
+const { detectIndent, detectEOL } = require('./utils')
 
 function BrowserslistUpdateError(message) {
   this.name = 'BrowserslistUpdateError'
@@ -68,6 +68,11 @@ function getLatestInfo(lock) {
       )
     }
   }
+  if (lock.mode === 'pnpm') {
+    return JSON.parse(
+      childProcess.execSync('pnpm info caniuse-lite --json').toString()
+    )
+  }
   return JSON.parse(
     childProcess.execSync('npm show caniuse-lite --json').toString()
   )
@@ -162,11 +167,17 @@ function updateYarnLockfile(lock, latest) {
 function updateLockfile(lock, latest) {
   if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
 
+  let updatedLockFile
   if (lock.mode === 'yarn') {
-    return updateYarnLockfile(lock, latest)
+    updatedLockFile = updateYarnLockfile(lock, latest)
   } else {
-    return updateNpmLockfile(lock, latest)
+    updatedLockFile = updateNpmLockfile(lock, latest)
   }
+  updatedLockFile.content = updatedLockFile.content.replace(
+    /\n/g,
+    detectEOL(lock.content)
+  )
+  return updatedLockFile
 }
 
 function updatePackageManually(print, lock, latest) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "update-browserslist-db",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "CLI tool to update caniuse-lite to refresh target browsers from Browserslist config",
   "keywords": [
     "caniuse",

package/utils.js

@@ -1,9 +1,22 @@
-const DEFAULT_INDENT = '  '
-const INDENT_REGEXP = /^([ \t]+)[^\s]/m
+const { EOL } = require('os')
 
-module.exports.detectIndent = text => {
-  let match = INDENT_REGEXP.exec(text)
+const getFirstRegexpMatchOrDefault = (text, regexp, defaultValue) => {
+  regexp.lastIndex = 0 // https://stackoverflow.com/a/11477448/4536543
+  let match = regexp.exec(text)
   if (match !== null) return match[1]
-  return DEFAULT_INDENT
+  return defaultValue
 }
+
+const DEFAULT_INDENT = '  '
+const INDENT_REGEXP = /^([ \t]+)[^\s]/m
+
+module.exports.detectIndent = text =>
+  getFirstRegexpMatchOrDefault(text, INDENT_REGEXP, DEFAULT_INDENT)
 module.exports.DEFAULT_INDENT = DEFAULT_INDENT
+
+const DEFAULT_EOL = EOL
+const EOL_REGEXP = /(\r\n|\n|\r)/g
+
+module.exports.detectEOL = text =>
+  getFirstRegexpMatchOrDefault(text, EOL_REGEXP, DEFAULT_EOL)
+module.exports.DEFAULT_EOL = DEFAULT_EOL