From 1bfc08a87828e9c1791521aca21553d5e3c0f673 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Sun, 3 Jun 2018 15:49:00 -0400
Subject: [PATCH] fix: ensure same compiler is used for both parse and tempalte
 compilation

---
 lib/index.js |  1 +
 package.json |  2 +-
 yarn.lock    | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 64ae34716..cceed5559 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -49,6 +49,7 @@ module.exports = function (source) {
 
   const descriptor = parse({
     source,
+    compiler: options.compiler || require('vue-template-compiler'),
     filename,
     sourceRoot,
     needMap: sourceMap
diff --git a/package.json b/package.json
index d11848afd..fef4307d0 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "vue-template-compiler": "^2.0.0"
   },
   "dependencies": {
-    "@vue/component-compiler-utils": "^1.2.1",
+    "@vue/component-compiler-utils": "^2.0.0",
     "hash-sum": "^1.0.2",
     "loader-utils": "^1.1.0",
     "vue-hot-reload-api": "^2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 485284289..d90791b4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -720,6 +720,20 @@
     source-map "^0.5.6"
     vue-template-es2015-compiler "^1.6.0"
 
+"@vue/component-compiler-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.0.0.tgz#ea2e46d04c521afbce91a011ae2eb09460362a4b"
+  dependencies:
+    consolidate "^0.15.1"
+    hash-sum "^1.0.2"
+    lru-cache "^4.1.2"
+    merge-source-map "^1.1.0"
+    postcss "^6.0.20"
+    postcss-selector-parser "^3.1.1"
+    prettier "^1.13.0"
+    source-map "^0.5.6"
+    vue-template-es2015-compiler "^1.6.0"
+
 "@webassemblyjs/ast@1.4.3":
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a"
@@ -8173,6 +8187,10 @@ prettier@^1.11.1, prettier@^1.5.3:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
 
+prettier@^1.13.0:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.4.tgz#31bbae6990f13b1093187c731766a14036fa72e6"
+
 pretty-bytes@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"