Skip to content

Commit 463943d

Browse files
committed
Merge branch 'greenkeeper/webpack-3.0.0'
2 parents 5adc9c5 + bd464f7 commit 463943d

2 files changed

Lines changed: 73 additions & 29 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"licensor": "^3.1.0",
6060
"lint-staged": "^4.0.0",
6161
"prettier": "^1.1.0",
62-
"webpack": "^2.2.1"
62+
"webpack": "^3.0.0"
6363
},
6464
"peerDependencies": {
6565
"html-webpack-plugin": "^2.10.0"

yarn.lock

Lines changed: 72 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,30 @@ acorn@^5.0.0, acorn@^5.0.1:
4040
version "5.0.3"
4141
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
4242

43-
ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
43+
ajv-keywords@^1.0.0:
4444
version "1.5.1"
4545
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
4646

47+
ajv-keywords@^2.0.0:
48+
version "2.1.0"
49+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
50+
4751
ajv@^4.7.0, ajv@^4.9.1:
4852
version "4.11.8"
4953
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
5054
dependencies:
5155
co "^4.6.0"
5256
json-stable-stringify "^1.0.1"
5357

58+
ajv@^5.1.5:
59+
version "5.2.0"
60+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
61+
dependencies:
62+
co "^4.6.0"
63+
fast-deep-equal "^0.1.0"
64+
json-schema-traverse "^0.3.0"
65+
json-stable-stringify "^1.0.1"
66+
5467
align-text@^0.1.1, align-text@^0.1.3:
5568
version "0.1.4"
5669
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -1766,9 +1779,9 @@ execa@^0.4.0:
17661779
path-key "^1.0.0"
17671780
strip-eof "^1.0.0"
17681781

1769-
execa@^0.6.0:
1770-
version "0.6.3"
1771-
resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe"
1782+
execa@^0.7.0:
1783+
version "0.7.0"
1784+
resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
17721785
dependencies:
17731786
cross-spawn "^5.0.1"
17741787
get-stream "^3.0.0"
@@ -1808,6 +1821,10 @@ extsprintf@1.0.2:
18081821
version "1.0.2"
18091822
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
18101823

1824+
fast-deep-equal@^0.1.0:
1825+
version "0.1.0"
1826+
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
1827+
18111828
fast-levenshtein@~2.0.4:
18121829
version "2.0.6"
18131830
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -2176,8 +2193,8 @@ html-minifier@^3.2.3:
21762193
uglify-js "~2.8.22"
21772194

21782195
html-webpack-plugin@^2.10.0:
2179-
version "2.28.0"
2180-
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz#2e7863b57e5fd48fe263303e2ffc934c3064d009"
2196+
version "2.29.0"
2197+
resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-2.29.0.tgz#e987f421853d3b6938c8c4c8171842e5fd17af23"
21812198
dependencies:
21822199
bluebird "^3.4.7"
21832200
html-minifier "^3.2.3"
@@ -2844,6 +2861,10 @@ json-loader@^0.5.4:
28442861
version "0.5.4"
28452862
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
28462863

2864+
json-schema-traverse@^0.3.0:
2865+
version "0.3.1"
2866+
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
2867+
28472868
json-schema@0.2.3:
28482869
version "0.2.3"
28492870
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -2934,16 +2955,18 @@ licensor@^3.1.0:
29342955
normalize-package-data "^2.1.0"
29352956
word-wrap "^1.1.0"
29362957

2937-
lint-staged@^3.4.0:
2938-
version "3.4.1"
2939-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-3.4.1.tgz#96cd1cf7a1ac92d81662643c37d1cca28b91b046"
2958+
lint-staged@^4.0.0:
2959+
version "4.0.0"
2960+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.0.0.tgz#c15669f598614a6e68090303e175a799d48e0d85"
29402961
dependencies:
29412962
app-root-path "^2.0.0"
29422963
cosmiconfig "^1.1.0"
2943-
execa "^0.6.0"
2964+
execa "^0.7.0"
29442965
listr "^0.12.0"
2966+
lodash.chunk "^4.2.0"
29452967
minimatch "^3.0.0"
29462968
npm-which "^3.0.1"
2969+
p-map "^1.1.1"
29472970
staged-git-files "0.0.4"
29482971

29492972
listr-silent-renderer@^1.1.1:
@@ -3016,13 +3039,25 @@ loader-utils@^0.2.16:
30163039
json5 "^0.5.0"
30173040
object-assign "^4.0.1"
30183041

3042+
loader-utils@^1.1.0:
3043+
version "1.1.0"
3044+
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
3045+
dependencies:
3046+
big.js "^3.1.3"
3047+
emojis-list "^2.0.0"
3048+
json5 "^0.5.0"
3049+
30193050
locate-path@^2.0.0:
30203051
version "2.0.0"
30213052
resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
30223053
dependencies:
30233054
p-locate "^2.0.0"
30243055
path-exists "^3.0.0"
30253056

3057+
lodash.chunk@^4.2.0:
3058+
version "4.2.0"
3059+
resolved "https://registry.yarnpkg.com/lodash.chunk/-/lodash.chunk-4.2.0.tgz#66e5ce1f76ed27b4303d8c6512e8d1216e8106bc"
3060+
30263061
lodash.cond@^4.3.0:
30273062
version "4.5.2"
30283063
resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
@@ -4043,9 +4078,9 @@ sntp@1.x.x:
40434078
dependencies:
40444079
hoek "2.x.x"
40454080

4046-
source-list-map@^1.1.1:
4047-
version "1.1.2"
4048-
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
4081+
source-list-map@^2.0.0:
4082+
version "2.0.0"
4083+
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
40494084

40504085
source-map-support@^0.4.2:
40514086
version "0.4.15"
@@ -4346,9 +4381,9 @@ typedarray@^0.0.6:
43464381
version "0.0.6"
43474382
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
43484383

4349-
uglify-js@^2.6, uglify-js@^2.8.5, uglify-js@~2.8.22:
4350-
version "2.8.23"
4351-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.23.tgz#8230dd9783371232d62a7821e2cf9a817270a8a0"
4384+
uglify-js@^2.6, uglify-js@^2.8.29, uglify-js@~2.8.22:
4385+
version "2.8.29"
4386+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
43524387
dependencies:
43534388
source-map "~0.5.1"
43544389
yargs "~3.10.0"
@@ -4359,6 +4394,14 @@ uglify-to-browserify@~1.0.0:
43594394
version "1.0.2"
43604395
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
43614396

4397+
uglifyjs-webpack-plugin@^0.4.4:
4398+
version "0.4.6"
4399+
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
4400+
dependencies:
4401+
source-map "^0.5.6"
4402+
uglify-js "^2.8.29"
4403+
webpack-sources "^1.0.1"
4404+
43624405
uid-number@^0.0.6:
43634406
version "0.0.6"
43644407
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -4486,37 +4529,38 @@ webidl-conversions@^4.0.0:
44864529
version "4.0.1"
44874530
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
44884531

4489-
webpack-sources@^0.2.3:
4490-
version "0.2.3"
4491-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
4532+
webpack-sources@^1.0.1:
4533+
version "1.0.1"
4534+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
44924535
dependencies:
4493-
source-list-map "^1.1.1"
4536+
source-list-map "^2.0.0"
44944537
source-map "~0.5.3"
44954538

4496-
webpack@^2.2.1:
4497-
version "2.5.1"
4498-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.5.1.tgz#61742f0cf8af555b87460a9cd8bba2f1e3ee2fce"
4539+
webpack@^3.0.0:
4540+
version "3.0.0"
4541+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
44994542
dependencies:
45004543
acorn "^5.0.0"
45014544
acorn-dynamic-import "^2.0.0"
4502-
ajv "^4.7.0"
4503-
ajv-keywords "^1.1.1"
4545+
ajv "^5.1.5"
4546+
ajv-keywords "^2.0.0"
45044547
async "^2.1.2"
45054548
enhanced-resolve "^3.0.0"
4549+
escope "^3.6.0"
45064550
interpret "^1.0.0"
45074551
json-loader "^0.5.4"
45084552
json5 "^0.5.1"
45094553
loader-runner "^2.3.0"
4510-
loader-utils "^0.2.16"
4554+
loader-utils "^1.1.0"
45114555
memory-fs "~0.4.1"
45124556
mkdirp "~0.5.0"
45134557
node-libs-browser "^2.0.0"
45144558
source-map "^0.5.3"
45154559
supports-color "^3.1.0"
45164560
tapable "~0.2.5"
4517-
uglify-js "^2.8.5"
4561+
uglifyjs-webpack-plugin "^0.4.4"
45184562
watchpack "^1.3.1"
4519-
webpack-sources "^0.2.3"
4563+
webpack-sources "^1.0.1"
45204564
yargs "^6.0.0"
45214565

45224566
whatwg-encoding@^1.0.1:

0 commit comments

Comments
 (0)