Merge pull request #92 from imagentleman/patch-1

Update core.js import regex

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)*)['|"]/gm
+var IMPORT_STATEMENT = /^\s*import(?:(?:\s|[^\s'"])*)['|"].*\n?/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,24 +1,24 @@
 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 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'
+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

@@ -2,22 +2,22 @@
     <h1>Hello</h1>
 
     <script>
-    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 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'
+import { foo,
+  bar,
+  baz } from 'foo.bar.baz'
 
     time(){
         return Date()