Comparing version 1.1.2 to 1.1.3
@@ -19,3 +19,3 @@ 'use strict'; | ||
var regs = [/import\s+.*"([^"]+)"/, /import\s+.*'([^']+)'/, /require\s*\("([^"]*)"\)/, /require\s*\('([^']*)'\)/]; | ||
var regs = [/from\s+.*"([^"]+)"/, /from\s+.*'([^']+)'/, /require\s*\("([^"]*)"\)/, /require\s*\('([^']*)'\)/]; | ||
@@ -82,3 +82,3 @@ var cache = {}; | ||
strip(rm_star(content)).split('\n').filter(function (line) { | ||
return line.indexOf('require') > -1 || line.indexOf('import') > -1; | ||
return line.indexOf('require') > -1 || line.indexOf('from') > -1 || line.indexOf('import') > -1; | ||
}).forEach(function (line) { | ||
@@ -85,0 +85,0 @@ var _iteratorNormalCompletion = true; |
{ | ||
"name": "es6-deps", | ||
"version": "1.1.2", | ||
"version": "1.1.3", | ||
"description": "a simple util to get es6/jsx dependencies", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -10,4 +10,4 @@ var isdir = require('isdir'); | ||
var regs = [ | ||
/import\s+.*"([^"]+)"/, | ||
/import\s+.*'([^']+)'/, | ||
/from\s+.*"([^"]+)"/, | ||
/from\s+.*'([^']+)'/, | ||
/require\s*\("([^"]*)"\)/, | ||
@@ -75,3 +75,3 @@ /require\s*\('([^']*)'\)/, | ||
.split('\n') | ||
.filter(line => line.indexOf('require') > -1 || line.indexOf('import') > -1) | ||
.filter(line => line.indexOf('require') > -1 || line.indexOf('from') > -1 || line.indexOf('import') > -1) | ||
.forEach(function(line) { | ||
@@ -78,0 +78,0 @@ for (let reg of regs) { |
@@ -36,2 +36,9 @@ require('babel/register'); | ||
it('import b - multiline', function () { | ||
var data = deps(file('i-b2.js')); | ||
assert.equal(data.length, 1); | ||
assert.deepEqual([ | ||
file('b.js'), | ||
], data); | ||
}); | ||
it('parse error', function () { | ||
@@ -38,0 +45,0 @@ assert.throws(function(){ |
12199
13
280