github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'abernix-meteor-issue-7416' into devel

Browse Source
This commit is contained in:
Tom Coleman
2016-07-20 08:27:12 +10:00
parent dc28c29985 8a64476b5f
commit 0aaa2e1414
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
History.md
View File

@@ -1,5 +1,9 @@
## v.NEXT
* Fix for regression caused by #5837 which incorrectly rewrote
network-path references (i.e. //domain.com/image.gif) in CSS URLs
[#7416](https://github.com/meteor/meteor/issues/7416)
## v1.3.5.1
* This release fixed a small bug in 1.3.5 that prevented updating apps
@@ -95,6 +99,9 @@
* `App.appendToConfig` allows adding custom tags to config.xml.
[#7307](https://github.com/meteor/meteor/pull/7307)
* When using `ROOT_URL` with a path, relative CSS URLs are rewriten
accordingly. [#5837](https://github.com/meteor/meteor/issues/5837)
* Fixed bugs:
[#7149](https://github.com/meteor/meteor/issues/7149)
[#7296](https://github.com/meteor/meteor/issues/7296)

5
packages/minifier-css/minifier.js
View File

@@ -136,8 +136,9 @@ var rewriteRules = function (rules, mergedCssPath) {
// We don't rewrite URLs starting with a protocol definition such as
// http, https, or data.
if (resource.protocol !== null) {
// http, https, or data, or those with network-path references
// i.e. //img.domain.com/cat.gif
if (resource.protocol !== null || resource.href.startsWith('//')) {
continue;
}

2
packages/minifier-css/urlrewriting-tests.js
View File

@@ -78,6 +78,7 @@ Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursio
t("'/image.png'", "'image.png'", 'single quoted url');
t('"./../image.png"', '"packages/image.png"', 'quoted parent directory');
t('http://i.imgur.com/fBcdJIh.gif', 'http://i.imgur.com/fBcdJIh.gif', 'complete URL');
t('//i.imgur.com/fBcdJIh.gif', '//i.imgur.com/fBcdJIh.gif', 'network-path reference');
t('"http://i.imgur.com/fBcdJIh.gif"', '"http://i.imgur.com/fBcdJIh.gif"', 'complete quoted URL');
t('data:image/png;base64,iVBORw0K=', 'data:image/png;base64,iVBORw0K=', 'data URI');
t('http://', 'http://', 'malformed URL');
@@ -90,6 +91,7 @@ Tinytest.add("minifier-css - url rewriting with media queries (ast rule recursio
t('"/image.png"', '"image.png"', 'double quoted url');
t("'/image.png'", "'image.png'", 'single quoted url');
t('http://i.imgur.com/fBcdJIh.gif', 'http://i.imgur.com/fBcdJIh.gif', 'complete URL');
t('//i.imgur.com/fBcdJIh.gif', '//i.imgur.com/fBcdJIh.gif', 'network-path reference');
t('"http://i.imgur.com/fBcdJIh.gif"', '"http://i.imgur.com/fBcdJIh.gif"', 'complete quoted URL');
t('data:image/png;base64,iVBORw0K=', 'data:image/png;base64,iVBORw0K=', 'data URI');
t('http://', 'http://', 'malformed URL');