Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Fix handling of loaders as objects without a query prop #232

Merged
merged 2 commits into from
Aug 17, 2016
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
3 changes: 2 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ module.exports = ExtractTextPlugin;

// modified from webpack/lib/LoadersList.js
function getLoaderWithQuery(loader) {
if(isString(loader) || !loader.query) return loader;
if(isString(loader)) return loader;
if(!loader.query) return loader.loader;
var query = isString(loader.query) ? loader.query : JSON.stringify(loader.query);
return loader.loader + "?" + query;
}
Expand Down
3 changes: 3 additions & 0 deletions test/cases/simple-queryless-object/a.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
correct: a;
}
3 changes: 3 additions & 0 deletions test/cases/simple-queryless-object/b.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
body {
correct: b;
}
8 changes: 8 additions & 0 deletions test/cases/simple-queryless-object/expected/file.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions test/cases/simple-queryless-object/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require("./a.css");
require("./b.css");
18 changes: 18 additions & 0 deletions test/cases/simple-queryless-object/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
var ExtractTextPlugin = require("../../../");
module.exports = {
entry: "./index",
module: {
loaders: [
{ test: /\.css$/, loader: ExtractTextPlugin.extract({
fallbackLoader: { loader: "style-loader" },
loader: { loader: "css-loader", query: {
sourceMap: true
} }
}) }
]
},
devtool: "source-map",
plugins: [
new ExtractTextPlugin("file.css")
]
};