pacote 9.2.3 → 9.5.0

package/CHANGELOG.md

@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="9.5.0"></a>
+# [9.5.0](https://github.com/zkat/pacote/compare/v9.4.1...v9.5.0) (2019-02-18)
+
+
+### Features
+
+* **enjoy-by:** add `before` as an alias to enjoy-by ([75d62b7](https://github.com/zkat/pacote/commit/75d62b7))
+
+
+
+<a name="9.4.1"></a>
+## [9.4.1](https://github.com/zkat/pacote/compare/v9.4.0...v9.4.1) (2019-01-24)
+
+
+### Bug Fixes
+
+* **directory, finalize-manifest:** strip byte order marker from JSON ([723ad63](https://github.com/zkat/pacote/commit/723ad63))
+
+
+
+<a name="9.4.0"></a>
+# [9.4.0](https://github.com/zkat/pacote/compare/v9.3.0...v9.4.0) (2019-01-14)
+
+
+### Features
+
+* **registry:** fall back to fullfat if something might be wrong with corgis ([0e71d6b](https://github.com/zkat/pacote/commit/0e71d6b))
+
+
+
+<a name="9.3.0"></a>
+# [9.3.0](https://github.com/zkat/pacote/compare/v9.2.3...v9.3.0) (2018-12-21)
+
+
+### Bug Fixes
+
+* **git, file:** properly catch otherwise unhandled errors ([89d4897](https://github.com/zkat/pacote/commit/89d4897))
+* **test:** set umask opt to fix extract-stream 'accepts dmode/fmode/umask opts' ([e51de83](https://github.com/zkat/pacote/commit/e51de83))
+
+
+### Features
+
+* **git:** accept git path option ([#164](https://github.com/zkat/pacote/issues/164)) ([f06c8c5](https://github.com/zkat/pacote/commit/f06c8c5))
+
+
+
 <a name="9.2.3"></a>
 ## [9.2.3](https://github.com/zkat/pacote/compare/v9.2.2...v9.2.3) (2018-10-31)
 

package/README.md

@@ -231,7 +231,7 @@ even though npm itself does.
 
 ##### <a name="opts-enjoy-by"></a> `opts.enjoy-by`
 
-* Alias: `opts.enjoyBy`
+* Alias: `opts.enjoyBy`, `opts.before`
 * Type: Date-able
 * Default: undefined
 

package/lib/extract-stream.js

@@ -57,6 +57,7 @@ function extractStream (spec, dest, opts) {
     onwarn: msg => opts.log && opts.log.warn('tar', msg),
     uid: opts.uid,
     gid: opts.gid,
+    umask: opts.umask,
     transform: opts.resolved && pkgJsonTransform(spec, opts),
     onentry (entry) {
       if (entry.type.toLowerCase() === 'file') {

package/lib/fetchers/directory.js

@@ -5,6 +5,7 @@ const BB = require('bluebird')
 const Fetcher = require('../fetch')
 const glob = BB.promisify(require('glob'))
 const packDir = require('../util/pack-dir')
+const readJson = require('../util/read-json')
 const path = require('path')
 const pipe = BB.promisify(require('mississippi').pipe)
 const through = require('mississippi').through
@@ -34,11 +35,11 @@ Fetcher.impl(fetchDirectory, {
     const pkgPath = path.join(spec.fetchSpec, 'package.json')
     const srPath = path.join(spec.fetchSpec, 'npm-shrinkwrap.json')
     return BB.join(
-      readFileAsync(pkgPath).then(JSON.parse).catch({ code: 'ENOENT' }, err => {
+      readFileAsync(pkgPath).then(readJson).catch({ code: 'ENOENT' }, err => {
         err.code = 'ENOPACKAGEJSON'
         throw err
       }),
-      readFileAsync(srPath).then(JSON.parse).catch({ code: 'ENOENT' }, () => null),
+      readFileAsync(srPath).then(readJson).catch({ code: 'ENOENT' }, () => null),
       (pkg, sr) => {
         pkg._shrinkwrap = sr
         pkg._hasShrinkwrap = !!sr

package/lib/fetchers/file.js

@@ -68,7 +68,7 @@ Fetcher.impl(fetchFile, {
           return pipe(fs.createReadStream(src), stream)
         })
       }
-    }, err => stream.emit('error', err))
+    }).catch(err => stream.emit('error', err))
     return stream
   },
 

package/lib/fetchers/git.js

@@ -45,7 +45,7 @@ Fetcher.impl(fetchGit, {
           manifest, spec, opts
         ).on('integrity', i => stream.emit('integrity', i)), stream
       )
-    }, err => stream.emit('error', err))
+    }).catch(err => stream.emit('error', err))
     return stream
   },
 

package/lib/fetchers/registry/manifest.js

@@ -16,9 +16,10 @@ function manifest (spec, opts) {
 }
 
 function getManifest (spec, opts) {
-  return fetchPackument(spec, opts.concat({
+  opts = opts.concat({
     fullMetadata: opts.enjoyBy ? true : opts.fullMetadata
-  })).then(packument => {
+  })
+  return fetchPackument(spec, opts).then(packument => {
     try {
       return pickManifest(packument, spec.fetchSpec, {
         defaultTag: opts.defaultTag,
@@ -29,14 +30,15 @@ function getManifest (spec, opts) {
       if (err.code === 'ETARGET' && packument._cached && !opts.offline) {
         opts.log.silly(
           'registry:manifest',
-          `no matching version for ${spec.name}@${spec.fetchSpec} in the cache. Forcing revalidation`
+          `no matching version for ${spec.name}@${spec.fetchSpec} in the cache. Forcing revalidation.`
         )
         opts = opts.concat({
           preferOffline: false,
           preferOnline: true
         })
         return fetchPackument(spec, opts.concat({
-          fullMetadata: opts.enjoyBy ? true : opts.fullMetadata
+          // Fetch full metadata in case ETARGET was due to corgi delay
+          fullMetadata: true
         })).then(packument => {
           return pickManifest(packument, spec.fetchSpec, {
             defaultTag: opts.defaultTag,

package/lib/fetchers/registry/packument.js

@@ -59,7 +59,15 @@ function fetchPackument (uri, registry, spec, opts) {
       mem.set(memoKey, packument)
     }
     return packument
-  }))
+  })).catch(err => {
+    if (err.code === 'E404' && !opts.fullMetadata) {
+      return fetchPackument(uri, registry, spec, opts.concat({
+        fullMetadata: true
+      }))
+    } else {
+      throw err
+    }
+  })
 }
 
 class ObjProxy {

package/lib/finalize-manifest.js

@@ -13,6 +13,7 @@ const path = require('path')
 const pipe = BB.promisify(require('mississippi').pipe)
 const ssri = require('ssri')
 const tar = require('tar')
+const readJson = require('./util/read-json')
 
 // `finalizeManifest` takes as input the various kinds of manifests that
 // manifest handlers ('lib/fetchers/*.js#manifest()') return, and makes sure
@@ -212,7 +213,7 @@ function jsonFromStream (filename, dataStream) {
         entry.on('error', cb)
         finished(entry).then(() => {
           try {
-            cb(null, JSON.parse(data))
+            cb(null, readJson(data))
           } catch (err) {
             cb(err)
           }

package/lib/util/git.js

@@ -74,10 +74,10 @@ function fullClone (repo, committish, target, opts) {
   if (process.platform === 'win32') {
     gitArgs.push('--config', 'core.longpaths=true')
   }
-  return execGit(gitArgs, { cwd: target }).then(() => {
-    return execGit(['init'], { cwd: target })
+  return execGit(gitArgs, { cwd: target }, opts).then(() => {
+    return execGit(['init'], { cwd: target }, opts)
   }).then(() => {
-    return execGit(['checkout', committish || 'HEAD'], { cwd: target })
+    return execGit(['checkout', committish || 'HEAD'], { cwd: target }, opts)
   }).then(() => {
     return updateSubmodules(target, opts)
   }).then(() => headSha(target, opts))
@@ -182,7 +182,7 @@ function revs (repo, opts) {
 module.exports._exec = execGit
 function execGit (gitArgs, gitOpts, opts) {
   opts = optCheck(opts)
-  return checkGit().then(gitPath => {
+  return checkGit(opts).then(gitPath => {
     return promiseRetry((retry, number) => {
       if (number !== 1) {
         opts.log.silly('pacote', 'Retrying git command: ' + gitArgs.join(' ') + ' attempt # ' + number)
@@ -206,7 +206,7 @@ function execGit (gitArgs, gitOpts, opts) {
 module.exports._spawn = spawnGit
 function spawnGit (gitArgs, gitOpts, opts) {
   opts = optCheck(opts)
-  return checkGit().then(gitPath => {
+  return checkGit(opts).then(gitPath => {
     return promiseRetry((retry, number) => {
       if (number !== 1) {
         opts.log.silly('pacote', 'Retrying git command: ' + gitArgs.join(' ') + ' attempt # ' + number)
@@ -246,8 +246,10 @@ function mkOpts (_gitOpts, opts) {
   return gitOpts
 }
 
-function checkGit () {
-  if (!GITPATH) {
+function checkGit (opts) {
+  if (opts.git) {
+    return BB.resolve(opts.git)
+  } else if (!GITPATH) {
     const err = new Error('No git binary found in $PATH')
     err.code = 'ENOGIT'
     return BB.reject(err)

package/lib/util/opt-check.js

@@ -13,6 +13,7 @@ module.exports = figgyPudding({
   dmode: {},
   'enjoy-by': 'enjoyBy',
   enjoyBy: {},
+  before: 'enjoyBy',
   fmode: {},
   'fetch-retries': { default: 2 },
   'fetch-retry-factor': { default: 10 },
@@ -21,6 +22,7 @@ module.exports = figgyPudding({
   fullMetadata: 'full-metadata',
   'full-metadata': { default: false },
   gid: {},
+  git: {},
   includeDeprecated: { default: true },
   'include-deprecated': 'includeDeprecated',
   integrity: {},

package/lib/util/read-json.js

@@ -0,0 +1,15 @@
+'use strict'
+
+module.exports = function (content) {
+  // Code also yanked from read-package-json.
+  function stripBOM (content) {
+    content = content.toString()
+    // Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
+    // because the buffer-to-string conversion in `fs.readFileSync()`
+    // translates it to FEFF, the UTF-16 BOM.
+    if (content.charCodeAt(0) === 0xFEFF) return content.slice(1)
+    return content
+  }
+
+  return JSON.parse(stripBOM(content))
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacote",
-  "version": "9.2.3",
+  "version": "9.5.0",
   "description": "JavaScript package downloader",
   "main": "index.js",
   "files": [
@@ -41,12 +41,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "bluebird": "^3.5.2",
-    "cacache": "^11.2.0",
+    "bluebird": "^3.5.3",
+    "cacache": "^11.3.2",
     "figgy-pudding": "^3.5.1",
     "get-stream": "^4.1.0",
     "glob": "^7.1.3",
-    "lru-cache": "^4.1.3",
+    "lru-cache": "^5.1.1",
     "make-fetch-happen": "^4.0.1",
     "minimatch": "^3.0.4",
     "minipass": "^2.3.5",
@@ -65,19 +65,19 @@
     "safe-buffer": "^5.1.2",
     "semver": "^5.6.0",
     "ssri": "^6.0.1",
-    "tar": "^4.4.6",
+    "tar": "^4.4.8",
     "unique-filename": "^1.1.1",
     "which": "^1.3.1"
   },
   "devDependencies": {
-    "nock": "^10.0.1",
+    "nock": "^10.0.3",
     "npmlog": "^4.1.2",
     "nyc": "^13.1.0",
     "require-inject": "^1.4.3",
     "standard": "^12.0.1",
     "standard-version": "^4.4.0",
     "tacks": "^1.2.7",
-    "tap": "^12.0.1",
+    "tap": "^12.1.0",
     "tar-stream": "^1.6.2",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.7"