From 24bc9ac6077d6674718a656379b4cb1f029134dc Mon Sep 17 00:00:00 2001
From: Chris Allison <chris@quimarche.co.uk>
Date: Wed, 22 Mar 2017 13:24:57 +0000
Subject: [PATCH] Integrate Stylus.

---
 config/build.js                  |  1 +
 docs/en/2.3/README.md            | 48 ++++++++++++++++++--------------
 src/options.js                   |  3 ++
 src/style/index.js               |  4 ++-
 src/style/stylus.js              | 19 +++++++++++++
 test/expects/no-css-extract.js   |  2 +-
 test/expects/stylus.css          |  3 ++
 test/expects/stylus.js           |  3 ++
 test/fixtures/no-css-extract.vue |  7 +++++
 test/fixtures/stylus.vue         | 14 ++++++++++
 test/test.js                     |  2 +-
 11 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 src/style/stylus.js
 create mode 100644 test/expects/stylus.css
 create mode 100644 test/expects/stylus.js
 create mode 100644 test/fixtures/stylus.vue

diff --git a/config/build.js b/config/build.js
index 04071aa..4aefa7c 100644
--- a/config/build.js
+++ b/config/build.js
@@ -43,6 +43,7 @@ rollup.rollup({
                         'posthtml-attrs-parser',
                         'pug',
                         'rollup-pluginutils',
+                        'stylus',
                         'vue-template-es2015-compiler',
                         'vue-template-validator',
                     ].indexOf(id) > -1
diff --git a/docs/en/2.3/README.md b/docs/en/2.3/README.md
index 7bb8104..599eb44 100644
--- a/docs/en/2.3/README.md
+++ b/docs/en/2.3/README.md
@@ -16,7 +16,7 @@ npm install --save-dev rollup-plugin-vue
 yarn add --dev rollup-plugin-vue
 ```
 
-##### Use plugin 
+##### Use plugin
 Next add `rollup-plugin-vue` to `rollup` plugins.
 
 ``` js
@@ -33,7 +33,7 @@ export default {
 For most cases `rollup-plugin-vue` works out of the box. But, you can always configure it to your needs.
 
 ### Style
-This section lists config options for `<style>` elements. 
+This section lists config options for `<style>` elements.
 
 #### Custom handler
 The `css` option accepts style handling options.
@@ -53,13 +53,13 @@ The `css` option accepts style handling options.
         - `$compiled: { code: String, ?map: Object }` - If [auto styles](#auto-styles) is enabled, `<style>` is transformed to `css`.
     - `compile: Function` - An async compiler that takes two parameters:
         - `style: { code: String, lang: String, ?map: Object }` - Style code and language.
-        - `options: { ?sass: Object, ?less: Object, ?cssModules: Object }` - Processing library configuration options.
-        
+        - `options: { ?sass: Object, ?less: Object, ?stylus: Object, ?cssModules: Object }` - Processing library configuration options.
+
     ``` js
     // rollup.config.js
     import fs from 'fs'
     import vue from 'rollup-plugin-vue'
-    
+
     export default {
         ...
         plugins: [
@@ -83,7 +83,7 @@ List of supported style languages:
 
 - ##### CSS
 The default style language.
- 
+
 - ##### Sass/Scss
 It uses `node-sass@^4.5.0` to process `sass/scss` style elements. You can provide `node-sass` configuration options by setting:
 ``` js
@@ -96,10 +96,16 @@ It uses `less@^2.7.2` to process `less` style elements. You can provide `less` c
 less: { /* node-sass options */}
 ```
 
+- ##### Stylus
+It uses `stylus@^0.54.5` to process `stylus` style elements. You can provide `stylus` configuration options by setting:
+``` js
+stylus: { /* stylus options */}
+```
+
 <p class="tip" markdown="1">
-`node-sass` and `less` are optional dependencies. If you are using `scss/sass/less` you should require (`yarn add --dev node-sass less`) them.
+`node-sass`, `less` and `stylus` are optional dependencies. If you are using `scss/sass/less/stylus` you should require (`yarn add --dev node-sass less stylus`) them.
 </p>
-  
+
 #### Use other plugins
 Set `autoStyles: false` and `styleToImport: true` to import style as a dependency and plugins like [rollup-plugin-scss](https://github.com/differui/rollup-plugin-sass) can be used.
 
@@ -137,7 +143,7 @@ export default {
     <p :class="{ [$style.red]: isRed }">
       Am I red?
     </p>
-    
+
     <p :class="[$style.red, $style.bold]">
       Red and bold
     </p>
@@ -147,11 +153,11 @@ export default {
 <script>
 export default {
   computed: {
-  
+
     $style () {
         return this.$options.cssModules
     }
-  
+
   }
 }
 </script>
@@ -185,7 +191,7 @@ You can have more than one `<style>` tags in a single *.vue component. To avoid
 You can provide `postcss-modules` configuration options by setting:
 ``` js
 cssModules: { generateScopedName: '[name]__[local]', ... }
-``` 
+```
 
 ### Template
 Templates are processed into `render` function by default. You can disable this by setting:
@@ -201,19 +207,19 @@ compileOptions: {
 ```
 
 #### Static Class Replacement
-When using CSS modules, class names are replaced in template at compile time. 
+When using CSS modules, class names are replaced in template at compile time.
 
-For example: 
+For example:
 ```
 <div class="red">Foo</div>
-``` 
-would become 
+```
+would become
 ```
 <div class="_lkcjalei8942jksa_0">Foo</div>
-``` 
+```
 before compiling to `render` function. This saves you from binding `class` attribute to `$style.red`.
- 
-You can disable this behavior by setting:  
+
+You can disable this behavior by setting:
 ``` js
 disableCssModuleStaticReplacement: true
 ```
@@ -224,7 +230,7 @@ disableCssModuleStaticReplacement: true
 Default template language.
 
 - ##### Pug/Jade
-It uses `pug@^2.0.0-beta11` to process `pug` template elements. You can provide `pug` configuration options by setting:  
+It uses `pug@^2.0.0-beta11` to process `pug` template elements. You can provide `pug` configuration options by setting:
 ``` js
 pug: { /* pug options */}
 ```
@@ -240,7 +246,7 @@ It uses `coffeescript-compiler@^0.1.1` to process `coffee` script elements. You
 ### Handle with(this) issue
 Vue uses `with(this)` in render function as scoping rules of `with` aligns with scoping rules of templates. Using `with` in strict mode is forbidden.
 
-`rollup-plugin-vue` strips away all `with(this)` statements by default. You can disable this by setting:  
+`rollup-plugin-vue` strips away all `with(this)` statements by default. You can disable this by setting:
  ``` js
  vue: { transforms: { stripWith: false } }
  ```
diff --git a/src/options.js b/src/options.js
index 0445080..8704691 100644
--- a/src/options.js
+++ b/src/options.js
@@ -59,6 +59,9 @@ export default {
     // Config for node-sass.
     scss: {},
 
+    // Config for stylus.
+    stylus: {},
+
     // Config for pug compiler.
     pug: {},
 
diff --git a/src/style/index.js b/src/style/index.js
index 00fa902..74473b0 100644
--- a/src/style/index.js
+++ b/src/style/index.js
@@ -3,11 +3,13 @@ import { dirname, isAbsolute, resolve as resolvePath } from 'path'
 import compileCSS from './css'
 import compileSCSS from './scss'
 import compileLESS from './less'
+import compileSTYLUS from './stylus'
 
 const compilers = {
     scss: compileSCSS,
     sass: compileSCSS,
-    less: compileLESS
+    less: compileLESS,
+    stylus: compileSTYLUS
 }
 
 export async function compile (style, options) {
diff --git a/src/style/stylus.js b/src/style/stylus.js
new file mode 100644
index 0000000..20d192f
--- /dev/null
+++ b/src/style/stylus.js
@@ -0,0 +1,19 @@
+import stylus from 'stylus'
+
+export default async function (style, options) {
+    const stylusObj = stylus(style.code, {...options.stylus})
+        .set('filename', style.id)
+        .set('sourcemap', {
+            'comment': false
+        })
+
+    const code = await stylusObj.render()
+    const map = stylusObj.sourcemap
+
+    style.$compiled = {
+        code,
+        map
+    }
+
+    return style
+}
diff --git a/test/expects/no-css-extract.js b/test/expects/no-css-extract.js
index 7b1dcd5..37fa25d 100644
--- a/test/expects/no-css-extract.js
+++ b/test/expects/no-css-extract.js
@@ -1,4 +1,4 @@
-(function(){ if(document){ var head=document.head||document.getElementsByTagName('head')[0], style=document.createElement('style'), css=" .bar { color: blue } .foo { color: red; } "; style.type='text/css'; if (style.styleSheet){ style.styleSheet.cssText = css; } else { style.appendChild(document.createTextNode(css)); } head.appendChild(style); } })();
+(function(){ if(document){ var head=document.head||document.getElementsByTagName('head')[0], style=document.createElement('style'), css=".baz { color: #008000; } .bar { color: blue } .foo { color: red; } "; style.type='text/css'; if (style.styleSheet){ style.styleSheet.cssText = css; } else { style.appendChild(document.createTextNode(css)); } head.appendChild(style); } })();
 
 
 
diff --git a/test/expects/stylus.css b/test/expects/stylus.css
new file mode 100644
index 0000000..5688998
--- /dev/null
+++ b/test/expects/stylus.css
@@ -0,0 +1,3 @@
+.stylus__test {
+  color: #f00;
+}
diff --git a/test/expects/stylus.js b/test/expects/stylus.js
new file mode 100644
index 0000000..6bb1675
--- /dev/null
+++ b/test/expects/stylus.js
@@ -0,0 +1,3 @@
+var stylus = { template: "<div class=\"stylus__test\"></div>",cssModules: {"test":"stylus__test"},};
+
+export default stylus;
\ No newline at end of file
diff --git a/test/fixtures/no-css-extract.vue b/test/fixtures/no-css-extract.vue
index 6c2ebc5..2a5adf7 100644
--- a/test/fixtures/no-css-extract.vue
+++ b/test/fixtures/no-css-extract.vue
@@ -19,3 +19,10 @@ $red: red;
     color: blue
 }
 </style>
+
+<style lang="stylus">
+$green = green
+
+.baz
+  color $green
+</style>
diff --git a/test/fixtures/stylus.vue b/test/fixtures/stylus.vue
new file mode 100644
index 0000000..cf07be1
--- /dev/null
+++ b/test/fixtures/stylus.vue
@@ -0,0 +1,14 @@
+<template>
+<div class="test"></div>
+</template>
+
+<script lang="babel">
+export default {}
+</script>
+
+<style lang="stylus" module>
+$var = red
+
+.test
+  color $var
+</style>
diff --git a/test/test.js b/test/test.js
index 86e141f..71610df 100644
--- a/test/test.js
+++ b/test/test.js
@@ -41,7 +41,7 @@ function test(name) {
             assert.equal(code.trim(), expected.trim(), 'should compile code correctly')
 
             // Check css output
-            if (['style', 'css-modules', 'css-modules-static', 'scss', 'pug', 'less'].indexOf(name) > -1) {
+            if (['style', 'css-modules', 'css-modules-static', 'scss', 'pug', 'less', 'stylus'].indexOf(name) > -1) {
                 var css = read('expects/' + name + '.css')
                 assert.equal(css.trim(), actualCss.trim(), 'should output style tag content')
             } else if (['no-css-extract'].indexOf(name) > -1) {