Merge branch 'v14' of github.com:vuejs/vue-loader into v14

yyx990803 · yyx990803 · commit 2fc982b7b86b · 2019-02-21T21:54:06.000-05:00
diff --git a/lib/template-compiler/index.js b/lib/template-compiler/index.js
@@ -70,7 +70,7 @@ module.exports = function (html) {
 
     // prettify render fn
     if (!isProduction) {
-      code = prettier.format(code, { semi: false, parser: 'babylon' })
+      code = prettier.format(code, { semi: false, parser: 'babel' })
     }
 
     // mark with stripped (this enables Vue to use correct runtime proxy detection)
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "postcss": "^6.0.8",
     "postcss-load-config": "^1.1.0",
     "postcss-selector-parser": "^2.0.0",
-    "prettier": "^1.7.0",
+    "prettier": "^1.16.0",
     "resolve": "^1.4.0",
     "source-map": "^0.6.1",
     "vue-hot-reload-api": "^2.2.0",

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ module.exports = function (html) {`
`70`	`70`
`71`	`71`	`// prettify render fn`
`72`	`72`	`if (!isProduction) {`
`73`		`- code = prettier.format(code, { semi: false, parser: 'babylon' })`
	`73`	`+ code = prettier.format(code, { semi: false, parser: 'babel' })`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// mark with stripped (this enables Vue to use correct runtime proxy detection)`