8000 Merge branch 'dev' into avatar-convert-line-endings-to-unix · bootstrap-vue/bootstrap-vue@6316e13 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6316e13

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into avatar-convert-line-endings-to-unix
2 parents 182dc34 + a0b78c6 commit 6316e13

File tree

2 files changed

+29
-72
lines changed

2 files changed

+29
-72
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"@nuxtjs/google-analytics": "^2.3.0",
107107
"@nuxtjs/pwa": "^3.0.0-beta.20",
108108
"@nuxtjs/robots": "^2.4.2",
109-
"@nuxtjs/sitemap": "^2.3.0",
109+
"@nuxtjs/sitemap": "^2.3.1",
110110
"@testing-library/jest-dom": "^5.9.0",
111111
"@vue/test-utils": "^1.0.3",
112112
"autoprefixer": "^9.8.0",
@@ -139,7 +139,7 @@
139139
"husky": "^4.2.5",
140140
"improved-yarn-audit": "^2.1.0",
141141
"jest": "^26.0.1",
142-
"lint-staged": "^10.2.8",
142+
"lint-staged": "^10.2.9",
143143
"loader-utils": "^2.0.0",
144144
"lodash": "^4.17.15",
145145
"marked": "^1.1.0",

‎yarn.lock

Lines changed: 27 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2086,17 +2086,17 @@
20862086
resolved "https://registry.yarnpkg.com/@nuxtjs/robots/-/robots-2.4.2.tgz#9a96c91abb70e39b414eec502ef1cf7d5ef0235e"
20872087
integrity sha512-BW3qhvxlPBKlMkZHtARFPeliFraiZHS28G3j4qgRbSfOBtHC0yDX3Dnq1LkQMzAbPfbw6A1L3sdjgBVZZnfFAw==
20882088

2089-
"@nuxtjs/sitemap@^2.3.0":
2090-
version "2.3.0"
2091-
resolved "https://registry.yarnpkg.com/@nuxtjs/sitemap/-/sitemap-2.3.0.tgz#ca032b84f54a6570123305098b2b9a7821f4ab29"
2092-
integrity sha512-mSh0vc8HuJHMOm8ifKIKXxGETDq+Oc7MgwWVeq20AEfblNQUOWFLv+bYqh8BkxvuXc2/488zMrKhWOfwzasQOA==
2089+
"@nuxtjs/sitemap@^2.3.1":
2090+
version "2.3.1"
2091+
resolved "https://registry.yarnpkg.com/@nuxtjs/sitemap/-/sitemap-2.3.1.tgz#b9f7c4969d123b0c4f83e5218a0136e00232fef1"
2092+
integrity sha512-t/wJk4waFZri/jMUzTQKXWqEyqqHxVY6XyRlrCTu3ipaRH2ApeUnM5BYuEW4mTQC3i8yHEdzM6Ap+K7XRTQPWg==
20932093
dependencies:
20942094
async-cache "^1.1.0"
2095-
consola "^2.12.1"
2095+
consola "^2.12.2"
20962096
etag "^1.8.1"
20972097
fresh "^0.5.2"
20982098
fs-extra "^8.1.0"
2099-
is-https "^1.0.0"
2099+
is-https "^2.0.2"
21002100
lodash.unionby "^4.8.0"
21012101
minimatch "^3.0.4"
21022102
sitemap "^4.1.1"
@@ -2110,13 +2110,6 @@
21102110
mustache "^2.3.0"
21112111
stack-trace "0.0.10"
21122112

2113-
"@samverschueren/stream-to-observable@^0.3.0":
2114-
version "0.3.0"
2115-
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
2116-
integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==
2117-
dependencies:
2118-
any-observable "^0.3.0"
2119-
21202113
"@sinonjs/commons@^1.7.0":
21212114
version "1.7.2"
21222115
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2"
@@ -2766,11 +2759,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
27662759
"@types/color-name" "^1.1.1"
27672760
color-convert "^2.0.1"
27682761

2769-
any-observable@^0.3.0:
2770-
version "0.3.0"
2771-
resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
2772-
integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
2773-
27742762
anymatch@^2.0.0:
27752763
version "2.0.0"
27762764
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -4031,11 +4019,6 @@ clone@2.x:
40314019
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
40324020
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
40334021

4034-
clone@^1.0.2:
4035-
version "1.0.4"
4036-
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
4037-
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
4038-
40394022
co@^4.6.0:
40404023
version "4.6.0"
40414024
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -4298,11 +4281,16 @@ connect@^3.7.0:
42984281
parseurl "~1.3.3"
42994282
utils-merge "1.0.1"
43004283

4301-
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.12.1, consola@^2.6.0, consola@^2.9.0:
4284+
consola@^2.10.0, consola@^2.10.1, consola@^2.11.3, consola@^2.6.0, consola@^2.9.0:
43024285
version "2.12.1"
43034286
resolved "https://registry.yarnpkg.com/consola/-/consola-2.12.1.tgz#88e9311a02cb88a7f6f9488239dd30b6ba99cbb0"
43044287
integrity sha512-aEkkju9ZcEa9y2MhzNhfmTUws/CEZZ0LKu0FxftSU3HygPfVMMIMSYyYct+xBN6XNRhsaDZjw2HAv3m2ammXSA==
43054288

4289+
consola@^2.12.2:
4290+
version "2.12.2"
4291+
resolved "https://registry.yarnpkg.com/consola/-/consola-2.12.2.tgz#9610f158e7b0a9ecc8f8bb0c4fc8e7c52bf41d05"
4292+
integrity sha512-c9mzemrAk57s3UIjepn8KKkuEH5fauMdot5kFSJUnqHcnApVS9Db8Rbv5AZ1Iz6lXzaGe9z1crQXhJtGX4h/Og==
4293+
43064294
console-browserify@^1.1.0:
43074295
version "1.2.0"
43084296
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -5063,13 +5051,6 @@ deepmerge@^4.2.2:
50635051
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
50645052
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
50655053

5066-
defaults@^1.0.3:
5067-
version "1.0.3"
5068-
resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
5069-
integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
5070-
dependencies:
5071-
clone "^1.0.2"
5072-
50735054
define-properties@^1.1.2, define-properties@^1.1.3:
50745055
version "1.1.3"
50755056
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -5379,11 +5360,6 @@ electron-to-chromium@^1.3.413:
53795360
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.441.tgz#094f71b992dca5bc96b798cfbaf37dc76302015a"
53805361
integrity sha512-leBfJwLuyGs1jEei2QioI+PjVMavmUIvPYidE8dCCYWLAq0uefhN3NYgDNb8WxD3uiUNnJ3ScMXg0upSlwySzQ==
53815362

5382-
elegant-spinner@^2.0.0:
5383-
version "2.0.0"
5384-
resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-2.0.0.tgz#f236378985ecd16da75488d166be4b688fd5af94"
5385-
integrity sha512-5YRYHhvhYzV/FC4AiMdeSIg3jAYGq9xFvbhZMpPlJoBsfYgrw2DSCYeXfat6tYBu45PWiyRr3+flaCPPmviPaA==
5386-
53875363
elliptic@^6.0.0, elliptic@^6.5.2:
53885364
version "6.5.2"
53895365
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
@@ -7577,10 +7553,10 @@ is-hexadecimal@^1.0.0:
75777553
resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
75787554
integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
75797555

7580-
is-https@^1.0.0:
7581-
version "1.0.0"
7582-
resolved "https://registry.yarnpkg.com/is-https/-/is-https-1.0.0.tgz#9c1dde000dc7e7288edb983bef379e498e7cb1bf"
7583-
integrity sha512-1adLLwZT9XEXjzhQhZxd75uxf0l+xI9uTSFaZeSESjL3E1eXSPpO+u5RcgqtzeZ1KCaNvtEwZSTO2P4U5erVqQ==
7556+
is-https@^2.0.2:
7557+
version "2.0.2"
7558+
resolved "https://registry.yarnpkg.com/is-https/-/is-https-2.0.2.tgz#7009d303c72580f15897d5c063d6b6bc1f838fef"
7559+
integrity sha512-UfUCKVQH/6PQRCh5Qk9vNu4feLZiFmV/gr8DjbtJD0IrCRIDTA6E+d/AVFGPulI5tqK5W45fYbn1Nir1O99rFw==
75847560

75857561
is-installed-globally@^0.1.0:
75867562
version "0.1.0"
@@ -8525,45 +8501,40 @@ lines-and-columns@^1.1.6:
85258501
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
85268502
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
85278503

8528-
lint-staged@^10.2.8:
8529-
version "10.2.8"
8530-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.8.tgz#fcc76158c9d17f5f6238678dc2f4fe98535b2f68"
8531-
integrity sha512-36VUVhZuTJUG0yuSv66o+/Cep9Uwp+od6VkjNxQjHKWvHClVD0SjAZx++4H3zgdr6DxPoUl1y/PVygfPhzAXQQ==
8504+
lint-staged@^10.2.9:
8505+
version "10.2.9"
8506+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.2.9.tgz#6013ecfa80829cd422446b545fd30a96bca3098c"
8507+
integrity sha512-ziRAuXEqvJLSXg43ezBpHxRW8FOJCXISaXU//BWrxRrp5cBdRkIx7g5IsB3OI45xYGE0S6cOacfekSjDyDKF2g==
85328508
dependencies:
85338509
chalk "^4.0.0"
85348510
cli-truncate "2.1.0"
85358511
commander "^5.1.0"
85368512
cosmiconfig "^6.0.0"
85378513
debug "^4.1.1"
85388514
dedent "^0.7.0"
8515+
enquirer "^2.3.5"
85398516
execa "^4.0.1"
8540-
listr2 "^2.0.2"
8517+
listr2 "^2.1.0"
85418518
log-symbols "^4.0.0"
85428519
micromatch "^4.0.2"
85438520
normalize-path "^3.0.0"
85448521
please-upgrade-node "^3.2.0"
85458522
string-argv "0.3.1"
85468523
stringify-object "^3.3.0"
85478524

8548-
listr2@^2.0.2:
8549-
version "2.0.2"
8550-
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.0.2.tgz#35e11e742ee151a8c446d1649792cadf7eb1d780"
8551-
integrity sha512-HkbraLsbHRFtuT0p1g9KUiMoJeqlPdgsi4Q3mCvBlYnVK+2I1vPdCxBvJ+nAxwpL7SZiyaICWMvLOyMBtu+VKw==
8525+
listr2@^2.1.0:
8526+
version "2.1.0"
8527+
resolved "https://registry.yarnpkg.com/listr2/-/listr2-2.1.0.tgz#8e91b5ea673feb60068d32647a5f9f62c74d80e4"
8528+
integrity sha512-pWrbMLO+6jxGbgAasTLUzfRYdBaQvv6sNTWDfIX8ENBNmTwt/eafZ/LlJ66/dNaDnEhzCpWricLH4U9cjSAHYg==
85528529
dependencies:
8553-
"@samverschueren/stream-to-observable" "^0.3.0"
85548530
chalk "^4.0.0"
8555-
cli-cursor "^3.1.0"
85568531
cli-truncate "^2.1.0"
8557-
elegant-spinner "^2.0.0"
8558-
enquirer "^2.3.5"
85598532
figures "^3.2.0"
85608533
indent-string "^4.0.0"
85618534
log-update "^4.0.0"
85628535
p-map "^4.0.0"
8563-
pad "^3.2.0"
85648536
rxjs "^6.5.5"
85658537
through "^2.3.8"
8566-
uuid "^7.0.2"
85678538

85688539
load-json-file@^1.0.0:
85698540
version "1.1.0"
@@ -9947,13 +9918,6 @@ pacote@^2.7.36:
99479918
unique-filename "^1.1.0"
99489919
which "^1.2.12"
99499920

9950-
pad@^3.2.0:
9951-
version "3.2.0"
9952-
resolved "https://registry.yarnpkg.com/pad/-/pad-3.2.0.tgz#be7a1d1cb6757049b4ad5b70e71977158fea95d1"
9953-
integrity sha512-2u0TrjcGbOjBTJpyewEl4hBO3OeX5wWue7eIFPzQTg6wFSvoaHcBTTUY5m+n0hd04gmTCPuY0kCpVIVuw5etwg==
9954-
dependencies:
9955-
wcwidth "^1.0.1"
9956-
99579921
pako@~1.0.5:
99589922
version "1.0.11"
99599923
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
@@ -13545,7 +13509,7 @@ uuid@^3.3.2:
1354513509
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
1354613510
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
1354713511

13548-
uuid@^7.0.2, uuid@^7.0.3:
13512+
uuid@^7.0.3:
1354913513
version "7.0.3"
1355013514
resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
1355113515
integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
@@ -13790,13 +13754,6 @@ watchpack@^1.6.1:
1379013754
chokidar "^3.4.0"
1379113755
watchpack-chokidar2 "^2.0.0"
1379213756

13793-
wcwidth@^1.0.1:
13794-
version "1.0.1"
13795-
resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
13796-
integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
13797-
dependencies:
13798-
defaults "^1.0.3"
13799-
1380013757
webidl-conversions@^5.0.0:
1380113758
version "5.0.0"
1380213759
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"

0 commit comments

Comments
 (0)
0