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

refactor: Apply webpack-defaults & webpack 3.x support #540

Merged
merged 24 commits into from
Jul 10, 2017
Merged

refactor: Apply webpack-defaults & webpack 3.x support #540

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
77daf83
refactor: pass a unique compiler name to get child compilation (#483)
sokra Jun 11, 2017
92e4349
chore(package): Update peerDeps & webpack devDep
joshwiens Jun 11, 2017
292e217
refactor: Apply webpack-defaults (#542)
joshwiens Jun 21, 2017
28171b2
refactor: Chunk.modules deprecation warning
joshwiens Jun 23, 2017
1730d46
chore(release): 3.0.0-beta.0
joshwiens Jun 23, 2017
5d0c28f
fix: Distribute schema with package
joshwiens Jun 24, 2017
715b1dd
chore(release): 3.0.0-beta.1
joshwiens Jun 24, 2017
1ef755a
chore: Update install docs
joshwiens Jun 24, 2017
84a0328
chore(release): 3.0.0-beta.2
joshwiens Jun 24, 2017
b33e006
chore(package): Update deps minor versions
joshwiens Jun 24, 2017
d4a0c23
chore(release): 3.0.0-beta.3
joshwiens Jun 24, 2017
10721f5
chore: Update changelog for beta 1 & 2
joshwiens Jun 24, 2017
be7936d
refactor: Update deprecated `chunk.modules` functions (#553)
joshwiens Jul 7, 2017
df93eab
chore: Update to defaults 1.5.x
joshwiens Jul 7, 2017
c5471f6
ci(Appveyor): Remove explicit npm 5 install
joshwiens Jul 7, 2017
b70c6ec
chore(release): 3.0.0-rc.0
joshwiens Jul 7, 2017
2c2f12b
test: Fix order by id test
joshwiens Jul 7, 2017
28363ab
test: Add nested order by id test
joshwiens Jul 7, 2017
27e3a28
fix: Module sorting
joshwiens Jul 7, 2017
1f057e1
test: Failing test for css ordering (#564)
michael-ciniawsky Jul 7, 2017
7f46af0
test: fix expected for css order test
joshwiens Jul 7, 2017
29e1b4c
chore(release): 3.0.0-rc.1
joshwiens Jul 7, 2017
113cabb
fix: Modules shouldn't be passed to sort (#568)
joshwiens Jul 10, 2017
6b4e64c
chore(release): 3.0.0-rc.2
joshwiens Jul 10, 2017
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
10 changes: 1 addition & 9 deletions loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,12 @@ module.exports.pitch = function(request) {
filename: childFilename,
publicPath: publicPath
};
var childCompiler = this._compilation.createChildCompiler("extract-text-webpack-plugin", outputOptions);
var childCompiler = this._compilation.createChildCompiler("extract-text-webpack-plugin " + NS + " " + request, outputOptions);
childCompiler.apply(new NodeTemplatePlugin(outputOptions));
childCompiler.apply(new LibraryTemplatePlugin(null, "commonjs2"));
childCompiler.apply(new NodeTargetPlugin());
childCompiler.apply(new SingleEntryPlugin(this.context, "!!" + request));
childCompiler.apply(new LimitChunkCountPlugin({ maxChunks: 1 }));
var subCache = "subcache " + NS + " " + request; // eslint-disable-line no-path-concat
childCompiler.plugin("compilation", function(compilation) {
if(compilation.cache) {
if(!compilation.cache[subCache])
compilation.cache[subCache] = {};
compilation.cache = compilation.cache[subCache];
}
});
// We set loaderContext[NS] = false to indicate we already in
// a child compiler so we don't spawn another child compilers from there.
childCompiler.plugin("this-compilation", function(compilation) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"OrderUndefinedError.js"
],
"peerDependencies": {
"webpack": "^2.2.0"
"webpack": ">= 3.0.0-rc.0 || ^3.0.0"
},
"dependencies": {
"schema-utils": "^0.3.0",
Expand All @@ -35,7 +35,7 @@
"should": "^11.1.2",
"standard-version": "^4.1.0",
"style-loader": "^0.18.2",
"webpack": "^2.6.1"
"webpack": "^3.0.0-rc.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^3.0.0

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is removed in #542

},
"homepage": "http://github.com/webpack-contrib/extract-text-webpack-plugin",
"repository": {
Expand Down