Skip to content

Commit 7336ab9

Browse files
sokrasokra
authored
Merge pull request webpack#6240 from webpack/deps/upgrade-loaders
update some dev deps to latest version
2 parents 8e9470c + 99b6052 commit 7336ab9

File tree

3 files changed

+30
-32
lines changed

3 files changed

+30
-32
lines changed

‎package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
"benchmark": "^2.1.1",
2929
"bundle-loader": "~0.5.0",
3030
"codacy-coverage": "^2.0.1",
31-
"coffee-loader": "~0.7.1",
32-
"coffee-script": "^1.10.0",
31+
"coffee-loader": "^0.9.0",
32+
"coffeescript": "^1.10.0",
3333
"coveralls": "^2.11.2",
3434
"css-loader": "^0.28.3",
3535
"es6-promise-polyfill": "^1.1.1",
3636
"eslint": "^4.3.0",
3737
"eslint-plugin-node": "^5.1.1",
3838
"express": "~4.13.1",
3939
"extract-text-webpack-plugin": "^3.0.0",
40-
"file-loader": "^0.11.2",
40+
"file-loader": "^1.1.6",
4141
"glob": "^7.1.2",
4242
"i18n-webpack-plugin": "^1.0.0",
4343
"istanbul": "^0.4.5",
@@ -58,12 +58,12 @@
5858
"should": "^11.1.1",
5959
"simple-git": "^1.65.0",
6060
"sinon": "^2.3.2",
61-
"style-loader": "^0.18.1",
62-
"url-loader": "~0.5.0",
61+
"style-loader": "^0.19.1",
62+
"url-loader": "^0.6.2",
6363
"val-loader": "^1.0.2",
6464
"vm-browserify": "~0.0.0",
6565
"webpack-dev-middleware": "^1.9.0",
66-
"worker-loader": "^0.8.0",
66+
"worker-loader": "^1.1.0",
6767
"xxhashjs": "^0.2.1"
6868
},
6969
"engines": {

‎test/statsCases/separate-css-bundle/expected.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Child
99
[1] ./a/file.css 41 bytes [built]
1010
[2] (webpack)/node_modules/css-loader!./a/file.css 199 bytes [built]
1111
[3] (webpack)/node_modules/css-loader/lib/css-base.js 2.21 KiB [built]
12-
[4] (webpack)/node_modules/style-loader/lib/addStyles.js 8.5 KiB [built]
12+
[4] (webpack)/node_modules/style-loader/lib/addStyles.js 9.24 KiB [built]
1313
[5] (webpack)/node_modules/style-loader/lib/urls.js 2.94 KiB [built]
1414
Child extract-text-webpack-plugin ../../../node_modules/extract-text-webpack-plugin/dist ../../../node_modules/css-loader/index.js!a/file.css:
1515
[0] (webpack)/node_modules/css-loader!./a/file.css 199 bytes {0} [built]
@@ -24,7 +24,7 @@ Child
2424
[1] ./b/file.css 41 bytes [built]
2525
[2] (webpack)/node_modules/css-loader!./b/file.css 201 bytes [built]
2626
[3] (webpack)/node_modules/css-loader/lib/css-base.js 2.21 KiB [built]
27-
[4] (webpack)/node_modules/style-loader/lib/addStyles.js 8.5 KiB [built]
27+
[4] (webpack)/node_modules/style-loader/lib/addStyles.js 9.24 KiB [built]
2828
[5] (webpack)/node_modules/style-loader/lib/urls.js 2.94 KiB [built]
2929
Child extract-text-webpack-plugin ../../../node_modules/extract-text-webpack-plugin/dist ../../../node_modules/css-loader/index.js!b/file.css:
3030
[0] (webpack)/node_modules/css-loader!./b/file.css 201 bytes {0} [built]

‎yarn.lock

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -615,15 +615,15 @@ code-point-at@^1.0.0:
615615
version "1.1.0"
616616
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
617617

618-
coffee-loader@~0.7.1:
619-
version "0.7.3"
620-
resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
618+
coffee-loader@^0.9.0:
619+
version "0.9.0"
620+
resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.9.0.tgz#6deabd336062ddc6d773da4dfd16367fc7107bd6"
621621
dependencies:
622622
loader-utils "^1.0.2"
623623

624-
coffee-script@^1.10.0:
624+
coffeescript@^1.10.0:
625625
version "1.12.7"
626-
resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
626+
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.12.7.tgz#e57ee4c4867cf7f606bfc4a0f2d550c0981ddd27"
627627

628628
color-convert@^1.3.0, color-convert@^1.9.0:
629629
version "1.9.1"
@@ -1406,11 +1406,12 @@ file-entry-cache@^2.0.0:
14061406
flat-cache "^1.2.1"
14071407
object-assign "^4.0.1"
14081408

1409-
file-loader@^0.11.2:
1410-
version "0.11.2"
1411-
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.2.tgz#4ff1df28af38719a6098093b88c82c71d1794a34"
1409+
file-loader@^1.1.6:
1410+
version "1.1.6"
1411+
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.6.tgz#7b9a8f2c58f00a77fddf49e940f7ac978a3ea0e8"
14121412
dependencies:
14131413
loader-utils "^1.0.2"
1414+
schema-utils "^0.3.0"
14141415

14151416
filename-regex@^2.0.0:
14161417
version "2.0.1"
@@ -2484,11 +2485,7 @@ mime@1.3.4:
24842485
version "1.3.4"
24852486
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
24862487

2487-
mime@1.3.x:
2488-
version "1.3.6"
2489-
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
2490-
2491-
mime@^1.2.11, mime@^1.5.0:
2488+
mime@^1.2.11, mime@^1.4.1, mime@^1.5.0:
24922489
version "1.6.0"
24932490
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
24942491

@@ -3931,9 +3928,9 @@ strip-json-comments@~2.0.1:
39313928
version "2.0.1"
39323929
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
39333930

3934-
style-loader@^0.18.1:
3935-
version "0.18.2"
3936-
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.18.2.tgz#cc31459afbcd6d80b7220ee54b291a9fd66ff5eb"
3931+
style-loader@^0.19.1:
3932+
version "0.19.1"
3933+
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.1.tgz#591ffc80bcefe268b77c5d9ebc0505d772619f85"
39373934
dependencies:
39383935
loader-utils "^1.0.2"
39393936
schema-utils "^0.3.0"
@@ -4190,12 +4187,13 @@ unpipe@~1.0.0:
41904187
version "1.0.0"
41914188
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
41924189

4193-
url-loader@~0.5.0:
4194-
version "0.5.9"
4195-
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
4190+
url-loader@^0.6.2:
4191+
version "0.6.2"
4192+
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
41964193
dependencies:
41974194
loader-utils "^1.0.2"
4198-
mime "1.3.x"
4195+
mime "^1.4.1"
4196+
schema-utils "^0.3.0"
41994197

42004198
url@^0.11.0:
42014199
version "0.11.0"
@@ -4329,11 +4327,11 @@ worker-farm@^1.4.1:
43294327
errno "^0.1.4"
43304328
xtend "^4.0.1"
43314329

4332-
worker-loader@^0.8.0:
4333-
version "0.8.1"
4334-
resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-0.8.1.tgz#e8e995331ea34df5bf68296824bfb7f0ad578d43"
4330+
worker-loader@^1.1.0:
4331+
version "1.1.0"
4332+
resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-1.1.0.tgz#8cf21869a07add84d66f821d948d23c1eb98e809"
43354333
dependencies:
4336-
loader-utils "^1.0.2"
4334+
loader-utils "^1.0.0"
43374335
schema-utils "^0.3.0"
43384336

43394337
wrappy@1:

0 commit comments

Comments
 (0)