wip

Author: yyx990803

lib/css-rewriter.js

@@ -0,0 +1,5 @@
+module.exports = function (css) {
+  this.cacheable()
+  console.log(css)
+  return css
+}

lib/loader.js

@@ -34,10 +34,8 @@ module.exports = function (content) {
       loaderUtils.stringifyRequest(self,
         // disable system loaders (except post loaders)
         '-!' +
-        // check for local CSS rewrite
-        (part.local ? cssRewriterPath + '!' : '') +
         // get loader string for pre-processors
-        getPreprocessorString(type, part.lang) +
+        getLoaderString(type, part) +
         // select the corresponding part from the vue file
         getSelectorString(type, index || 0) +
         // the url to the actual vuefile
@@ -50,18 +48,20 @@ module.exports = function (content) {
     return 'require(' +
       loaderUtils.stringifyRequest(self,
         '-!' +
-        getPreprocessorString(include.type, include.lang) +
+        getLoaderString(include.type, include) +
         include.src
       ) +
     ')\n'
   }
 
-  function getPreprocessorString (type, lang) {
-    lang = lang || defaultLang[type]
-    var loader = loaders[lang] !== undefined
-      ? loaders[lang]
-      : loaderPrefix[type] + lang
-    return loader ? loader + '!' : ''
+  function getLoaderString (type, part) {
+    var lang = part.lang || defaultLang[type]
+    var localCssString = type === 'style' && part.local
+      ? cssRewriterPath + '!'
+      : ''
+    return loaders[lang] !== undefined
+      ? loaders[lang] + '!' + localCssString
+      : loaderPrefix[type] + localCssString + lang + '!'
   }
 
   function getSelectorString (type, index) {

lib/parser.js

@@ -57,7 +57,7 @@ module.exports = function (content) {
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     output[type].push({
       lang: lang,
-      local: local,
+      local: local != null,
       content: content.substring(start, end).trim()
     })
   })

test/fixtures/import.js

@@ -0,0 +1,3 @@
+<style local>
+h1 { color: red; }
+</style>

test/fixtures/local-css.vue

@@ -90,7 +90,17 @@ describe('vue-loader', function () {
 
   it('import', function (done) {
     test({
-      entry: './test/fixtures/import.js'
+      entry: './test/fixtures/import.vue'
+    }, function (window) {
+      var style = window.document.querySelector('style').textContent
+      expect(style).to.contain('h1 { color: red; }')
+      done()
+    })
+  })
+
+  it('local-css', function (done) {
+    test({
+      entry: './test/fixtures/local-css.vue'
     }, function (window) {
       var style = window.document.querySelector('style').textContent
       expect(style).to.contain('h1 { color: red; }')