From 93143ca4e0e4ff069e5606ffba8c2d26565c2965 Mon Sep 17 00:00:00 2001 From: Jerry Zou Date: Tue, 11 Sep 2018 19:12:18 +0800 Subject: [PATCH] fix: replace native fs with graceful-fs --- index.js | 2 +- lib/SerializerAppend.js | 2 +- lib/SerializerAppend2.js | 2 +- lib/SerializerFile.js | 2 +- lib/SerializerJson.js | 2 +- lib/SystemPruneCaches.js | 2 +- lib/TransformNormalModuleFactoryPlugin.js | 2 +- lib/envHash.js | 2 +- lib/schema-4/_generate.js | 4 ++-- lib/util/index.js | 2 +- package.json | 1 + tests/fixtures/hard-source-confighash-dir/webpack.config.js | 2 +- tests/fixtures/hard-source-confighash/webpack.config.js | 2 +- tests/fixtures/hard-source-environmenthash/loader.js | 2 +- tests/fixtures/hard-source-environmenthash/webpack.config.js | 4 ++-- tests/fixtures/hard-source-md5/webpack.config.js | 2 +- tests/fixtures/hard-source-packageyarnlock-hash/loader.js | 2 +- .../hard-source-packageyarnlock-hash/webpack.config.js | 4 ++-- tests/fixtures/hard-source-prune/webpack.config.js | 2 +- tests/fixtures/loader-custom-context-dep/loader.js | 2 +- tests/fixtures/loader-custom-deep-context-dep/loader.js | 2 +- tests/fixtures/loader-custom-missing-dep-added/loader.js | 2 +- tests/fixtures/loader-custom-missing-dep/loader.js | 2 +- tests/fixtures/loader-custom-no-dep-moved/loader.js | 2 +- tests/fixtures/loader-custom-no-dep/loader.js | 2 +- tests/fixtures/loader-custom-prepend-helper/loader.js | 2 +- tests/hard-source.js | 2 +- tests/serializers.js | 2 +- tests/util/force-write-records.js | 2 +- tests/util/index.js | 2 +- 30 files changed, 33 insertions(+), 32 deletions(-) diff --git a/index.js b/index.js index 3d415def..8eb93c28 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ const crypto = require('crypto'); -const fs = require('fs'); +const fs = require('graceful-fs'); const path = require('path'); const lodash = require('lodash'); diff --git a/lib/SerializerAppend.js b/lib/SerializerAppend.js index 57afccda..d19cf6b0 100644 --- a/lib/SerializerAppend.js +++ b/lib/SerializerAppend.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const join = require('path').join; const Readable = require('stream').Readable; diff --git a/lib/SerializerAppend2.js b/lib/SerializerAppend2.js index 173b595e..f42b6fb5 100644 --- a/lib/SerializerAppend2.js +++ b/lib/SerializerAppend2.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const { join, resolve } = require('path'); const _mkdirp = require('mkdirp'); const _rimraf = require('rimraf'); diff --git a/lib/SerializerFile.js b/lib/SerializerFile.js index 92638637..569ac4a9 100644 --- a/lib/SerializerFile.js +++ b/lib/SerializerFile.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const join = require('path').join; const _mkdirp = require('mkdirp'); diff --git a/lib/SerializerJson.js b/lib/SerializerJson.js index 58ab2dbf..436cecab 100644 --- a/lib/SerializerJson.js +++ b/lib/SerializerJson.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const promisify = require('./util/promisify'); diff --git a/lib/SystemPruneCaches.js b/lib/SystemPruneCaches.js index 0d8f217a..64ee72cf 100644 --- a/lib/SystemPruneCaches.js +++ b/lib/SystemPruneCaches.js @@ -1,4 +1,4 @@ -const { readdir: _readdir, stat: _stat } = require('fs'); +const { readdir: _readdir, stat: _stat } = require('graceful-fs'); const { basename, join } = require('path'); const _rimraf = require('rimraf'); diff --git a/lib/TransformNormalModuleFactoryPlugin.js b/lib/TransformNormalModuleFactoryPlugin.js index 836abd5f..faa01e84 100644 --- a/lib/TransformNormalModuleFactoryPlugin.js +++ b/lib/TransformNormalModuleFactoryPlugin.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const path = require('path'); const cachePrefix = require('./util').cachePrefix; diff --git a/lib/envHash.js b/lib/envHash.js index 20efc248..31794d85 100644 --- a/lib/envHash.js +++ b/lib/envHash.js @@ -6,7 +6,7 @@ // - hash files const crypto = require('crypto'); -const fs = require('fs'); +const fs = require('graceful-fs'); const path = require('path'); const pkgDir = require('pkg-dir'); diff --git a/lib/schema-4/_generate.js b/lib/schema-4/_generate.js index a49f31ba..e1ade971 100644 --- a/lib/schema-4/_generate.js +++ b/lib/schema-4/_generate.js @@ -454,7 +454,7 @@ const constructorArguments = { }, **/ -const fs = require('fs'); +const fs = require('graceful-fs'); const path = require('path'); const generateRaw = fs.readFileSync(path.join(__dirname, '_generate.js'), 'utf8'); @@ -558,4 +558,4 @@ for (const dependency of dependencyInfo) { } output.push(``); -require('fs').writeFileSync(require('path').join(__dirname, 'index.js'), output.join('\n'), 'utf8'); +require('graceful-fs').writeFileSync(require('path').join(__dirname, 'index.js'), output.join('\n'), 'utf8'); diff --git a/lib/util/index.js b/lib/util/index.js index 5df22b12..6fc6a0bb 100644 --- a/lib/util/index.js +++ b/lib/util/index.js @@ -1,4 +1,4 @@ -const fs = require('fs'); +const fs = require('graceful-fs'); const path = require('path'); const logMessages = require('./log-messages'); diff --git a/package.json b/package.json index a38f3786..c23167f2 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "dependencies": { "chalk": "^2.4.1", "find-cache-dir": "^2.0.0", + "graceful-fs": "^4.1.11", "jsonlint": "^1.6.3", "lodash": "^4.15.0", "mkdirp": "^0.5.1", diff --git a/tests/fixtures/hard-source-confighash-dir/webpack.config.js b/tests/fixtures/hard-source-confighash-dir/webpack.config.js index 885a0fcf..26e8425a 100644 --- a/tests/fixtures/hard-source-confighash-dir/webpack.config.js +++ b/tests/fixtures/hard-source-confighash-dir/webpack.config.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); diff --git a/tests/fixtures/hard-source-confighash/webpack.config.js b/tests/fixtures/hard-source-confighash/webpack.config.js index a62609c6..87915068 100644 --- a/tests/fixtures/hard-source-confighash/webpack.config.js +++ b/tests/fixtures/hard-source-confighash/webpack.config.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); diff --git a/tests/fixtures/hard-source-environmenthash/loader.js b/tests/fixtures/hard-source-environmenthash/loader.js index 693807a3..94778745 100644 --- a/tests/fixtures/hard-source-environmenthash/loader.js +++ b/tests/fixtures/hard-source-environmenthash/loader.js @@ -1,3 +1,3 @@ module.exports = function(source) { - return require('fs').readFileSync('./vendor/lib1.js') + source; + return require('graceful-fs').readFileSync('./vendor/lib1.js') + source; }; diff --git a/tests/fixtures/hard-source-environmenthash/webpack.config.js b/tests/fixtures/hard-source-environmenthash/webpack.config.js index 3e829a81..3836ebfd 100644 --- a/tests/fixtures/hard-source-environmenthash/webpack.config.js +++ b/tests/fixtures/hard-source-environmenthash/webpack.config.js @@ -1,10 +1,10 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); var hardSourceConfig = eval( '(function() { return (' + - require('fs') + require('graceful-fs') .readFileSync(__dirname + '/hard-source-config.js', 'utf8') + '); })' )(); diff --git a/tests/fixtures/hard-source-md5/webpack.config.js b/tests/fixtures/hard-source-md5/webpack.config.js index a62609c6..87915068 100644 --- a/tests/fixtures/hard-source-md5/webpack.config.js +++ b/tests/fixtures/hard-source-md5/webpack.config.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); diff --git a/tests/fixtures/hard-source-packageyarnlock-hash/loader.js b/tests/fixtures/hard-source-packageyarnlock-hash/loader.js index 693807a3..94778745 100644 --- a/tests/fixtures/hard-source-packageyarnlock-hash/loader.js +++ b/tests/fixtures/hard-source-packageyarnlock-hash/loader.js @@ -1,3 +1,3 @@ module.exports = function(source) { - return require('fs').readFileSync('./vendor/lib1.js') + source; + return require('graceful-fs').readFileSync('./vendor/lib1.js') + source; }; diff --git a/tests/fixtures/hard-source-packageyarnlock-hash/webpack.config.js b/tests/fixtures/hard-source-packageyarnlock-hash/webpack.config.js index 3e829a81..3836ebfd 100644 --- a/tests/fixtures/hard-source-packageyarnlock-hash/webpack.config.js +++ b/tests/fixtures/hard-source-packageyarnlock-hash/webpack.config.js @@ -1,10 +1,10 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); var hardSourceConfig = eval( '(function() { return (' + - require('fs') + require('graceful-fs') .readFileSync(__dirname + '/hard-source-config.js', 'utf8') + '); })' )(); diff --git a/tests/fixtures/hard-source-prune/webpack.config.js b/tests/fixtures/hard-source-prune/webpack.config.js index f43cce31..a9bf0ffd 100644 --- a/tests/fixtures/hard-source-prune/webpack.config.js +++ b/tests/fixtures/hard-source-prune/webpack.config.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var HardSourceWebpackPlugin = require('../../..'); diff --git a/tests/fixtures/loader-custom-context-dep/loader.js b/tests/fixtures/loader-custom-context-dep/loader.js index b81b18b5..f3548094 100644 --- a/tests/fixtures/loader-custom-context-dep/loader.js +++ b/tests/fixtures/loader-custom-context-dep/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) { diff --git a/tests/fixtures/loader-custom-deep-context-dep/loader.js b/tests/fixtures/loader-custom-deep-context-dep/loader.js index 49d96062..1ac30848 100644 --- a/tests/fixtures/loader-custom-deep-context-dep/loader.js +++ b/tests/fixtures/loader-custom-deep-context-dep/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) { diff --git a/tests/fixtures/loader-custom-missing-dep-added/loader.js b/tests/fixtures/loader-custom-missing-dep-added/loader.js index d7b211af..668a0881 100644 --- a/tests/fixtures/loader-custom-missing-dep-added/loader.js +++ b/tests/fixtures/loader-custom-missing-dep-added/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) { diff --git a/tests/fixtures/loader-custom-missing-dep/loader.js b/tests/fixtures/loader-custom-missing-dep/loader.js index eeefc654..05d8e113 100644 --- a/tests/fixtures/loader-custom-missing-dep/loader.js +++ b/tests/fixtures/loader-custom-missing-dep/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) { diff --git a/tests/fixtures/loader-custom-no-dep-moved/loader.js b/tests/fixtures/loader-custom-no-dep-moved/loader.js index 095cfac3..bca737c3 100644 --- a/tests/fixtures/loader-custom-no-dep-moved/loader.js +++ b/tests/fixtures/loader-custom-no-dep-moved/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) {}; diff --git a/tests/fixtures/loader-custom-no-dep/loader.js b/tests/fixtures/loader-custom-no-dep/loader.js index 4b2bd5a3..2c4068b0 100644 --- a/tests/fixtures/loader-custom-no-dep/loader.js +++ b/tests/fixtures/loader-custom-no-dep/loader.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); module.exports = function(source) {}; diff --git a/tests/fixtures/loader-custom-prepend-helper/loader.js b/tests/fixtures/loader-custom-prepend-helper/loader.js index e689e097..60056f49 100644 --- a/tests/fixtures/loader-custom-prepend-helper/loader.js +++ b/tests/fixtures/loader-custom-prepend-helper/loader.js @@ -2,5 +2,5 @@ module.exports = function(source) { this.cacheable && this.cacheable(); var helperPath = require.resolve('./loader-helper.js'); this.addDependency(helperPath); - return require('fs').readFileSync(helperPath, 'utf8') + source; + return require('graceful-fs').readFileSync(helperPath, 'utf8') + source; }; diff --git a/tests/hard-source.js b/tests/hard-source.js index 4636ca14..c89532d4 100644 --- a/tests/hard-source.js +++ b/tests/hard-source.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var expect = require('chai').expect; diff --git a/tests/serializers.js b/tests/serializers.js index eae7eeaa..5fc4d803 100644 --- a/tests/serializers.js +++ b/tests/serializers.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var join = require('path').join; var expect = require('chai').expect; diff --git a/tests/util/force-write-records.js b/tests/util/force-write-records.js index 11a9b065..f7a1417d 100644 --- a/tests/util/force-write-records.js +++ b/tests/util/force-write-records.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); function ForceWriteRecords() {} diff --git a/tests/util/index.js b/tests/util/index.js index 2361704b..12ae0e50 100644 --- a/tests/util/index.js +++ b/tests/util/index.js @@ -1,4 +1,4 @@ -var fs = require('fs'); +var fs = require('graceful-fs'); var path = require('path'); var vm = require('vm');