From 564ddba4bc112a884d9d696d56dba58501a6098f Mon Sep 17 00:00:00 2001
From: Rich-Harris <richard.a.harris@gmail.com>
Date: Fri, 18 Nov 2016 18:40:22 -0500
Subject: [PATCH] parse <script> tags

---
 compiler/parse/index.js        |  5 ++-
 compiler/parse/read/script.js  | 39 +++++++++++------
 compiler/parse/state/tag.js    |  2 +-
 test/parser/script/output.json | 80 +++++++++++++++++++++++++++++++++-
 test/parser/script/solo        |  0
 5 files changed, 110 insertions(+), 16 deletions(-)
 delete mode 100644 test/parser/script/solo

diff --git a/compiler/parse/index.js b/compiler/parse/index.js
index 309c77f9ad..638e74a0c1 100644
--- a/compiler/parse/index.js
+++ b/compiler/parse/index.js
@@ -67,7 +67,7 @@ export default function parse ( template ) {
 
 		html: {
 			start: 0,
-			end: template.length,
+			end: null,
 			type: 'Fragment',
 			children: []
 		},
@@ -85,6 +85,9 @@ export default function parse ( template ) {
 		state = state( parser ) || fragment;
 	}
 
+	const lastTemplateItem = parser.html.children[ parser.html.children.length - 1 ];
+	parser.html.end = lastTemplateItem ? lastTemplateItem.end : 0;
+
 	return {
 		html: parser.html,
 		css: parser.css,
diff --git a/compiler/parse/read/script.js b/compiler/parse/read/script.js
index a0f1383748..dffb28a372 100644
--- a/compiler/parse/read/script.js
+++ b/compiler/parse/read/script.js
@@ -1,25 +1,38 @@
-import { parse, tokenizer, tokTypes } from 'acorn';
+import { parse, tokenizer } from 'acorn';
+
+function spaces ( i ) {
+	let result = '';
+	while ( i-- ) result += ' ';
+	return result;
+}
 
 export default function readScript ( parser, start, attributes ) {
 	const scriptStart = parser.index;
 	let scriptEnd = null;
 
-	const js = {
-		start,
-		end: null,
-		attributes,
-		content: null
-	};
-
-	const endPattern = /\s*<\/script\>/g;
-
 	for ( const token of tokenizer( parser.remaining() ) ) {
-		endPattern.lastIndex = scriptStart + token.end;
-		if ( endPattern.test( parser.template ) ) {
+		parser.index = scriptStart + token.end;
+		parser.allowWhitespace();
+
+		if ( parser.eat( '</script>' )  ) {
 			scriptEnd = scriptStart + token.end;
 			break;
 		}
 	}
 
-	js.content = parse( )
+	const source = spaces( scriptStart ) + parser.template.slice( scriptStart, scriptEnd );
+
+	const ast = parse( source, {
+		ecmaVersion: 8,
+		sourceType: 'module'
+	});
+
+	ast.start = scriptStart;
+
+	return {
+		start,
+		end: parser.index,
+		attributes,
+		content: ast
+	};
 }
diff --git a/compiler/parse/state/tag.js b/compiler/parse/state/tag.js
index 0dd1ccaa5d..7cfaa32188 100644
--- a/compiler/parse/state/tag.js
+++ b/compiler/parse/state/tag.js
@@ -54,7 +54,7 @@ export default function tag ( parser ) {
 		}
 
 		parser.eat( '>', true );
-		parser[ special.id ] = special.read( parser, start, attributes );
+		parser[ special.property ] = special.read( parser, start, attributes );
 		return;
 	}
 
diff --git a/test/parser/script/output.json b/test/parser/script/output.json
index 62ce17e170..82f481c9db 100644
--- a/test/parser/script/output.json
+++ b/test/parser/script/output.json
@@ -39,5 +39,83 @@
 		]
 	},
 	"css": null,
-	"js": null
+	"js": {
+		"start": 26,
+		"end": 105,
+		"attributes": [],
+		"content": {
+			"type": "Program",
+			"start": 34,
+			"end": 95,
+			"body": [
+				{
+					"declaration": {
+						"start": 51,
+						"end": 94,
+						"type": "ObjectExpression",
+						"properties": [
+							{
+								"start": 55,
+								"end": 91,
+								"type": "Property",
+								"computed": false,
+								"key": {
+									"start": 55,
+									"end": 59,
+									"type": "Identifier",
+									"name": "data"
+								},
+								"kind": "init",
+								"method": false,
+								"shorthand": false,
+								"value": {
+									"start": 61,
+									"end": 91,
+									"type": "ArrowFunctionExpression",
+									"async": false,
+									"body": {
+										"start": 68,
+										"end": 90,
+										"type": "ObjectExpression",
+										"properties": [
+											{
+												"start": 73,
+												"end": 86,
+												"type": "Property",
+												"computed": false,
+												"key": {
+													"start": 73,
+													"end": 77,
+													"type": "Identifier",
+													"name": "name"
+												},
+												"kind": "init",
+												"method": false,
+												"shorthand": false,
+												"value": {
+													"start": 79,
+													"end": 86,
+													"type": "Literal",
+													"raw": "'world'",
+													"value": "world"
+												}
+											}
+										]
+									},
+									"expression": true,
+									"generator": false,
+									"id": null,
+									"params": []
+								}
+							}
+						]
+					},
+					"end": 95,
+					"start": 36,
+					"type": "ExportDefaultDeclaration"
+				}
+			],
+			"sourceType": "module"
+		}
+	}
 }
diff --git a/test/parser/script/solo b/test/parser/script/solo
deleted file mode 100644
index e69de29bb2..0000000000