revert inline style module

Author: yyx990803

lib/template-compiler/index.js

@@ -5,74 +5,69 @@ var beautify = require('js-beautify').js_beautify
 var transpile = require('vue-template-es2015-compiler')
 var hotReloadAPIPath = normalize.dep('vue-hot-reload-api')
 var transformRequire = require('./modules/transform-require')
-var rewriteInlineStyles = require('./modules/inline-style')
 
 module.exports = function (html) {
   this.cacheable()
-  var cb = this.async()
   var isServer = this.target === 'node'
   var isProduction = this.minimize || process.env.NODE_ENV === 'production'
   var vueOptions = this.options.__vueOptions__ || {}
   var options = loaderUtils.getOptions(this) || {}
 
-  Promise.all([
-    transformRequire(options.transformToRequire),
-    rewriteInlineStyles()
-  ]).then(defaultCompilerModules => {
-    // user compiler modules
-    var userCompilerModules = options.compilerModules || vueOptions.compilerModules
-    // for HappyPack cross-process use cases
-    if (typeof userCompilerModules === 'string') {
-      userCompilerModules = require(userCompilerModules)
-    }
+  var defaultModules = [transformRequire(options.transformToRequire)]
+  var userModules = vueOptions.compilerModules || options.compilerModules
+  // for HappyPack cross-process use cases
+  if (typeof userModules === 'string') {
+    userModules = require(userModules)
+  }
 
-    var compiled = compiler.compile(html, {
-      preserveWhitespace: options.preserveWhitespace,
-      modules: defaultCompilerModules.concat(userCompilerModules || [])
-    })
+  var compilerOptions = {
+    preserveWhitespace: options.preserveWhitespace,
+    modules: defaultModules.concat(userModules || [])
+  }
 
-    // tips
-    if (compiled.tips && compiled.tips.length) {
-      compiled.tips.forEach(tip => {
-        this.emitWarning(tip)
-      })
-    }
+  var compiled = compiler.compile(html, compilerOptions)
 
-    var code
-    if (compiled.errors && compiled.errors.length) {
-      this.emitError(
-        `\n  Error compiling template:\n${pad(html)}\n` +
-        compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
-      )
-      code = 'module.exports={render:function(){},staticRenderFns:[]}'
-    } else {
-      var bubleOptions = options.buble
-      code = transpile('module.exports={' +
-        'render:' + toFunction(compiled.render) + ',' +
-        'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
-      '}', bubleOptions)
-      // mark with stripped (this enables Vue to use correct runtime proxy detection)
-      if (!isProduction && (
-        !bubleOptions ||
-        !bubleOptions.transforms ||
-        bubleOptions.transforms.stripWith !== false
-      )) {
-        code += `\nmodule.exports.render._withStripped = true`
-      }
-    }
-    // hot-reload
-    if (!isServer && !isProduction) {
-      code +=
-        '\nif (module.hot) {\n' +
-        '  module.hot.accept()\n' +
-        '  if (module.hot.data) {\n' +
-        '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
-        '  }\n' +
-        '}'
+  // tips
+  if (compiled.tips && compiled.tips.length) {
+    compiled.tips.forEach(tip => {
+      this.emitWarning(tip)
+    })
+  }
+
+  var code
+  if (compiled.errors && compiled.errors.length) {
+    this.emitError(
+      `\n  Error compiling template:\n${pad(html)}\n` +
+      compiled.errors.map(e => `  - ${e}`).join('\n') + '\n'
+    )
+    code = 'module.exports={render:function(){},staticRenderFns:[]}'
+  } else {
+    var bubleOptions = options.buble
+    code = transpile('module.exports={' +
+      'render:' + toFunction(compiled.render) + ',' +
+      'staticRenderFns: [' + compiled.staticRenderFns.map(toFunction).join(',') + ']' +
+    '}', bubleOptions)
+    // mark with stripped (this enables Vue to use correct runtime proxy detection)
+    if (!isProduction && (
+      !bubleOptions ||
+      !bubleOptions.transforms ||
+      bubleOptions.transforms.stripWith !== false
+    )) {
+      code += `\nmodule.exports.render._withStripped = true`
     }
+  }
+  // hot-reload
+  if (!isServer && !isProduction) {
+    code +=
+      '\nif (module.hot) {\n' +
+      '  module.hot.accept()\n' +
+      '  if (module.hot.data) {\n' +
+      '     require("' + hotReloadAPIPath + '").rerender("' + options.id + '", module.exports)\n' +
+      '  }\n' +
+      '}'
+  }
 
-    cb(null, code)
-  }).catch(cb)
+  return code
 }
 
 function toFunction (code) {

lib/template-compiler/modules/inline-style.js

@@ -1,4 +1,4 @@
-// vue compiler module for using transforming `<tag>:<attribute>` to `require`
+// vue compiler module for transforming `<tag>:<attribute>` to `require`
 
 var defaultOptions = {
   img: 'src',