Skip to content
Closed
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
23 changes: 18 additions & 5 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ module.exports = function(source) {
var isSync = typeof cb !== "function";
var finalCb = cb || this.callback;
var configKey = query.config || "lessLoader";
var options = this.options[configKey];
var config = {
filename: this.resource,
paths: [],
relativeUrls: true,
compress: !!this.minimize
};
var importLoaders = options ? options.importLoaders : null;
var webpackPlugin = {
install: function(less, pluginManager) {
var WebpackFileManager = getWebpackFileManager(less, loaderContext, query, isSync);
var WebpackFileManager = getWebpackFileManager(less, loaderContext, query, isSync, importLoaders);

pluginManager.addFileManager(new WebpackFileManager());
},
Expand All @@ -47,8 +49,8 @@ module.exports = function(source) {
config.plugins.push(webpackPlugin);

// If present, add custom LESS plugins.
if (this.options[configKey]) {
config.plugins = config.plugins.concat(this.options[configKey].lessPlugins || []);
if (options) {
config.plugins = config.plugins.concat(options.lessPlugins || []);
}

// not using the `this.sourceMap` flag because css source maps are different
Expand All @@ -71,7 +73,7 @@ module.exports = function(source) {
});
};

function getWebpackFileManager(less, loaderContext, query, isSync) {
function getWebpackFileManager(less, loaderContext, query, isSync, importLoaders) {

function WebpackFileManager() {
less.FileManager.apply(this, arguments);
Expand Down Expand Up @@ -114,7 +116,18 @@ function getWebpackFileManager(less, loaderContext, query, isSync) {

loaderContext.dependency && loaderContext.dependency(filename);
// The default (asynchronous)
loaderContext.loadModule("-!" + __dirname + "/stringify.loader.js!" + filename, function(err, data) {

var importLoadersStr = '';
if (importLoaders)
{
importLoadersStr = importLoaders(filename);
if (importLoadersStr)
{
importLoadersStr += '!';
}
}
loaderContext.loadModule("-!" + __dirname + "/stringify.loader.js!" +
importLoadersStr + filename, function(err, data) {
if(err) {
callback(err);
return;
Expand Down