Merge branch 'master' into tokens

index.js

@@ -6,10 +6,11 @@ var fastFind = require('./find-fast');
 
 var requireRe = /\brequire\b/;
 
+
 function getParseOpts (opts) {
     opts = opts || {};
     return {
-        ecmaVersion: defined(opts.ecmaVersion, 8),
+        ecmaVersion: defined(opts.ecmaVersion, 9),
         sourceType: opts.sourceType,
         ranges: defined(opts.ranges, opts.range),
         locations: defined(opts.locations, opts.loc),
@@ -65,6 +66,12 @@ exports.find = function (src, opts) {
                 if (arg.type === 'Literal') {
                     modules.strings.push(arg.value);
                 }
+                else if (arg.type === 'TemplateLiteral'
+                        && arg.quasis.length === 1
+                        && arg.expressions.length === 0) {
+
+                    modules.strings.push(arg.quasis[0].value.raw);
+                }
                 else {
                     modules.expressions.push(src.slice(arg.start, arg.end));
                 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "detective",
   "description": "find all require() calls by walking the AST",
-  "version": "4.6.0",
+  "version": "4.7.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/browserify/detective.git"

readme.markdown

@@ -66,7 +66,7 @@ node is a require call
 * `opts.parse` - supply options directly to
 [acorn](https://npmjs.org/package/acorn) with some support for esprima-style
 options `range` and `loc`
-* `opts.ecmaVersion` - default: 8
+* `opts.ecmaVersion` - default: 9
 
 # install
 

test/complicated.js

@@ -3,6 +3,8 @@ var detective = require('../');
 
 var sources = [
     'require("a")',
+    "require('a')",
+    'require(`a`)',
     ';require("a")',
     ' require("a")',
     'void require("a")',