From 049b0a5f8a8eed92b7b148877c5b9e1141e56666 Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 15 Aug 2019 10:34:34 -0700 Subject: [PATCH] pacote@9.5.6 --- node_modules/pacote/CHANGELOG.md | 10 ++++++++++ node_modules/pacote/extract.js | 6 +++--- node_modules/pacote/package.json | 23 ++++++++++++----------- package-lock.json | 9 +++++---- package.json | 2 +- 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md index f807fa455ded1..0fba39b95d7a2 100644 --- a/node_modules/pacote/CHANGELOG.md +++ b/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,16 @@ 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. + +## [9.5.6](https://github.com/npm/pacote/compare/v9.5.5...v9.5.6) (2019-08-15) + + +### Bug Fixes + +* **extract:** chown properly when more than one directory is made ([5161828](https://github.com/npm/pacote/commit/5161828)) + + + ## [9.5.5](https://github.com/npm/pacote/compare/v9.5.4...v9.5.5) (2019-08-12) diff --git a/node_modules/pacote/extract.js b/node_modules/pacote/extract.js index 9f740e37c314d..24fdbf02da274 100644 --- a/node_modules/pacote/extract.js +++ b/node_modules/pacote/extract.js @@ -11,7 +11,7 @@ const path = require('path') const rimraf = BB.promisify(require('rimraf')) const withTarballStream = require('./lib/with-tarball-stream.js') const inferOwner = require('infer-owner') -const chown = BB.promisify(fs.chown) +const chown = BB.promisify(require('chownr')) const truncateAsync = BB.promisify(fs.truncate) const readFileAsync = BB.promisify(fs.readFile) @@ -72,12 +72,12 @@ function tryExtract (spec, tarStream, dest, opts) { rimraf(dest) .then(() => mkdirp(dest)) - .then(() => { + .then((made) => { // respect the current ownership of unpack targets if (typeof selfOwner.uid === 'number' && typeof selfOwner.gid === 'number' && selfOwner.uid !== opts.uid && selfOwner.gid !== opts.gid) { - return chown(dest, opts.uid, opts.gid) + return chown(made || dest, opts.uid, opts.gid) } }) .then(() => { diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index 85b5b86f366b8..342970bb21439 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,8 +1,8 @@ { - "_from": "pacote@9.5.5", - "_id": "pacote@9.5.5", + "_from": "pacote@9.5.6", + "_id": "pacote@9.5.6", "_inBundle": false, - "_integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==", + "_integrity": "sha512-WyfTZU04KGx9h+ZD37vSmCK0KZMAPp2XTVhWdue7/1bAxBYM3YtyBGz1CNgiOvl3u5TYRT8RG4duhyXxQvaIxw==", "_location": "/pacote", "_phantomChildren": { "safe-buffer": "5.1.2", @@ -11,12 +11,12 @@ "_requested": { "type": "version", "registry": true, - "raw": "pacote@9.5.5", + "raw": "pacote@9.5.6", "name": "pacote", "escapedName": "pacote", - "rawSpec": "9.5.5", + "rawSpec": "9.5.6", "saveSpec": null, - "fetchSpec": "9.5.5" + "fetchSpec": "9.5.6" }, "_requiredBy": [ "#USER", @@ -24,9 +24,9 @@ "/libcipm", "/libnpm" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz", - "_shasum": "63355a393614c3424e735820c3731e2cbbedaeeb", - "_spec": "pacote@9.5.5", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.6.tgz", + "_shasum": "1f749e25d82921941cf02e58e3312053940e5ea0", + "_spec": "pacote@9.5.6", "_where": "/Users/isaacs/dev/npm/cli", "author": { "name": "Kat Marchán", @@ -49,6 +49,7 @@ "dependencies": { "bluebird": "^3.5.3", "cacache": "^12.0.2", + "chownr": "^1.1.2", "figgy-pudding": "^3.5.1", "get-stream": "^4.1.0", "glob": "^7.1.3", @@ -72,7 +73,7 @@ "safe-buffer": "^5.1.2", "semver": "^5.6.0", "ssri": "^6.0.1", - "tar": "^4.4.8", + "tar": "^4.4.10", "unique-filename": "^1.1.1", "which": "^1.3.1" }, @@ -118,5 +119,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "9.5.5" + "version": "9.5.6" } diff --git a/package-lock.json b/package-lock.json index 1ee37b3cd7d02..8d3321865f401 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4385,12 +4385,13 @@ } }, "pacote": { - "version": "9.5.5", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz", - "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==", + "version": "9.5.6", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.6.tgz", + "integrity": "sha512-WyfTZU04KGx9h+ZD37vSmCK0KZMAPp2XTVhWdue7/1bAxBYM3YtyBGz1CNgiOvl3u5TYRT8RG4duhyXxQvaIxw==", "requires": { "bluebird": "^3.5.3", "cacache": "^12.0.2", + "chownr": "^1.1.2", "figgy-pudding": "^3.5.1", "get-stream": "^4.1.0", "glob": "^7.1.3", @@ -4414,7 +4415,7 @@ "safe-buffer": "^5.1.2", "semver": "^5.6.0", "ssri": "^6.0.1", - "tar": "^4.4.8", + "tar": "^4.4.10", "unique-filename": "^1.1.1", "which": "^1.3.1" }, diff --git a/package.json b/package.json index a5f057a11bf97..538b5be43c118 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "once": "~1.4.0", "opener": "^1.5.1", "osenv": "^0.1.5", - "pacote": "^9.5.5", + "pacote": "^9.5.6", "path-is-inside": "~1.0.2", "promise-inflight": "~1.0.1", "qrcode-terminal": "^0.12.0",