Merge pull request #1404 from caolan/avoid-eval

Avoid eval in async wrappers; fixes #1403
caolan · Apr 17, 2017 · 996abc2 · 996abc2
2 parents 81d66dd + 6d19dd3
commit 996abc2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/lib/internal/wrapAsync.js b/lib/internal/wrapAsync.js
@@ -1,19 +1,7 @@
-import identity from 'lodash/identity';
 import asyncify from '../asyncify';
 
 var supportsSymbol = typeof Symbol === 'function';
 
-function supportsAsync() {
-    var supported;
-    try {
-        /* eslint no-eval: 0 */
-        supported = isAsync(eval('(async function () {})'));
-    } catch (e) {
-        supported = false;
-    }
-    return supported;
-}
-
 function isAsync(fn) {
     return supportsSymbol && fn[Symbol.toStringTag] === 'AsyncFunction';
 }
@@ -22,6 +10,6 @@ function wrapAsync(asyncFn) {
     return isAsync(asyncFn) ? asyncify(asyncFn) : asyncFn;
 }
 
-export default supportsAsync() ? wrapAsync : identity;
+export default wrapAsync;
 
-export { supportsAsync, isAsync };
+export { isAsync };
diff --git a/mocha_test/asyncFunctions.js b/mocha_test/asyncFunctions.js
@@ -1,4 +1,15 @@
-var supportsAsync = require('../lib/internal/wrapAsync').supportsAsync;
+var isAsync = require('../lib/internal/wrapAsync').isAsync;
+
+function supportsAsync() {
+    var supported;
+    try {
+        /* eslint no-eval: 0 */
+        supported = isAsync(eval('(async function () {})'));
+    } catch (e) {
+        supported = false;
+    }
+    return supported;
+}
 
 describe('async function support', function () {
     this.timeout(100);