Skip to content

Commit e362545

Browse files
committed
allow external resources in "url(//example.com)"
1 parent e120bed commit e362545

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = function(content) {
3333
var uriRegExp = /%CSSURL\[%(.*?)%\]CSSURL%/g;
3434
css = css.replace(uriRegExp, function(str) {
3535
var match = /^%CSSURL\[%(.*?)%\]CSSURL%$/.exec(str);
36-
if(/^data:|^https?:\/\//.test(match[1])) return match[1];
36+
if(/^data:|^(https?:)?\/\//.test(match[1])) return match[1];
3737
var idx = match[1].indexOf("?");
3838
if(idx < 0) idx = match[1].indexOf("#");
3939
if(idx >= 0) {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "css-loader",
3-
"version": "0.6.4",
3+
"version": "0.6.5",
44
"author": "Tobias Koppers @sokra",
55
"description": "css loader module for webpack",
66
"dependencies": {

test/urlTest.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ describe("url", function() {
5555
test("background img 2", ".class { background: green url(~img/png ) url(aaa) xyz }",
5656
["\".class { background: green url(\"+require(\"img/png\")+\" ) url(\"+require(\"./aaa\")+\") xyz }\""]);
5757
test("background img external",
58-
".class { background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) xyz }",
59-
["\".class { background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) xyz }\""]);
58+
".class { background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz }",
59+
["\".class { background: green url(data:image/png;base64,AAA) url(http://example.com/image.jpg) url(//example.com/image.png) xyz }\""]);
6060
test("font face", "@font-face { src: url(regular.woff) format('woff'), url(~truetype/regular.ttf) format('truetype') }",
6161
["\"@font-face { src: url(\"+require(\"./regular.woff\")+\") format('woff'), url(\"+require(\"truetype/regular.ttf\")+\") format('truetype') }\""]);
6262
testMinimize("minimized simple", ".class { a: b c d; }",

0 commit comments

Comments
 (0)