Skip to content

Commit 22864e3

Browse files
committed
fix($pull): pull in a few updates from main repo
1 parent 17ea604 commit 22864e3

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ ExtractTextPlugin.prototype.apply = function(compiler) {
290290
return callback();
291291
}
292292
meta = module[NS];
293-
if(!Array.isArray(meta.content)) {
293+
if(!Array.isArray(meta.content) && meta.content != null) {
294294
err = new Error(module.identifier() + " doesn't export content");
295295
compilation.errors.push(err);
296296
return callback();

package.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
"engines": {
77
"node": ">=4.3.0 < 5.0.0 || >= 5.10"
88
},
9+
"main": "index.js",
10+
"files": [
11+
"schema",
12+
"ExtractedModule.js",
13+
"index.js",
14+
"loader.js",
15+
"OrderUndefinedError.js",
16+
"hotModuleReplacement.js"
17+
],
918
"license": "MIT",
1019
"scripts": {
1120
"test": "mocha",
@@ -26,7 +35,7 @@
2635
"loader-utils": "^1.0.2",
2736
"schema-utils": "^0.3.0",
2837
"style-loader": "^0.16.1",
29-
"webpack-sources": "^0.2.3"
38+
"webpack-sources": "^1.0.1"
3039
},
3140
"devDependencies": {
3241
"codecov.io": "^0.1.2",

yarn.lock

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3663,6 +3663,10 @@ source-list-map@^1.1.1:
36633663
version "1.1.1"
36643664
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
36653665

3666+
source-list-map@^2.0.0:
3667+
version "2.0.0"
3668+
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
3669+
36663670
source-map@^0.4.4:
36673671
version "0.4.4"
36683672
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -4109,6 +4113,13 @@ webpack-sources@^0.2.3:
41094113
source-list-map "^1.1.1"
41104114
source-map "~0.5.3"
41114115

4116+
webpack-sources@^1.0.1:
4117+
version "1.0.1"
4118+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
4119+
dependencies:
4120+
source-list-map "^2.0.0"
4121+
source-map "~0.5.3"
4122+
41124123
webpack@^2.2.0:
41134124
version "2.4.1"
41144125
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"

0 commit comments

Comments
 (0)