Skip to content

Exclude external resources from r.js optimization #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Exclude external resources from r.js optimization #208

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d0459
Exclude external resources from r.js optimization
dchekanov Jan 5, 2016
83d49f4
Fix handling of Unix paths
dchekanov Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions css-builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define(['require', './normalize'], function(req, normalize) {
if (config.optimizeCss == 'none') {
return css;
}

if (typeof process !== "undefined" && process.versions && !!process.versions.node && require.nodeRequire) {
try {
var csso = require.nodeRequire('csso');
Expand Down Expand Up @@ -95,8 +95,7 @@ define(['require', './normalize'], function(req, normalize) {

// NB add @media query support for media imports
var importRegEx = /@import\s*(url)?\s*(('([^']*)'|"([^"]*)")|\(('([^']*)'|"([^"]*)"|([^\)]*))\))\s*;?/g;
var absUrlRegEx = /^([^\:\/]+:\/)?\//;


// Write Css module definition
var writeCSSDefinition = "define('@writecss', function() {return function writeCss(c) {var d=document,a='appendChild',i='styleSheet',s=d.createElement('style');s.type='text/css';d.getElementsByTagName('head')[0][a](s);s[i]?s[i].cssText=c:s[a](d.createTextNode(c));};});";

Expand All @@ -123,11 +122,12 @@ define(['require', './normalize'], function(req, normalize) {
siteRoot = siteRoot.replace(/\\/g, '/');
}

var fileUrl = req.toUrl(name + '.css');

//external URLS don't get added (just like JS requires)
if (name.match(absUrlRegEx))
if (fileUrl.indexOf('://') !== -1)
return load();

var fileUrl = req.toUrl(name + '.css');
if (isWindows)
fileUrl = fileUrl.replace(/\\/g, '/');

Expand Down Expand Up @@ -157,13 +157,13 @@ define(['require', './normalize'], function(req, normalize) {

cssAPI.write = function(pluginName, moduleName, write, parse) {
var cssModule;

//external URLS don't get added (just like JS requires)
if (moduleName.match(absUrlRegEx))
if (!cssBuffer.hasOwnProperty(moduleName))
return;

layerBuffer.push(cssBuffer[moduleName]);

if (!global._requirejsCssData) {
global._requirejsCssData = {
usedBy: {css: true},
Expand Down Expand Up @@ -210,7 +210,7 @@ define(['require', './normalize'], function(req, normalize) {
delete global._requirejsCssData;
}
}

saveFile(outPath, compress(css));
});

Expand Down