Skip to content
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.

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

Option to render CSS into component #1

Merged
merged 4 commits into from
Jun 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions less-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ define(['require', './normalize'], function(req, normalize) {
if (moduleName.match(absUrlRegEx))
return;

layerBuffer.push(lessBuffer[moduleName]);
var css = lessBuffer[moduleName];
layerBuffer.push(css);

//use global variable to combine plugin results with results of require-css plugin
if (!global._requirejsCssData) {
Expand All @@ -165,10 +166,12 @@ define(['require', './normalize'], function(req, normalize) {
global._requirejsCssData.usedBy.less = true;
}

write.asModule(pluginName + '!' + moduleName, 'define(function(){})');
var moduleContent = config.less.component ? "return '" + escape(compress(css)) + "'" : '';
write.asModule(pluginName + '!' + moduleName, 'define(function(){' + moduleContent + '});');
};

lessAPI.onLayerEnd = function(write, data) {
if (config.less.component === true) return;

//calculate layer css
var css = layerBuffer.join('');
Expand Down
53 changes: 32 additions & 21 deletions less.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,70 @@
define(['require'], function(require) {

var lessAPI = {};

lessAPI.pluginBuilder = './less-builder';

define(function(require) {
var lessAPI = {
pluginBuilder: './less-builder'
};

if (typeof window == 'undefined') {
lessAPI.load = function(n, r, load) { load(); };
return lessAPI;
}

lessAPI.normalize = function(name, normalize) {
if (name.substr(name.length - 5, 5) == '.less')
if (name.substr(name.length - 5, 5) === '.less') {
name = name.substr(0, name.length - 5);
}

name = normalize(name);

return name;
return normalize(name);
};

var head = document.getElementsByTagName('head')[0];

var head = document.getElementsByTagName('head')[0];
var base = document.getElementsByTagName('base');

base = base && base[0] && base[0] && base[0].href;

var pagePath = (base || window.location.href.split('#')[0].split('?')[0]).split('/');

pagePath[pagePath.length - 1] = '';
pagePath = pagePath.join('/');

var styleCnt = 0;
var curStyle;

lessAPI.inject = function(css) {
if (styleCnt < 31) {
curStyle = document.createElement('style');
curStyle.type = 'text/css';
head.appendChild(curStyle);
styleCnt++;
styleCnt += 1;
}
if (curStyle.styleSheet)

if (curStyle.styleSheet) {
curStyle.styleSheet.cssText += css;
else
} else {
curStyle.appendChild(document.createTextNode(css));
}
};

lessAPI.load = function(lessId, req, load, config) {
window.less = config.less || {};
window.less.env = 'development';

require(['./lessc', './normalize'], function(lessc, normalize) {

var fileUrl = req.toUrl(lessId + '.less');
fileUrl = normalize.absoluteURI(fileUrl, pagePath);

//make it compatible with v1 and v2
var generation = (lessc.version || [1])[0];
var renderer;
var cssGetter;

if (generation === 1) {
//v1, use parser and toCSS
var parser = new lessc.Parser(window.less);

renderer = function (input, cb) {
parser.parse.call(parser, input, cb, window.less);
};

cssGetter = function (tree) {
return tree.toCSS(config.less);
};
Expand All @@ -68,6 +73,7 @@ define(['require'], function(require) {
renderer = function (input, cb) {
lessc.render(input, window.less, cb);
};

cssGetter = function (output) {
return output.css;
};
Expand All @@ -78,14 +84,19 @@ define(['require'], function(require) {
console.log(err + ' at ' + fileUrl + ', line ' + err.line);
return load.error(err);
}

var css = cssGetter(output);
lessAPI.inject(normalize(css, fileUrl, pagePath));

setTimeout(load, 7);
}, window.less);
if (config.less.component !== true) {
lessAPI.inject(normalize(css, fileUrl, pagePath));
setTimeout(load, 7);
} else {
load(css);
}

}, window.less);
});
};

return lessAPI;
});