Merge branch 'master' into master

zoubin · web-flow · commit 07738e316f9d · 2017-01-17T14:22:34.000+08:00
diff --git a/index.js b/index.js
@@ -41,7 +41,7 @@ function moduleify(css, inject) {
   if (inject === 'base64') {
     exp = 'require("' + path.basename(path.dirname(__dirname)) + '").byUrl("' + base64(css) + '")'
   } else if (inject) {
-    exp = "require('browserify-postcss')('" + css.replace(/'/gm, "\\'").replace(/[\r\n]+/gm, ' ') + "')"
+    exp = "require('browserify-postcss')('" + css.replace(/\\/g, '\\\\').replace(/'/gm, "\\'").replace(/[\r\n]+/gm, ' ') + "')"
   } else {
     exp = JSON.stringify(css)
   }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ function moduleify(css, inject) {`
`41`	`41`	`if (inject === 'base64') {`
`42`	`42`	`exp = 'require("' + path.basename(path.dirname(__dirname)) + '").byUrl("' + base64(css) + '")'`
`43`	`43`	`} else if (inject) {`
`44`		`- exp = "require('browserify-postcss')('" + css.replace(/'/gm, "\\'").replace(/[\r\n]+/gm, ' ') + "')"`
	`44`	`+ exp = "require('browserify-postcss')('" + css.replace(/\\/g, '\\\\').replace(/'/gm, "\\'").replace(/[\r\n]+/gm, ' ') + "')"`
`45`	`45`	`} else {`
`46`	`46`	`exp = JSON.stringify(css)`
`47`	`47`	`}`