diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-12 15:59:20 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-25 06:57:22 +0000 |
commit | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (patch) | |
tree | caed19b2af2024f35449fb0b781d0a25e09d4f8f /chromium/third_party/devtools-frontend/src/node_modules/tar-fs | |
parent | 9729c4479fe23554eae6e6dd1f30ff488f470c84 (diff) | |
download | qtwebengine-chromium-f7eaed5286974984ba5f9e3189d8f49d03e99f81.tar.gz |
BASELINE: Update Chromium to 100.0.4896.167
Change-Id: I98cbeb5d7543d966ffe04d8cefded0c493a11333
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/devtools-frontend/src/node_modules/tar-fs')
4 files changed, 21 insertions, 15 deletions
diff --git a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/.travis.yml b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/.travis.yml index 5911b74d235..977f7a614b5 100644 --- a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/.travis.yml +++ b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/.travis.yml @@ -1,5 +1,6 @@ language: node_js node_js: - - 6 - 8 - 10 + - 12 + - 14 diff --git a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/README.md b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/README.md index acdc843f201..c6d35cfa84f 100644 --- a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/README.md +++ b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/README.md @@ -81,6 +81,8 @@ Similarly you can use `mapStream` incase you wanna modify the input/output file ``` js var pack = tar.pack('./my-directory', { mapStream: function(fileStream, header) { + // NOTE: the returned stream HAS to have the same length as the input stream. + // If not make sure to update the size in the header passed in here. if (path.extname(header.name) === '.js') { return fileStream.pipe(someTransform) } @@ -155,8 +157,8 @@ var mypack = tar.pack('./my-directory', { Packing and extracting a 6.1 GB with 2496 directories and 2398 files yields the following results on my Macbook Air. [See the benchmark here](https://gist.github.com/mafintosh/8102201) -* tar-fs: 34.261 ms -* [node-tar](https://github.com/isaacs/node-tar): 366.123 ms (or 10x slower) +* tar-fs: 34.261 seconds +* [node-tar](https://github.com/isaacs/node-tar): 366.123 seconds (or 10x slower) ## License diff --git a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/index.js b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/index.js index 0fd0433e050..18a28ee2145 100644 --- a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/index.js +++ b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/index.js @@ -1,7 +1,7 @@ var chownr = require('chownr') var tar = require('tar-stream') var pump = require('pump') -var mkdirp = require('mkdirp') +var mkdirp = require('mkdirp-classic') var fs = require('fs') var path = require('path') var os = require('os') @@ -26,7 +26,7 @@ var statAll = function (fs, stat, cwd, ignore, entries, sort) { var next = queue.shift() var nextAbs = path.join(cwd, next) - stat(nextAbs, function (err, stat) { + stat.call(fs, nextAbs, function (err, stat) { if (err) return callback(err) if (!stat.isDirectory()) return callback(null, next, stat) @@ -138,7 +138,7 @@ exports.pack = function (cwd, opts) { var entry = pack.entry(header, onnextentry) if (!entry) return - var rs = mapStream(xfs.createReadStream(path.join(cwd, filename)), header) + var rs = mapStream(xfs.createReadStream(path.join(cwd, filename), { start: 0, end: header.size > 0 ? header.size - 1 : header.size }), header) rs.on('error', function (err) { // always forward errors on destroy entry.destroy(err) @@ -227,12 +227,15 @@ exports.extract = function (cwd, opts) { if (!chmod) return cb() var mode = (header.mode | (header.type === 'directory' ? dmode : fmode)) & umask - chmod(name, mode, function (err) { + + if (chown && own) chown.call(xfs, name, header.uid, header.gid, onchown) + else onchown(null) + + function onchown (err) { if (err) return cb(err) - if (!own) return cb() - if (!chown) return cb() - chown(name, header.uid, header.gid, cb) - }) + if (!chmod) return cb() + chmod.call(xfs, name, mode, cb) + } } extract.on('entry', function (header, stream, next) { diff --git a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/package.json b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/package.json index 58c3ccdcd45..165bcce3e6f 100644 --- a/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/package.json +++ b/chromium/third_party/devtools-frontend/src/node_modules/tar-fs/package.json @@ -1,12 +1,12 @@ { "name": "tar-fs", - "version": "2.0.0", + "version": "2.1.1", "description": "filesystem bindings for tar-stream", "dependencies": { "chownr": "^1.1.1", - "mkdirp": "^0.5.1", + "mkdirp-classic": "^0.5.2", "pump": "^3.0.0", - "tar-stream": "^2.0.0" + "tar-stream": "^2.1.4" }, "keywords": [ "tar", @@ -18,7 +18,7 @@ ], "devDependencies": { "rimraf": "^2.6.3", - "standard": "^12.0.1", + "standard": "^13.0.1", "tape": "^4.9.2" }, "scripts": { |