deindent code blocks

yyx990803 · yyx990803 · commit 79b1d957e2a8 · 2016-01-05T15:52:05.000-05:00
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -10,6 +10,7 @@ var rewriteTemplate = require('./template-rewriter')
 var validateTemplate = require('vue-template-validator')
 var chalk = require('chalk')
 var assign = require('object-assign')
+var deindent = require('de-indent')
 var Emitter = require('events').EventEmitter
 
 // production minifiers
@@ -208,6 +209,7 @@ function isScoped (node) {
 
 function processTemplate (node, filePath, id, hasScopedStyle, fullSource) {
   var template = checkSrc(node, filePath) || parse5.serialize(node.content)
+  template = deindent(template)
   var lang = checkLang(node)
   if (!lang) {
     var warnings = validateTemplate(node.content, fullSource)
@@ -246,6 +248,7 @@ function processTemplate (node, filePath, id, hasScopedStyle, fullSource) {
 function processStyle (node, filePath, id) {
   var style = checkSrc(node, filePath) || parse5.serialize(node)
   var lang = checkLang(node)
+  style = deindent(style)
   return compileAsPromise('style', style, lang, filePath)
     .then(function (res) {
       return rewriteStyle(id, res.source, isScoped(node))
@@ -271,6 +274,7 @@ function processScript (node, filePath, content) {
     var before = padContent(content.slice(0, location))
     script = before + script
   }
+  script = deindent(script)
   return compileAsPromise('script', script, lang, filePath)
 }
 
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "autoprefixer": "^6.0.3",
     "chalk": "^1.1.1",
     "cssnano": "^3.3.2",
+    "de-indent": "^1.0.2",
     "es6-promise": "^3.0.2",
     "hash-sum": "^1.0.2",
     "html-minifier": "^1.0.0",
diff --git a/test/expects/custom.js b/test/expects/custom.js
@@ -1,4 +1,4 @@
 
-  console.log('ok')
+console.log('ok')
 
 if (module.exports.__esModule) module.exports = module.exports.default
diff --git a/test/expects/non-minified.js b/test/expects/non-minified.js
@@ -1,2 +1,2 @@
-var __vueify_style__ = require("vueify-insert-css").insert("\n  html {\n    font-size: 20px;\n  }\n")
-;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n  <h1 :id=\"id\" @click=\"hi\">hello</h1>\n"
+var __vueify_style__ = require("vueify-insert-css").insert("\nhtml {\n  font-size: 20px;\n}\n")
+;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n<h1 :id=\"id\" @click=\"hi\">hello</h1>\n"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`
`2`		`- console.log('ok')`
	`2`	`+console.log('ok')`
`3`	`3`
`4`	`4`	`if (module.exports.__esModule) module.exports = module.exports.default`