Merge pull request #1 from afc163/fix-import-all

Fix import RegExp for newline

.travis.yml

@@ -5,9 +5,9 @@ notifications:
         - yiminghe@gmail.com
 
 node_js:
-  - 0.12
+  - 5
 
 script:
   - npm test
   - npm run cover
-  - cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls
+  - cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls

index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var requireRegExp = /(?:[^.]|^)\s*require\s*\((\s*(['"])[^)'"]+\2\s*)\)/g;
-var importRegExp = /(?:[^.]|^)\s*import[^'"\r\n]+(['"])([^'"]+)\1\s*;/g;
+var importRegExp = /(?:[^.]|^)\s*import[^'"]+(['"])([^'"]+)\1\s*;/g;
 var commentUtil = require('./lib/commentUtil');
 
 function repeat(s, n) {

tests/spec/import.js

@@ -7,11 +7,16 @@ describe('match import', function () {
       'import x from "3";',
       'console.import("1")',
       '/* import "2" */',
-      'import {z} from "4";'
+      'import {z} from "4";',
+      `import {
+ x,
+ y,
+ z,
+} from "5";`,
     ].join('\n');
 
     var ret = matchRequire.findAllImports(content);
 
-    expect(ret).to.eql(['3', '4']);
+    expect(ret).to.eql(['3', '4', '5']);
   });
 });