Merge 78f7197 into 5dfc10b

index.js

@@ -2,8 +2,7 @@
 'use strict'
 
 var sassRenderer = require('./lib/renderer')
-// export hexo to global vm context
-global.hexo = hexo
+
 // associate the Sass renderer with .scss AND .sass extensions
 hexo.extend.renderer.register('scss', 'css', sassRenderer('scss'))
 hexo.extend.renderer.register('sass', 'css', sassRenderer('sass'))

lib/renderer.js

@@ -1,4 +1,3 @@
-/* global hexo */
 'use strict'
 
 var sass = require('node-sass')
@@ -7,8 +6,8 @@ var extend = require('util')._extend
 module.exports = (ext) => function (data) {
     // support global and theme-specific config
   var userConfig = extend(
-        hexo.theme.config.node_sass || {},
-        hexo.config.node_sass || {}
+        this.theme.config.node_sass || {},
+        this.config.node_sass || {}
     )
 
   var config = extend({

package.json

@@ -27,7 +27,7 @@
     "node-sass": "^4.1.1"
   },
   "peerDependencies": {
-    "hexo": ">= 1.0.0"
+    "hexo": ">= 3"
   },
   "devDependencies": {
     "chai": "^3.5.0",

test/index.js

@@ -12,8 +12,6 @@ describe('Sass renderer', function () {
     }
   }
 
-  global.hexo = ctx
-
   var r = require('../lib/renderer')
 
   it('default: scss syntax', function () {
@@ -24,7 +22,7 @@ describe('Sass renderer', function () {
       '}'
     ].join('\n')
 
-    var result = r('scss')({ text: body }, {})
+    var result = r('scss').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo {',
       '  color: red; }'
@@ -38,7 +36,7 @@ describe('Sass renderer', function () {
       '  color: $color'
     ].join('\n')
 
-    var result = r('sass')({ text: body }, {})
+    var result = r('sass').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo {',
       '  color: red; }'
@@ -47,7 +45,6 @@ describe('Sass renderer', function () {
 
   it('outputStyle compressed: scss syntax', function () {
     ctx.theme.config = { node_sass: { outputStyle: 'compressed' } }
-    global.hexo = ctx
 
     var body = [
       '$color: red;',
@@ -56,23 +53,22 @@ describe('Sass renderer', function () {
       '}'
     ].join('\n')
 
-    var result = r('scss')({ text: body }, {})
+    var result = r('scss').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo{color:red}'
     ].join('\n') + '\n')
   })
 
   it('outputStyle compressed: sass syntax', function () {
     ctx.theme.config = { node_sass: { outputStyle: 'compressed' } }
-    global.hexo = ctx
 
     var body = [
       '$color: red',
       '.foo',
       '  color: $color'
     ].join('\n')
 
-    var result = r('sass')({ text: body }, {})
+    var result = r('sass').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo{color:red}'
     ].join('\n') + '\n')
@@ -81,7 +77,6 @@ describe('Sass renderer', function () {
   it('supports root config: scss syntax', function () {
     ctx.config = { node_sass: { outputStyle: 'compressed' } }
     ctx.theme.config = {}
-    global.hexo = ctx
 
     var body = [
       '$color: red;',
@@ -90,7 +85,7 @@ describe('Sass renderer', function () {
       '}'
     ].join('\n')
 
-    var result = r('scss')({ text: body }, {})
+    var result = r('scss').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo{color:red}'
     ].join('\n') + '\n')
@@ -99,15 +94,14 @@ describe('Sass renderer', function () {
   it('supports root config: sass syntax', function () {
     ctx.config = { node_sass: { outputStyle: 'compressed' } }
     ctx.theme.config = {}
-    global.hexo = ctx
 
     var body = [
       '$color: red',
       '.foo',
       '  color: $color'
     ].join('\n')
 
-    var result = r('sass')({ text: body }, {})
+    var result = r('sass').call(ctx, { text: body }, {})
     result.should.eql([
       '.foo{color:red}'
     ].join('\n') + '\n')
@@ -116,7 +110,6 @@ describe('Sass renderer', function () {
   it('throw when error occurs: scss syntax', function () {
     ctx.theme.config = { node_sass: { outputStyle: 'compressed' } }
     ctx.config = {}
-    global.hexo = ctx
 
     var body = [
       '.foo {',
@@ -125,22 +118,21 @@ describe('Sass renderer', function () {
     ].join('\n')
 
     should.Throw(function () {
-      return r('scss')({ text: body }, {})
-    })
+      return r('scss').call(ctx, { text: body }, {})
+    }, 'Undefined variable: "$color".')
   })
 
   it('throw when error occurs: sass syntax', function () {
     ctx.theme.config = { node_sass: { outputStyle: 'compressed' } }
     ctx.config = {}
-    global.hexo = ctx
 
     var body = [
       '.foo',
       '  color: $color'
     ].join('\n')
 
     should.Throw(function () {
-      return r('sass')({ text: body }, {})
-    })
+      return r('sass').call(ctx, { text: body }, {})
+    }, 'Undefined variable: "$color".')
   })
 })