avoid absolute paths in style code

yyx990803 · yyx990803 · commit 933e492358c8 · 2016-05-30T18:01:26.000-04:00
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -112,7 +112,7 @@ compiler.compile = function (content, filePath, cb) {
     if (style) {
       style = JSON.stringify(style)
       output +=
-        'var __vueify_insert__ = require(' + JSON.stringify(require.resolve('./insert-css')) + ')\n' +
+        'var __vueify_insert__ = require("vueify/lib/insert-css")\n' +
         'var __vueify_style__ = __vueify_insert__.insert(' + style + ')\n'
     }
     // script
diff --git a/test/expects/autoprefix.js b/test/expects/autoprefix.js
@@ -1,2 +1,2 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("body{-webkit-transform:scale(1);transform:scale(1)}")
diff --git a/test/expects/basic.js b/test/expects/basic.js
@@ -1,4 +1,4 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("html{font-size:20px}")
 "use strict";
 
diff --git a/test/expects/less.js b/test/expects/less.js
@@ -1,2 +1,2 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert(".box{color:#fe33ac;border-color:#fdcdea}.box div{-webkit-box-shadow:0 0 5px rgba(0,0,0,.3);box-shadow:0 0 5px rgba(0,0,0,.3)}.box:before{content:'\\f101'}")
diff --git a/test/expects/multiple-styles.js b/test/expects/multiple-styles.js
@@ -1,2 +1,2 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("h1{font-size:20px}\n#test h1{font-size:18px}\nh2{font-size:14px}")
diff --git a/test/expects/multiple.js b/test/expects/multiple.js
@@ -1,4 +1,4 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("body{font:12px Helvetica,Arial,sans-serif}a.button{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}")
 module.exports = {
   data: function() {
diff --git a/test/expects/non-minified.js b/test/expects/non-minified.js
@@ -1,3 +1,3 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("\nhtml {\n  font-size: 20px;\n}\n")
 ;(typeof module.exports === "function"? module.exports.options: module.exports).template = "\n<h1 :id=\"id\" @click=\"hi\">hello</h1>\n"
diff --git a/test/expects/sass.js b/test/expects/sass.js
@@ -1,2 +1,2 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("body{font:100% Helvetica,sans-serif;color:#333}")
diff --git a/test/expects/scoped.js b/test/expects/scoped.js
diff --git a/test/expects/src.js b/test/expects/src.js
@@ -1,4 +1,4 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("h1{font-size:12px}")
 'use strict';
 
diff --git a/test/expects/styl.js b/test/expects/styl.js
@@ -1,2 +1,2 @@
-var __vueify_insert__ = require("{{insertCss}}")
+var __vueify_insert__ = require("vueify/lib/insert-css")
 var __vueify_style__ = __vueify_insert__.insert("body{font:100% Helvetica,sans-serif;color:#333}")
diff --git a/test/test.js b/test/test.js
@@ -24,7 +24,6 @@ function test (name) {
     var fileContent = read(filePath)
     var expected = read('expects/' + name + '.js')
       .replace(/\{\{id\}\}/g, '_v-' + hash(require.resolve('./' + filePath)))
-      .replace(/\{\{insertCss\}\}/g, require.resolve('../lib/insert-css'))
 
     // test registering dependency
     var deps = []

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ compiler.compile = function (content, filePath, cb) {`
`112`	`112`	`if (style) {`
`113`	`113`	`style = JSON.stringify(style)`
`114`	`114`	`output +=`
`115`		`- 'var __vueify_insert__ = require(' + JSON.stringify(require.resolve('./insert-css')) + ')\n' +`
	`115`	`+ 'var __vueify_insert__ = require("vueify/lib/insert-css")\n' +`
`116`	`116`	`'var __vueify_style__ = __vueify_insert__.insert(' + style + ')\n'`
`117`	`117`	`}`
`118`	`118`	`// script`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-var __vueify_insert__ = require("{{insertCss}}")`
	`1`	`+var __vueify_insert__ = require("vueify/lib/insert-css")`
`2`	`2`	`var __vueify_style__ = __vueify_insert__.insert("body{-webkit-transform:scale(1);transform:scale(1)}")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var __vueify_insert__ = require("{{insertCss}}")`
	`1`	`+var __vueify_insert__ = require("vueify/lib/insert-css")`
`2`	`2`	`var __vueify_style__ = __vueify_insert__.insert("html{font-size:20px}")`
`3`	`3`	`"use strict";`
`4`	`4`