From 637921f58e68fa83331a0c9efe90c8e0034147b8 Mon Sep 17 00:00:00 2001 From: isaacs Date: Fri, 28 Jun 2019 16:33:39 -0700 Subject: [PATCH] write-file-atomic@2.4.3 --- node_modules/write-file-atomic/CHANGELOG.md | 5 ++++ node_modules/write-file-atomic/index.js | 9 +++++-- node_modules/write-file-atomic/package.json | 26 ++++++++++++--------- package-lock.json | 6 ++--- package.json | 2 +- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/node_modules/write-file-atomic/CHANGELOG.md b/node_modules/write-file-atomic/CHANGELOG.md index 61fb4d22330e4..920ae2cb4d1fd 100644 --- a/node_modules/write-file-atomic/CHANGELOG.md +++ b/node_modules/write-file-atomic/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.4.3 + +* Ignore errors raised by `fs.closeSync` when cleaning up after a write + error. + # 2.4.2 * A pair of patches to fix some fd leaks. We would leak fds with sync use diff --git a/node_modules/write-file-atomic/index.js b/node_modules/write-file-atomic/index.js index fe9fdfb9db221..64ae987c011a9 100644 --- a/node_modules/write-file-atomic/index.js +++ b/node_modules/write-file-atomic/index.js @@ -209,7 +209,6 @@ function writeFileSync (filename, data, options) { var removeOnExitHandler = onExit(cleanup) try { - fd = fs.openSync(tmpfile, 'w', options.mode) if (Buffer.isBuffer(data)) { fs.writeSync(fd, data, 0, data.length, 0) @@ -225,7 +224,13 @@ function writeFileSync (filename, data, options) { fs.renameSync(tmpfile, filename) removeOnExitHandler() } catch (err) { - if (fd) fs.closeSync(fd) + if (fd) { + try { + fs.closeSync(fd) + } catch (ex) { + // ignore close errors at this stage, error may have closed fd already. + } + } removeOnExitHandler() cleanup() throw err diff --git a/node_modules/write-file-atomic/package.json b/node_modules/write-file-atomic/package.json index f8f55fbd22bfc..bffa0bbbb3472 100644 --- a/node_modules/write-file-atomic/package.json +++ b/node_modules/write-file-atomic/package.json @@ -1,31 +1,32 @@ { - "_from": "write-file-atomic@^2.3.0", - "_id": "write-file-atomic@2.4.2", + "_from": "write-file-atomic@^2.4.2", + "_id": "write-file-atomic@2.4.3", "_inBundle": false, - "_integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", + "_integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "_location": "/write-file-atomic", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "write-file-atomic@^2.3.0", + "raw": "write-file-atomic@^2.4.2", "name": "write-file-atomic", "escapedName": "write-file-atomic", - "rawSpec": "^2.3.0", + "rawSpec": "^2.4.2", "saveSpec": null, - "fetchSpec": "^2.3.0" + "fetchSpec": "^2.4.2" }, "_requiredBy": [ "#USER", "/", "/bin-links", + "/caching-transform", "/configstore", "/tap" ], - "_resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", - "_shasum": "a7181706dfba17855d221140a9c06e15fcdd87b9", - "_spec": "write-file-atomic@^2.3.0", - "_where": "/Users/zkat/Documents/code/work/npm", + "_resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "_shasum": "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481", + "_spec": "write-file-atomic@^2.4.2", + "_where": "/Users/isaacs/dev/npm/cli", "author": { "name": "Rebecca Turner", "email": "me@re-becca.org", @@ -65,7 +66,10 @@ "url": "git+ssh://git@github.com/iarna/write-file-atomic.git" }, "scripts": { + "postpublish": "git push origin --follow-tags", + "postversion": "npm publish", + "preversion": "npm test", "test": "standard && tap --100 test/*.js" }, - "version": "2.4.2" + "version": "2.4.3" } diff --git a/package-lock.json b/package-lock.json index 1527514a2afe5..107b5da1d9756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6484,9 +6484,9 @@ } }, "write-file-atomic": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz", - "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==", + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "requires": { "graceful-fs": "^4.1.11", "imurmurhash": "^0.1.4", diff --git a/package.json b/package.json index 9141c460721b8..20ddafe10710a 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,7 @@ "validate-npm-package-name": "~3.0.0", "which": "^1.3.1", "worker-farm": "^1.6.0", - "write-file-atomic": "^2.4.2" + "write-file-atomic": "^2.4.3" }, "bundleDependencies": [ "abbrev",