Skip to content

Commit 5fcf1eb

Browse files
committed
Merge branch 'develop'
* develop: ⬆️ Update dependencies
2 parents 2573f43 + 50f5aed commit 5fcf1eb

File tree

2 files changed

+52
-101
lines changed

2 files changed

+52
-101
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
"cross-env": "^3.2.4",
7777
"cross-spawn": "^5.1.0",
7878
"css-loader": "^0.27.3",
79-
"eslint": "^3.17.1",
80-
"eslint-config-standard": "^7.0.1",
79+
"eslint": "^3.18.0",
80+
"eslint-config-standard": "^7.1.0",
8181
"eslint-friendly-formatter": "^2.0.7",
8282
"eslint-loader": "^1.6.3",
8383
"eslint-plugin-html": "^2.0.1",

yarn.lock

Lines changed: 50 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -269,31 +269,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
269269
esutils "^2.0.2"
270270
js-tokens "^3.0.0"
271271

272-
babel-core@^6.1.4:
273-
version "6.23.1"
274-
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
275-
dependencies:
276-
babel-code-frame "^6.22.0"
277-
babel-generator "^6.23.0"
278-
babel-helpers "^6.23.0"
279-
babel-messages "^6.23.0"
280-
babel-register "^6.23.0"
281-
babel-runtime "^6.22.0"
282-
babel-template "^6.23.0"
283-
babel-traverse "^6.23.1"
284-
babel-types "^6.23.0"
285-
babylon "^6.11.0"
286-
convert-source-map "^1.1.0"
287-
debug "^2.1.1"
288-
json5 "^0.5.0"
289-
lodash "^4.2.0"
290-
minimatch "^3.0.2"
291-
path-is-absolute "^1.0.0"
292-
private "^0.1.6"
293-
slash "^1.0.0"
294-
source-map "^0.5.0"
295-
296-
babel-core@^6.23.0, babel-core@^6.24.0:
272+
babel-core@^6.1.4, babel-core@^6.24.0:
297273
version "6.24.0"
298274
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
299275
dependencies:
@@ -317,19 +293,6 @@ babel-core@^6.23.0, babel-core@^6.24.0:
317293
slash "^1.0.0"
318294
source-map "^0.5.0"
319295

320-
babel-generator@^6.23.0:
321-
version "6.23.0"
322-
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
323-
dependencies:
324-
babel-messages "^6.23.0"
325-
babel-runtime "^6.22.0"
326-
babel-types "^6.23.0"
327-
detect-indent "^4.0.0"
328-
jsesc "^1.3.0"
329-
lodash "^4.2.0"
330-
source-map "^0.5.0"
331-
trim-right "^1.0.1"
332-
333296
babel-generator@^6.24.0:
334297
version "6.24.0"
335298
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
@@ -807,18 +770,6 @@ babel-preset-stage-3@^6.22.0:
807770
babel-plugin-transform-exponentiation-operator "^6.22.0"
808771
babel-plugin-transform-object-rest-spread "^6.22.0"
809772

810-
babel-register@^6.23.0:
811-
version "6.23.0"
812-
resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
813-
dependencies:
814-
babel-core "^6.23.0"
815-
babel-runtime "^6.22.0"
816-
core-js "^2.4.0"
817-
home-or-tmp "^2.0.0"
818-
lodash "^4.2.0"
819-
mkdirp "^0.5.1"
820-
source-map-support "^0.4.2"
821-
822773
babel-register@^6.24.0:
823774
version "6.24.0"
824775
resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
@@ -1363,14 +1314,22 @@ [email protected]:
13631314
version "0.0.1"
13641315
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
13651316

1366-
[email protected], concat-stream@^1.4.6:
1317+
13671318
version "1.5.0"
13681319
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
13691320
dependencies:
13701321
inherits "~2.0.1"
13711322
readable-stream "~2.0.0"
13721323
typedarray "~0.0.5"
13731324

1325+
concat-stream@^1.5.2:
1326+
version "1.6.0"
1327+
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
1328+
dependencies:
1329+
inherits "^2.0.3"
1330+
readable-stream "^2.2.2"
1331+
typedarray "^0.0.6"
1332+
13741333
config-chain@~1.1.5:
13751334
version "1.1.11"
13761335
resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2"
@@ -1630,13 +1589,13 @@ [email protected]:
16301589
version "0.7.4"
16311590
resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
16321591

1633-
1592+
debug@2, [email protected], debug@^2.2.0:
16341593
version "2.6.1"
16351594
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.1.tgz#79855090ba2c4e3115cc7d8769491d58f0491351"
16361595
dependencies:
16371596
ms "0.7.2"
16381597

1639-
[email protected], debug@^2.1.1, debug@^2.2.0, debug@~2.2.0:
1598+
[email protected], debug@^2.1.1, debug@~2.2.0:
16401599
version "2.2.0"
16411600
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
16421601
dependencies:
@@ -1746,9 +1705,9 @@ diff@^3.1.0:
17461705
version "3.2.0"
17471706
resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
17481707

1749-
doctrine@^1.2.2:
1750-
version "1.5.0"
1751-
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
1708+
doctrine@^2.0.0:
1709+
version "2.0.0"
1710+
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
17521711
dependencies:
17531712
esutils "^2.0.2"
17541713
isarray "^1.0.0"
@@ -2011,9 +1970,9 @@ escope@^3.6.0:
20111970
esrecurse "^4.1.0"
20121971
estraverse "^4.1.1"
20131972

2014-
eslint-config-standard@^7.0.1:
2015-
version "7.0.1"
2016-
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.0.1.tgz#6cec96084de9ac862c33ccb953d13a7c59872342"
1973+
eslint-config-standard@^7.1.0:
1974+
version "7.1.0"
1975+
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-7.1.0.tgz#47e769ea0739f5b2d5693b1a501c21c9650fafcf"
20171976

20181977
eslint-friendly-formatter@^2.0.7:
20191978
version "2.0.7"
@@ -2047,17 +2006,18 @@ eslint-plugin-standard@^2.1.1:
20472006
version "2.1.1"
20482007
resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.1.1.tgz#97960b1537e1718bb633877d0a650050effff3b0"
20492008

2050-
eslint@^3.17.1:
2051-
version "3.17.1"
2052-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.17.1.tgz#b80ae12d9c406d858406fccda627afce33ea10ea"
2009+
eslint@^3.18.0:
2010+
version "3.18.0"
2011+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
20532012
dependencies:
20542013
babel-code-frame "^6.16.0"
20552014
chalk "^1.1.3"
2056-
concat-stream "^1.4.6"
2015+
concat-stream "^1.5.2"
20572016
debug "^2.1.1"
2058-
doctrine "^1.2.2"
2017+
doctrine "^2.0.0"
20592018
escope "^3.6.0"
20602019
espree "^3.4.0"
2020+
esquery "^1.0.0"
20612021
estraverse "^4.2.0"
20622022
esutils "^2.0.2"
20632023
file-entry-cache "^2.0.0"
@@ -2105,6 +2065,12 @@ [email protected], esprima@~3.1.0:
21052065
version "3.1.2"
21062066
resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.2.tgz#954b5d19321ca436092fa90f06d6798531fe8184"
21072067

2068+
esquery@^1.0.0:
2069+
version "1.0.0"
2070+
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
2071+
dependencies:
2072+
estraverse "^4.0.0"
2073+
21082074
esrecurse@^4.1.0:
21092075
version "4.1.0"
21102076
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
@@ -2116,7 +2082,7 @@ estraverse@^1.9.1:
21162082
version "1.9.3"
21172083
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
21182084

2119-
estraverse@^4.1.1, estraverse@^4.2.0:
2085+
estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
21202086
version "4.2.0"
21212087
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
21222088

@@ -2491,7 +2457,7 @@ [email protected]:
24912457
inherits "2"
24922458
minimatch "~0.2.11"
24932459

2494-
[email protected], glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
2460+
[email protected], glob@^7.0.0:
24952461
version "7.0.5"
24962462
resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
24972463
dependencies:
@@ -2512,7 +2478,7 @@ glob@^5.0.15:
25122478
once "^1.3.0"
25132479
path-is-absolute "^1.0.0"
25142480

2515-
glob@^7.1.1:
2481+
glob@^7.0.3, glob@^7.0.5, glob@^7.1.1:
25162482
version "7.1.1"
25172483
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
25182484
dependencies:
@@ -2774,14 +2740,10 @@ https-proxy-agent@1:
27742740
debug "2"
27752741
extend "3"
27762742

2777-
2743+
[email protected], iconv-lite@^0.4.5:
27782744
version "0.4.15"
27792745
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
27802746

2781-
iconv-lite@^0.4.5:
2782-
version "0.4.13"
2783-
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
2784-
27852747
icss-replace-symbols@^1.0.2:
27862748
version "1.0.2"
27872749
resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
@@ -2819,7 +2781,7 @@ inflight@^1.0.4:
28192781
once "^1.3.0"
28202782
wrappy "1"
28212783

2822-
inherits@2, [email protected], inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
2784+
inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
28232785
version "2.0.3"
28242786
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
28252787

@@ -3536,11 +3498,7 @@ log4js@^0.6.31:
35363498
readable-stream "~1.0.2"
35373499
semver "~4.3.3"
35383500

3539-
lolex@^1.5.0:
3540-
version "1.5.2"
3541-
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.5.2.tgz#94a4ce41c61185a05e98b8660dc509423ac1c416"
3542-
3543-
lolex@^1.6.0:
3501+
lolex@^1.5.0, lolex@^1.6.0:
35443502
version "1.6.0"
35453503
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.6.0.tgz#3a9a0283452a47d7439e72731b9e07d7386e49f6"
35463504

@@ -3571,7 +3529,11 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
35713529
version "1.1.3"
35723530
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.3.tgz#c92393d976793eee5ba4edb583cf8eae35bd9bfb"
35733531

3574-
lru-cache@2, [email protected]:
3532+
lru-cache@2, lru-cache@~2.6.5:
3533+
version "2.6.5"
3534+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
3535+
3536+
35753537
version "2.2.4"
35763538
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
35773539

@@ -3588,10 +3550,6 @@ lru-cache@^4.0.1:
35883550
pseudomap "^1.0.1"
35893551
yallist "^2.0.0"
35903552

3591-
lru-cache@~2.6.5:
3592-
version "2.6.5"
3593-
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5"
3594-
35953553
macaddress@^0.2.8:
35963554
version "0.2.8"
35973555
resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
@@ -4619,7 +4577,7 @@ [email protected]:
46194577
isarray "0.0.1"
46204578
string_decoder "~0.10.x"
46214579

4622-
readable-stream@2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0:
4580+
readable-stream@2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.2.2:
46234581
version "2.2.2"
46244582
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
46254583
dependencies:
@@ -4887,15 +4845,15 @@ right-align@^0.1.1:
48874845
dependencies:
48884846
align-text "^0.1.1"
48894847

4890-
rimraf@2, rimraf@^2.2.8, rimraf@~2.5.1, rimraf@~2.5.4:
4891-
version "2.5.4"
4892-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
4848+
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0:
4849+
version "2.6.1"
4850+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
48934851
dependencies:
48944852
glob "^7.0.5"
48954853

4896-
rimraf@^2.5.4, rimraf@^2.6.0:
4897-
version "2.6.1"
4898-
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
4854+
rimraf@~2.5.1, rimraf@~2.5.4:
4855+
version "2.5.4"
4856+
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
48994857
dependencies:
49004858
glob "^7.0.5"
49014859

@@ -5491,7 +5449,7 @@ type-is@~1.6.14:
54915449
media-typer "0.3.0"
54925450
mime-types "~2.1.13"
54935451

5494-
typedarray@~0.0.5:
5452+
typedarray@^0.0.6, typedarray@~0.0.5:
54955453
version "0.0.6"
54965454
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
54975455

@@ -5691,14 +5649,7 @@ vue-loader@^11.1.4:
56915649
vue-style-loader "^2.0.0"
56925650
vue-template-es2015-compiler "^1.2.2"
56935651

5694-
vue-style-loader@^2.0.0:
5695-
version "2.0.3"
5696-
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-2.0.3.tgz#b464ffb6279702d4137a80ac81b5c12ac440f0a0"
5697-
dependencies:
5698-
hash-sum "^1.0.2"
5699-
loader-utils "^1.0.2"
5700-
5701-
vue-style-loader@^2.0.4:
5652+
vue-style-loader@^2.0.0, vue-style-loader@^2.0.4:
57025653
version "2.0.4"
57035654
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-2.0.4.tgz#4fc19e18bf162225338aac3b17d0fd0e1cfb7439"
57045655
dependencies:

0 commit comments

Comments
 (0)