Skip to content

Commit 527c2be

Browse files
committed
WIP: There are some problems.
webpack/webpack#3917
1 parent e42abf3 commit 527c2be

File tree

2 files changed

+36
-28
lines changed

2 files changed

+36
-28
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"karma-notify-reporter": "^1.0.1",
7878
"karma-remap-coverage": "^0.1.2",
7979
"karma-sourcemap-loader": "^0.3.7",
80-
"karma-webpack": "^1.8.0",
80+
"karma-webpack": "^2.0.1",
8181
"raw-loader": "^0.5.1",
8282
"rimraf": "^2.5.4",
8383
"source-map-loader": "^0.1.5",
@@ -86,8 +86,8 @@
8686
"tslint": "^4.0.2",
8787
"tslint-loader": "^3.3.0",
8888
"typescript": "~2.1.5",
89-
"webpack": ">=2.1.0-beta.27",
90-
"webpack-dev-server": ">=2.1.0-beta.11",
89+
"webpack": "2.2.0-rc.4",
90+
"webpack-dev-server": "2.2.0-rc.0",
9191
"webpack-merge": "^2.0.0"
9292
}
9393
}

yarn.lock

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ acorn-dynamic-import@^2.0.0:
118118
dependencies:
119119
acorn "^4.0.3"
120120

121-
acorn@^4.0.3:
121+
acorn@^4.0.3, acorn@^4.0.4:
122122
version "4.0.4"
123123
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
124124

@@ -1398,7 +1398,7 @@ [email protected]:
13981398
engine.io-parser "1.3.2"
13991399
ws "1.1.1"
14001400

1401-
enhanced-resolve@^2.2.0, enhanced-resolve@^2.3.0:
1401+
enhanced-resolve@^2.3.0:
14021402
version "2.3.0"
14031403
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz#a115c32504b6302e85a76269d7a57ccdd962e359"
14041404
dependencies:
@@ -1407,6 +1407,15 @@ enhanced-resolve@^2.2.0, enhanced-resolve@^2.3.0:
14071407
object-assign "^4.0.1"
14081408
tapable "^0.2.3"
14091409

1410+
enhanced-resolve@^3.0.0:
1411+
version "3.0.3"
1412+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz#df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"
1413+
dependencies:
1414+
graceful-fs "^4.1.2"
1415+
memory-fs "^0.4.0"
1416+
object-assign "^4.0.1"
1417+
tapable "^0.2.5"
1418+
14101419
ent@~2.2.0:
14111420
version "2.2.0"
14121421
resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
@@ -2448,9 +2457,9 @@ karma-sourcemap-loader@^0.3.7:
24482457
dependencies:
24492458
graceful-fs "^4.1.2"
24502459

2451-
karma-webpack@^1.8.0:
2452-
version "1.8.1"
2453-
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.1.tgz#39d5fd2edeea3cc3ef5b405989b37d5b0e6a3b4e"
2460+
karma-webpack@^2.0.1:
2461+
version "2.0.1"
2462+
resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.1.tgz#271ac955685b9bd99365ef010ffc5655eac28ef6"
24542463
dependencies:
24552464
async "~0.9.0"
24562465
loader-utils "^0.2.5"
@@ -2778,14 +2787,14 @@ [email protected]:
27782787
version "0.3.0"
27792788
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
27802789

2781-
memory-fs@^0.3.0, memory-fs@~0.3.0:
2790+
memory-fs@^0.3.0:
27822791
version "0.3.0"
27832792
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
27842793
dependencies:
27852794
errno "^0.1.3"
27862795
readable-stream "^2.0.1"
27872796

2788-
memory-fs@~0.4.1:
2797+
memory-fs@^0.4.0, memory-fs@~0.4.1:
27892798
version "0.4.1"
27902799
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
27912800
dependencies:
@@ -4327,7 +4336,7 @@ symbol-observable@^1.0.1:
43274336
version "1.0.4"
43284337
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
43294338

4330-
tapable@^0.2.3, tapable@~0.2.3:
4339+
tapable@^0.2.3, tapable@^0.2.5, tapable@~0.2.5:
43314340
version "0.2.6"
43324341
resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
43334342

@@ -4482,7 +4491,7 @@ typescript@~2.1.5:
44824491
version "2.1.5"
44834492
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.1.5.tgz#6fe9479e00e01855247cea216e7561bafcdbcd4a"
44844493

4485-
[email protected], uglify-js@^2.6, uglify-js@~2.7.3:
4494+
[email protected], uglify-js@^2.6, uglify-js@^2.7.5:
44864495
version "2.7.5"
44874496
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
44884497
dependencies:
@@ -4651,7 +4660,7 @@ void-elements@^2.0.0:
46514660
version "2.0.1"
46524661
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
46534662

4654-
watchpack@^1.0.0:
4663+
watchpack@^1.2.0:
46554664
version "1.2.0"
46564665
resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.2.0.tgz#15d4620f1e7471f13fcb551d5c030d2c3eb42dbb"
46574666
dependencies:
@@ -4665,7 +4674,7 @@ wbuf@^1.1.0, wbuf@^1.4.0:
46654674
dependencies:
46664675
minimalistic-assert "^1.0.0"
46674676

4668-
webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.4.0:
4677+
webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0:
46694678
version "1.9.0"
46704679
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.9.0.tgz#a1c67a3dfd8a5c5d62740aa0babe61758b4c84aa"
46714680
dependencies:
@@ -4674,9 +4683,9 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.4.0:
46744683
path-is-absolute "^1.0.0"
46754684
range-parser "^1.0.3"
46764685

4677-
webpack-dev-server@>=2.1.0-beta.11:
4678-
version "2.1.0-beta.12"
4679-
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.1.0-beta.12.tgz#f717e7b69214dae0e7a2061c12d128432d7520ef"
4686+
webpack-dev-server@2.2.0-rc.0:
4687+
version "2.2.0-rc.0"
4688+
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.2.0-rc.0.tgz#ea8a11e211d9524b8999945fe5645481a51fdf46"
46804689
dependencies:
46814690
chokidar "^1.6.0"
46824691
compression "^1.5.2"
@@ -4691,7 +4700,7 @@ webpack-dev-server@>=2.1.0-beta.11:
46914700
spdy "^3.4.1"
46924701
strip-ansi "^3.0.0"
46934702
supports-color "^3.1.1"
4694-
webpack-dev-middleware "^1.4.0"
4703+
webpack-dev-middleware "^1.9.0"
46954704
yargs "^6.0.0"
46964705

46974706
webpack-merge@^2.0.0:
@@ -4707,29 +4716,28 @@ webpack-sources@^0.1.0:
47074716
source-list-map "~0.1.0"
47084717
source-map "~0.5.3"
47094718

4710-
webpack@>=2.1.0-beta.27:
4711-
version "2.1.0-beta.28"
4712-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.1.0-beta.28.tgz#8f9402c05bae04ab8d3918489b3547544a2e2641"
4719+
webpack@2.2.0-rc.4:
4720+
version "2.2.0-rc.4"
4721+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.0-rc.4.tgz#3d4bd04976be45fcb20c0eab7fe5a96f5ad53068"
47134722
dependencies:
4714-
acorn "^4.0.3"
4723+
acorn "^4.0.4"
47154724
acorn-dynamic-import "^2.0.0"
47164725
ajv "^4.7.0"
47174726
ajv-keywords "^1.1.1"
47184727
async "^2.1.2"
4719-
enhanced-resolve "^2.2.0"
4728+
enhanced-resolve "^3.0.0"
47204729
interpret "^1.0.0"
47214730
json-loader "^0.5.4"
47224731
loader-runner "^2.2.0"
47234732
loader-utils "^0.2.16"
4724-
memory-fs "~0.3.0"
4733+
memory-fs "~0.4.1"
47254734
mkdirp "~0.5.0"
47264735
node-libs-browser "^2.0.0"
4727-
object-assign "^4.0.1"
47284736
source-map "^0.5.3"
47294737
supports-color "^3.1.0"
4730-
tapable "~0.2.3"
4731-
uglify-js "~2.7.3"
4732-
watchpack "^1.0.0"
4738+
tapable "~0.2.5"
4739+
uglify-js "^2.7.5"
4740+
watchpack "^1.2.0"
47334741
webpack-sources "^0.1.0"
47344742
yargs "^6.0.0"
47354743

0 commit comments

Comments
 (0)