From 864e5631738b79c3a70204deda756b81e6eb566d Mon Sep 17 00:00:00 2001 From: Suguru Motegi Date: Sat, 10 Feb 2018 20:27:09 -0800 Subject: [PATCH] replace Async with Neo-Async --- examples/build-common.js | 2 +- lib/AutomaticPrefetchPlugin.js | 2 +- lib/CachePlugin.js | 2 +- lib/Compilation.js | 2 +- lib/Compiler.js | 5 ++--- lib/ContextModuleFactory.js | 2 +- lib/LibManifestPlugin.js | 2 +- lib/MultiCompiler.js | 2 +- lib/MultiWatching.js | 2 +- lib/NormalModuleFactory.js | 2 +- package.json | 2 +- test/BenchmarkTestCases.benchmark.js | 2 +- test/cases/loaders/issue-2299/loader/index.js | 2 +- yarn.lock | 4 ++++ 14 files changed, 18 insertions(+), 15 deletions(-) diff --git a/examples/build-common.js b/examples/build-common.js index 19de54f54..afca1e4d7 100644 --- a/examples/build-common.js +++ b/examples/build-common.js @@ -8,7 +8,7 @@ const cp = require("child_process"); const path = require("path"); const tc = require("./template-common"); const fs = require("fs"); -const async = require("async"); +const async = require("neo-async"); const extraArgs = ""; diff --git a/lib/AutomaticPrefetchPlugin.js b/lib/AutomaticPrefetchPlugin.js index 6989d6228..fd0c75609 100644 --- a/lib/AutomaticPrefetchPlugin.js +++ b/lib/AutomaticPrefetchPlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const PrefetchDependency = require("./dependencies/PrefetchDependency"); const NormalModule = require("./NormalModule"); diff --git a/lib/CachePlugin.js b/lib/CachePlugin.js index 161418de8..4a11e02ed 100644 --- a/lib/CachePlugin.js +++ b/lib/CachePlugin.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); class CachePlugin { constructor(cache) { diff --git a/lib/Compilation.js b/lib/Compilation.js index b8ebbd879..6fcbf42e0 100644 --- a/lib/Compilation.js +++ b/lib/Compilation.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const util = require("util"); const Tapable = require("tapable").Tapable; const SyncHook = require("tapable").SyncHook; diff --git a/lib/Compiler.js b/lib/Compiler.js index bc54f681b..2787734e6 100644 --- a/lib/Compiler.js +++ b/lib/Compiler.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const path = require("path"); const util = require("util"); const Tapable = require("tapable").Tapable; @@ -255,7 +255,7 @@ class Compiler extends Tapable { const emitFiles = (err) => { if(err) return callback(err); - asyncLib.forEach(Object.keys(compilation.assets), (file, callback) => { + asyncLib.forEach(compilation.assets, (source, file, callback) => { let targetFile = file; const queryStringIdx = targetFile.indexOf("?"); @@ -266,7 +266,6 @@ class Compiler extends Tapable { const writeOut = (err) => { if(err) return callback(err); const targetPath = this.outputFileSystem.join(outputPath, targetFile); - const source = compilation.assets[file]; if(source.existsAt === targetPath) { source.emitted = false; return callback(); diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js index 2deddf23f..faadb758f 100644 --- a/lib/ContextModuleFactory.js +++ b/lib/ContextModuleFactory.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const path = require("path"); const Tapable = require("tapable").Tapable; diff --git a/lib/LibManifestPlugin.js b/lib/LibManifestPlugin.js index 255e72244..d05e15ad2 100644 --- a/lib/LibManifestPlugin.js +++ b/lib/LibManifestPlugin.js @@ -5,7 +5,7 @@ "use strict"; const path = require("path"); -const asyncLib = require("async"); +const asyncLib = require("neo-async"); class LibManifestPlugin { constructor(options) { diff --git a/lib/MultiCompiler.js b/lib/MultiCompiler.js index 1686b4a5d..84165f904 100644 --- a/lib/MultiCompiler.js +++ b/lib/MultiCompiler.js @@ -7,7 +7,7 @@ const Tapable = require("tapable").Tapable; const SyncHook = require("tapable").SyncHook; const MultiHook = require("tapable").MultiHook; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const MultiWatching = require("./MultiWatching"); const MultiStats = require("./MultiStats"); diff --git a/lib/MultiWatching.js b/lib/MultiWatching.js index 35afe85dd..0e586d936 100644 --- a/lib/MultiWatching.js +++ b/lib/MultiWatching.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); class MultiWatching { constructor(watchings, compiler) { diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js index 74fb3b6e5..df3f844a8 100644 --- a/lib/NormalModuleFactory.js +++ b/lib/NormalModuleFactory.js @@ -4,7 +4,7 @@ */ "use strict"; -const asyncLib = require("async"); +const asyncLib = require("neo-async"); const Tapable = require("tapable").Tapable; const AsyncSeriesWaterfallHook = require("tapable").AsyncSeriesWaterfallHook; const SyncWaterfallHook = require("tapable").SyncWaterfallHook; diff --git a/package.json b/package.json index 0e33b9bb5..0233ff867 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "acorn-dynamic-import": "^3.0.0", "ajv": "^6.1.0", "ajv-keywords": "^3.1.0", - "async": "^2.1.2", "chrome-trace-event": "^0.1.1", "enhanced-resolve": "^4.0.0-beta.2", "eslint-scope": "^3.7.1", @@ -17,6 +16,7 @@ "loader-utils": "^1.1.0", "memory-fs": "~0.4.1", "mkdirp": "~0.5.0", + "neo-async": "^2.5.0", "node-libs-browser": "^2.0.0", "schema-utils": "^0.4.2", "tapable": "^1.0.0-beta.5", diff --git a/test/BenchmarkTestCases.benchmark.js b/test/BenchmarkTestCases.benchmark.js index 0754f9d35..f626a6304 100644 --- a/test/BenchmarkTestCases.benchmark.js +++ b/test/BenchmarkTestCases.benchmark.js @@ -3,7 +3,7 @@ require("should"); const path = require("path"); const fs = require("fs"); -const asyncLib = require("async"); +const asyncLib = require("neo-async"); var Test = require("mocha/lib/test"); const Benchmark = require("benchmark"); diff --git a/test/cases/loaders/issue-2299/loader/index.js b/test/cases/loaders/issue-2299/loader/index.js index 6b2edcda0..cb27f7cf2 100644 --- a/test/cases/loaders/issue-2299/loader/index.js +++ b/test/cases/loaders/issue-2299/loader/index.js @@ -1,4 +1,4 @@ -var asyncLib = require("async"); +var asyncLib = require("neo-async"); module.exports = function(content) { var cb = this.async(); var json = JSON.parse(content); diff --git a/yarn.lock b/yarn.lock index d1ecc038b..bfa39cfcf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2616,6 +2616,10 @@ negotiator@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.5.3.tgz#269d5c476810ec92edbe7b6c2f28316384f9a7e8" +neo-async@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" + node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"