Skip to content

Commit cd9ea28

Browse files
author
Matt Lewis
committed
feat: allow webpack3 peer dependency
1 parent 83837f7 commit cd9ea28

File tree

2 files changed

+58
-28
lines changed

2 files changed

+58
-28
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"peerDependencies": {
4040
"less": "^2.3.1",
41-
"webpack": "^2.2.0"
41+
"webpack": "^2.2.0 || ^3.0.0"
4242
},
4343
"devDependencies": {
4444
"babel-cli": "^6.24.0",
@@ -59,7 +59,7 @@
5959
"nsp": "^2.6.3",
6060
"pre-commit": "^1.2.2",
6161
"standard-version": "^4.0.0",
62-
"webpack": "^2.3.2",
62+
"webpack": "^3.0.0",
6363
"webpack-defaults": "^1.0.1"
6464
},
6565
"repository": {

yarn.lock

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,30 @@ agent-base@2:
5454
extend "~3.0.0"
5555
semver "~5.0.1"
5656

57-
ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
57+
ajv-keywords@^1.0.0:
5858
version "1.5.1"
5959
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
6060

61+
ajv-keywords@^2.0.0:
62+
version "2.1.0"
63+
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
64+
6165
ajv@^4.7.0, ajv@^4.9.1:
6266
version "4.11.8"
6367
resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
6468
dependencies:
6569
co "^4.6.0"
6670
json-stable-stringify "^1.0.1"
6771

72+
ajv@^5.1.5:
73+
version "5.2.0"
74+
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
75+
dependencies:
76+
co "^4.6.0"
77+
fast-deep-equal "^0.1.0"
78+
json-schema-traverse "^0.3.0"
79+
json-stable-stringify "^1.0.1"
80+
6881
align-text@^0.1.1, align-text@^0.1.3:
6982
version "0.1.4"
7083
resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -1951,6 +1964,10 @@ extsprintf@1.0.2:
19511964
version "1.0.2"
19521965
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
19531966

1967+
fast-deep-equal@^0.1.0:
1968+
version "0.1.0"
1969+
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
1970+
19541971
fast-levenshtein@~2.0.4:
19551972
version "2.0.6"
19561973
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
@@ -3007,6 +3024,10 @@ json-loader@^0.5.4:
30073024
version "0.5.4"
30083025
resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
30093026

3027+
json-schema-traverse@^0.3.0:
3028+
version "0.3.0"
3029+
resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.0.tgz#0016c0b1ca1efe46d44d37541bcdfc19dcfae0db"
3030+
30103031
json-schema@0.2.3:
30113032
version "0.2.3"
30123033
resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -3186,15 +3207,6 @@ loader-runner@^2.3.0:
31863207
version "2.3.0"
31873208
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
31883209

3189-
loader-utils@^0.2.16:
3190-
version "0.2.17"
3191-
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
3192-
dependencies:
3193-
big.js "^3.1.3"
3194-
emojis-list "^2.0.0"
3195-
json5 "^0.5.0"
3196-
object-assign "^4.0.1"
3197-
31983210
loader-utils@^1.0.3, loader-utils@^1.1.0:
31993211
version "1.1.0"
32003212
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -4420,9 +4432,9 @@ sntp@1.x.x:
44204432
dependencies:
44214433
hoek "2.x.x"
44224434

4423-
source-list-map@^1.1.1:
4424-
version "1.1.2"
4425-
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
4435+
source-list-map@^2.0.0:
4436+
version "2.0.0"
4437+
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
44264438

44274439
source-map-support@^0.4.2:
44284440
version "0.4.15"
@@ -4809,7 +4821,7 @@ typedarray@^0.0.6:
48094821
version "0.0.6"
48104822
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
48114823

4812-
uglify-js@^2.6, uglify-js@^2.8.27:
4824+
uglify-js@^2.6:
48134825
version "2.8.27"
48144826
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.27.tgz#47787f912b0f242e5b984343be8e35e95f694c9c"
48154827
dependencies:
@@ -4818,10 +4830,27 @@ uglify-js@^2.6, uglify-js@^2.8.27:
48184830
optionalDependencies:
48194831
uglify-to-browserify "~1.0.0"
48204832

4833+
uglify-js@^2.8.29:
4834+
version "2.8.29"
4835+
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
4836+
dependencies:
4837+
source-map "~0.5.1"
4838+
yargs "~3.10.0"
4839+
optionalDependencies:
4840+
uglify-to-browserify "~1.0.0"
4841+
48214842
uglify-to-browserify@~1.0.0:
48224843
version "1.0.2"
48234844
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
48244845

4846+
uglifyjs-webpack-plugin@^0.4.4:
4847+
version "0.4.6"
4848+
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
4849+
dependencies:
4850+
source-map "^0.5.6"
4851+
uglify-js "^2.8.29"
4852+
webpack-sources "^1.0.1"
4853+
48254854
uid-number@^0.0.6:
48264855
version "0.0.6"
48274856
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -4964,37 +4993,38 @@ webpack-merge@^4.0.0:
49644993
dependencies:
49654994
lodash "^4.17.4"
49664995

4967-
webpack-sources@^0.2.3:
4968-
version "0.2.3"
4969-
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
4996+
webpack-sources@^1.0.1:
4997+
version "1.0.1"
4998+
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
49704999
dependencies:
4971-
source-list-map "^1.1.1"
5000+
source-list-map "^2.0.0"
49725001
source-map "~0.5.3"
49735002

4974-
webpack@^2.3.2:
4975-
version "2.6.1"
4976-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
5003+
webpack@^3.0.0:
5004+
version "3.0.0"
5005+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
49775006
dependencies:
49785007
acorn "^5.0.0"
49795008
acorn-dynamic-import "^2.0.0"
4980-
ajv "^4.7.0"
4981-
ajv-keywords "^1.1.1"
5009+
ajv "^5.1.5"
5010+
ajv-keywords "^2.0.0"
49825011
async "^2.1.2"
49835012
enhanced-resolve "^3.0.0"
5013+
escope "^3.6.0"
49845014
interpret "^1.0.0"
49855015
json-loader "^0.5.4"
49865016
json5 "^0.5.1"
49875017
loader-runner "^2.3.0"
4988-
loader-utils "^0.2.16"
5018+
loader-utils "^1.1.0"
49895019
memory-fs "~0.4.1"
49905020
mkdirp "~0.5.0"
49915021
node-libs-browser "^2.0.0"
49925022
source-map "^0.5.3"
49935023
supports-color "^3.1.0"
49945024
tapable "~0.2.5"
4995-
uglify-js "^2.8.27"
5025+
uglifyjs-webpack-plugin "^0.4.4"
49965026
watchpack "^1.3.1"
4997-
webpack-sources "^0.2.3"
5027+
webpack-sources "^1.0.1"
49985028
yargs "^6.0.0"
49995029

50005030
whatwg-encoding@^1.0.1:

0 commit comments

Comments
 (0)