Skip to content

Commit 9c34be2

Browse files
Bump merge from 1.2.0 to 1.2.1
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](swordev/merge@v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] <support@github.com>
1 parent d648222 commit 9c34be2

2 files changed

Lines changed: 63 additions & 37 deletions

File tree

package-lock.json

Lines changed: 39 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

yarn.lock

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
"@babel/runtime@7.0.0-beta.42":
6868
version "7.0.0-beta.42"
69-
resolved "http://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
69+
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.42.tgz#352e40c92e0460d3e82f49bd7e79f6cda76f919f"
7070
integrity sha512-iOGRzUoONLOtmCvjUsZv3mZzgCT6ljHQY5fr1qG1QIiJQwtM7zbPWGGpa3QWETq+UqwWyJnoi5XZDZRwZDFciQ==
7171
dependencies:
7272
core-js "^2.5.3"
@@ -849,37 +849,37 @@ babel-plugin-jest-hoist@^20.0.3:
849849

850850
babel-plugin-syntax-async-functions@^6.8.0:
851851
version "6.13.0"
852-
resolved "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
852+
resolved "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
853853
integrity sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=
854854

855855
babel-plugin-syntax-class-properties@^6.8.0:
856856
version "6.13.0"
857-
resolved "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
857+
resolved "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
858858
integrity sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=
859859

860860
babel-plugin-syntax-dynamic-import@6.18.0, babel-plugin-syntax-dynamic-import@^6.18.0:
861861
version "6.18.0"
862-
resolved "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
862+
resolved "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
863863
integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
864864

865865
babel-plugin-syntax-exponentiation-operator@^6.8.0:
866866
version "6.13.0"
867-
resolved "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
867+
resolved "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
868868
integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=
869869

870870
babel-plugin-syntax-flow@^6.18.0:
871871
version "6.18.0"
872-
resolved "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
872+
resolved "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
873873
integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=
874874

875875
babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
876876
version "6.18.0"
877-
resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
877+
resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
878878
integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
879879

880880
babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
881881
version "6.13.0"
882-
resolved "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
882+
resolved "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
883883
integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
884884

885885
babel-plugin-syntax-trailing-function-commas@^6.22.0:
@@ -1587,7 +1587,7 @@ buffer-xor@^1.0.3:
15871587

15881588
buffer@^4.3.0:
15891589
version "4.9.1"
1590-
resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
1590+
resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
15911591
integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
15921592
dependencies:
15931593
base64-js "^1.0.2"
@@ -1722,7 +1722,7 @@ center-align@^0.1.1:
17221722

17231723
chalk@1.1.3, chalk@^1.1.3:
17241724
version "1.1.3"
1725-
resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
1725+
resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
17261726
integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
17271727
dependencies:
17281728
ansi-styles "^2.2.1"
@@ -3178,7 +3178,7 @@ extend@~3.0.2:
31783178

31793179
external-editor@^2.0.4:
31803180
version "2.2.0"
3181-
resolved "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
3181+
resolved "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
31823182
integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==
31833183
dependencies:
31843184
chardet "^0.4.0"
@@ -3662,7 +3662,7 @@ globby@^6.1.0:
36623662

36633663
got@^6.7.1:
36643664
version "6.7.1"
3665-
resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
3665+
resolved "https://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
36663666
integrity sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=
36673667
dependencies:
36683668
create-error-class "^3.0.0"
@@ -5446,9 +5446,9 @@ merge-descriptors@1.0.1:
54465446
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
54475447

54485448
merge@^1.2.0:
5449-
version "1.2.0"
5450-
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
5451-
integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
5449+
version "1.2.1"
5450+
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
5451+
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
54525452

54535453
methods@~1.1.2:
54545454
version "1.1.2"
@@ -5554,17 +5554,17 @@ minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
55545554

55555555
minimist@0.0.8:
55565556
version "0.0.8"
5557-
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
5557+
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
55585558
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
55595559

55605560
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
55615561
version "1.2.0"
5562-
resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
5562+
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
55635563
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
55645564

55655565
minimist@~0.0.1:
55665566
version "0.0.10"
5567-
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
5567+
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
55685568
integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
55695569

55705570
minipass@^2.2.1, minipass@^2.3.3:
@@ -5592,7 +5592,7 @@ mixin-deep@^1.2.0:
55925592

55935593
mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
55945594
version "0.5.1"
5595-
resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
5595+
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
55965596
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
55975597
dependencies:
55985598
minimist "0.0.8"
@@ -6008,7 +6008,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
60086008

60096009
os-locale@^1.4.0:
60106010
version "1.4.0"
6011-
resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
6011+
resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
60126012
integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
60136013
dependencies:
60146014
lcid "^1.0.0"
@@ -8109,7 +8109,7 @@ symbol-tree@^3.2.1:
81098109

81108110
table@^4.0.1:
81118111
version "4.0.3"
8112-
resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
8112+
resolved "https://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
81138113
integrity sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==
81148114
dependencies:
81158115
ajv "^6.0.1"
@@ -8826,7 +8826,7 @@ worker-loader@^1.1.0:
88268826

88278827
wrap-ansi@^2.0.0:
88288828
version "2.1.0"
8829-
resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
8829+
resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
88308830
integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
88318831
dependencies:
88328832
string-width "^1.0.1"
@@ -8906,7 +8906,7 @@ yargs-parser@^7.0.0:
89068906

89078907
yargs@6.6.0:
89088908
version "6.6.0"
8909-
resolved "http://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
8909+
resolved "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
89108910
integrity sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=
89118911
dependencies:
89128912
camelcase "^3.0.0"
@@ -8963,7 +8963,7 @@ yargs@^8.0.2:
89638963

89648964
yargs@~3.10.0:
89658965
version "3.10.0"
8966-
resolved "http://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
8966+
resolved "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
89678967
integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
89688968
dependencies:
89698969
camelcase "^1.0.2"

0 commit comments

Comments
 (0)