merge PR vuejs#227

clay · Sep 4, 2018 · 07a9cc8 · 07a9cc8
1 parent 7521d0c
commit 07a9cc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -86,8 +86,8 @@ compiler.compile = function (content, filePath, cb) {
   ].concat(parts.styles.map(function (style) {
     return processStyle(style, filePath, id, resolvedParts)
   })))
-  .then(mergeParts)
-  .catch(cb)
+    .then(mergeParts)
+    .catch(cb)
 
   function mergeParts () {
     // check whether script/template has changed

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/extract-css.js b/plugins/extract-css.js
@@ -18,7 +18,7 @@ module.exports = function (b, opts) {
         outPath.write(css)
         outPath.end()
       } else if (typeof outPath === 'string') {
-        fs.writeFile(outPath, css, function () {})
+        fs.writeFileSync(outPath, css)
       }
     })
   })