Merge d7fbb75 into 81734aa

package.json

@@ -28,12 +28,12 @@
     "compiler"
   ],
   "devDependencies": {
-    "coveralls": "^2.11.12",
-    "eslint": "^3.4.0",
+    "coveralls": "^2.11.14",
+    "eslint": "^3.9.1",
     "expect.js": "^0.3.1",
     "istanbul": "^0.4.5",
     "jspreproc": "^0.2.7",
-    "mocha": "^2.5.3",
+    "mocha": "^3.1.2",
     "riot-bump": "^1.0.0"
   },
   "author": "Riot maintainers team + smart people from all over the world",

src/core.js

@@ -130,7 +130,7 @@ var SPEC_TYPES = /^"(?:number|date(?:time)?|time|month|email|color)\b/i
  * Matches the 'import' statement
  * @const {RegExp}
  */
-var IMPORT_STATEMENT = /^\s*import(?:\s*[*{]|\s+[$_a-zA-Z'"]).*\n?/gm
+var IMPORT_STATEMENT = /^\s*import(?:(\s|\S)*)['|"]/gm
 
 /**
  * Matches trailing spaces and tabs by line.

test/specs/expect/es6-import-untagged.js

@@ -1,4 +1,4 @@
 import* as foo from 'doe'
-import 'bar'
+  import 'bar'
 riot.tag2('import-untagged', '<h1>Hello</h1>', '', '', function(opts) {
 });

test/specs/expect/es6-import.js

@@ -1,8 +1,24 @@
 import john from 'doe'
-import foo from 'bar'
-import { foo, bar, baz } from 'foo.bar.baz'
-riot.tag2('import', '<h1>Hello</h1>', '', '', function(opts){
+    import foo from 'bar'
+    import { foo, bar, baz } from 'foo.bar.baz'
+    import {
+      foo,
+      bar,
+      baz
+    } from 'foo.bar.baz'
+    import {
+      foo,
+      bar,
+      baz } from 'foo.bar.baz'
+
+    import { foo,
+      bar,
+      baz } from 'foo.bar.baz'
+riot.tag2('import', '<h1>Hello</h1>', '', '', function(opts) {
+
+
     this.time = function(){
         return Date()
     }.bind(this)
-});
+
+});

test/specs/fixtures/es6-import.tag

@@ -5,6 +5,20 @@
     import john from 'doe'
     import foo from 'bar'
     import { foo, bar, baz } from 'foo.bar.baz'
+    import {
+      foo,
+      bar,
+      baz
+    } from 'foo.bar.baz'
+    import {
+      foo,
+      bar,
+      baz } from 'foo.bar.baz'
+
+    import { foo,
+      bar,
+      baz } from 'foo.bar.baz'
+
     time(){
         return Date()
     }