implement a feature of defaultLang(#497)

lib/loader.js

@@ -28,12 +28,6 @@ try {
 
 var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
 
-var defaultLang = {
-  template: 'html',
-  styles: 'css',
-  script: 'js'
-}
-
 // When extracting parts from the source vue file, we want to apply the
 // loaders chained before vue-loader, but exclude some loaders that simply
 // produces side effects such as linting. This is a hard-coded list and
@@ -57,6 +51,11 @@ module.exports = function (content) {
   var query = loaderUtils.parseQuery(this.query)
   var rawRequest = getRawRequest(this)
   var options = this.options.__vueOptions__ = Object.assign({}, this.options.vue, this.vue, query)
+  var defaultLang = Object.assign({
+    template: 'html',
+    styles: 'css',
+    script: 'js'
+  }, options.defaultLang)
 
   var filePath = this.resourcePath
   var fileName = path.basename(filePath)
@@ -90,7 +89,7 @@ module.exports = function (content) {
   function getRequire (type, part, index, scoped) {
     return 'require(' +
       getRequireString(type, part, index, scoped) +
-    ')'
+      ')'
   }
 
   function getRequireString (type, part, index, scoped) {
@@ -109,7 +108,7 @@ module.exports = function (content) {
   function getRequireForImport (type, impt, scoped) {
     return 'require(' +
       getRequireForImportString(type, impt, scoped) +
-    ')'
+      ')'
   }
 
   function getRequireForImportString (type, impt, scoped) {
@@ -304,7 +303,7 @@ module.exports = function (content) {
   // )
   output += 'var Component = require(' +
     loaderUtils.stringifyRequest(loaderContext, '!' + componentNormalizerPath) +
-  ')(\n'
+    ')(\n'
 
   // <script>
   output += '  /* script */\n  '
@@ -358,17 +357,17 @@ module.exports = function (content) {
     // check named exports
     output +=
       'if (Component.esModule && Object.keys(Component.esModule).some(function (key) {' +
-        'return key !== "default" && key !== "__esModule"' +
+      'return key !== "default" && key !== "__esModule"' +
       '})) {' +
-        'console.error("named exports are not supported in *.vue files.")' +
+      'console.error("named exports are not supported in *.vue files.")' +
       '}\n'
     // check functional components used with templates
     if (template) {
       output +=
         'if (Component.options.functional) {' +
-          'console.error("' +
-          '[vue-loader] ' + fileName + ': functional components are not ' +
-          'supported with templates, they should use render functions.' +
+        'console.error("' +
+        '[vue-loader] ' + fileName + ': functional components are not ' +
+        'supported with templates, they should use render functions.' +
         '")}\n'
     }
   }
@@ -418,19 +417,19 @@ module.exports = function (content) {
       // update
       if (cssModules) {
         output +=
-        '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
-        '      delete Component.options._Ctor\n' +
-        '    }\n'
+          '    if (module.hot.data.cssModules && JSON.stringify(module.hot.data.cssModules) !== JSON.stringify(cssModules)) {\n' +
+          '      delete Component.options._Ctor\n' +
+          '    }\n'
       }
       output +=
         '    hotAPI.reload("' + moduleId + '", Component.options)\n' +
         '  }\n'
       if (cssModules) {
         // save cssModules
         output +=
-        '  module.hot.dispose(function (data) {\n' +
-        '    data.cssModules = cssModules\n' +
-        '  })\n'
+          '  module.hot.dispose(function (data) {\n' +
+          '    data.cssModules = cssModules\n' +
+          '  })\n'
       }
       output += '})()}\n'
     }

test/fixtures/default-lang.vue

@@ -0,0 +1,4 @@
+<style>
+  .msg
+    color red
+</style>

test/test.js

@@ -697,4 +697,18 @@ describe('vue-loader', function () {
       done()
     })
   })
+
+  it('default lang', function (done) {
+    test({
+      entry: './test/fixtures/default-lang.vue',
+      vue: {
+        defaultLang: {
+          styles: 'stylus'
+        }
+      }
+    }, function (window) {
+      expect(window.document.querySelectorAll('style')[0].textContent).to.contain('.msg {\n  color: #f00;\n}')
+      done()
+    })
+  })
 })