Skip to content

Commit 52783bc

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into fix-sidebar-tab-trap-layout-change
2 parents 58e60be + 6a9b723 commit 52783bc

File tree

2 files changed

+47
-38
lines changed

2 files changed

+47
-38
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@
9797
"@babel/plugin-transform-runtime": "^7.12.10",
9898
"@babel/preset-env": "^7.12.11",
9999
"@babel/standalone": "^7.12.12",
100-
"@nuxt/content": "^1.11.1",
100+
"@nuxt/content": "^1.12.0",
101101
"@nuxtjs/google-analytics": "^2.4.0",
102102
"@nuxtjs/pwa": "^3.3.5",
103103
"@nuxtjs/robots": "^2.4.2",
104104
"@nuxtjs/sitemap": "^2.4.0",
105105
"@testing-library/jest-dom": "^5.11.9",
106106
"@vue/test-utils": "^1.1.2",
107-
"autoprefixer": "^10.2.3",
107+
"autoprefixer": "^10.2.4",
108108
"babel-core": "^7.0.0-bridge.0",
109109
"babel-eslint": "^10.1.0",
110110
"babel-jest": "^26.6.3",
@@ -116,7 +116,7 @@
116116
"codesandbox": "^2.2.1",
117117
"core-js": "^3.8.3",
118118
"cross-env": "^7.0.3",
119-
"eslint": "^7.18.0",
119+
"eslint": "^7.19.0",
120120
"eslint-config-prettier": "^7.2.0",
121121
"eslint-config-standard": "^16.0.2",
122122
"eslint-config-vue": "^2.0.2",
@@ -143,7 +143,7 @@
143143
"postcss-cli": "^8.3.1",
144144
"prettier": "1.14.3",
145145
"require-context": "^1.1.0",
146-
"rollup": "^2.38.1",
146+
"rollup": "^2.38.3",
147147
"rollup-plugin-babel": "^4.4.0",
148148
"rollup-plugin-commonjs": "^10.1.0",
149149
"rollup-plugin-node-resolve": "^5.2.0",

‎yarn.lock

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1258,15 +1258,15 @@
12581258
rc9 "^1.2.0"
12591259
std-env "^2.2.1"
12601260

1261-
"@nuxt/content@^1.11.1":
1262-
version "1.11.1"
1263-
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.11.1.tgz#60d850d01d2f946b896ddb8a8736c43cfe2cdd72"
1264-
integrity sha512-aIB1LSJZfTx0cBq+oWi64lvPyX0vnE0D+g0kQCp52RSPWyxPtogrg3rnWQf/NU1JEDHaO8aFuXB/Pk57tjSZMQ==
1261+
"@nuxt/content@^1.12.0":
1262+
version "1.12.0"
1263+
resolved "https://registry.yarnpkg.com/@nuxt/content/-/content-1.12.0.tgz#2e37e31a2cc4c821a7ac350045ead56059cccb54"
1264+
integrity sha512-UWVQ1NvUjUHP3dyFlNdrjTT6Nj5F098ChtlW0KrFQ2ObidK/+KKwq7t/nE+7YTsH0hOsuekSHihDIcTkWPR2QA==
12651265
dependencies:
12661266
"@lokidb/full-text-search" "^2.1.0"
12671267
"@lokidb/loki" "^2.1.0"
12681268
"@nuxt/types" "^2.14.7"
1269-
"@types/js-yaml" "^3.12.5"
1269+
"@types/js-yaml" "^4.0.0"
12701270
"@types/xml2js" "^0.4.7"
12711271
change-case "^4.1.1"
12721272
chokidar "^3.4.3"
@@ -1280,7 +1280,7 @@
12801280
hasha "^5.2.2"
12811281
hookable "^4.3.1"
12821282
html-tags "^3.1.0"
1283-
js-yaml "3.14.0"
1283+
js-yaml "4.0.0"
12841284
mdast-util-to-hast "^10.0.1"
12851285
mkdirp "^1.0.4"
12861286
node-req "^2.1.2"
@@ -1796,10 +1796,10 @@
17961796
jest-diff "^26.0.0"
17971797
pretty-format "^26.0.0"
17981798

1799-
"@types/js-yaml@^3.12.5":
1800-
version "3.12.5"
1801-
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.5.tgz#136d5e6a57a931e1cce6f9d8126aa98a9c92a6bb"
1802-
integrity sha512-JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww==
1799+
"@types/js-yaml@^4.0.0":
1800+
version "4.0.0"
1801+
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.0.tgz#d1a11688112091f2c711674df3a65ea2f47b5dfb"
1802+
integrity sha512-4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA==
18031803

18041804
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
18051805
version "7.0.6"
@@ -2579,6 +2579,11 @@ argparse@^1.0.7:
25792579
dependencies:
25802580
sprintf-js "~1.0.2"
25812581

2582+
argparse@^2.0.1:
2583+
version "2.0.1"
2584+
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
2585+
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
2586+
25822587
aria-query@^4.2.2:
25832588
version "4.2.2"
25842589
resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
@@ -2724,13 +2729,13 @@ atob@^2.1.2:
27242729
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
27252730
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
27262731

2727-
autoprefixer@^10.2.3:
2728-
version "10.2.3"
2729-
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.3.tgz#2834b55b75cfc10fa80c66000a66dc94b7136804"
2730-
integrity sha512-vlz+iv+EnLkVaTgX8wApfYzmK3LUfK8Z9XAnmflzxMy/+oFuNK8fVGQV79SOpBv4jxk2YQJimw4hXIKZ29570A==
2732+
autoprefixer@^10.2.4:
2733+
version "10.2.4"
2734+
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.2.4.tgz#c0e7cf24fcc6a1ae5d6250c623f0cb8beef2f7e1"
2735+
integrity sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==
27312736
dependencies:
27322737
browserslist "^4.16.1"
2733-
caniuse-lite "^1.0.30001178"
2738+
caniuse-lite "^1.0.30001181"
27342739
colorette "^1.2.1"
27352740
fraction.js "^4.0.13"
27362741
normalize-range "^0.1.2"
@@ -3530,10 +3535,10 @@ caniuse-api@^3.0.0:
35303535
lodash.memoize "^4.1.2"
35313536
lodash.uniq "^4.5.0"
35323537

3533-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001164, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001178:
3534-
version "1.0.30001178"
3535-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001178.tgz#3ad813b2b2c7d585b0be0a2440e1e233c6eabdbc"
3536-
integrity sha512-VtdZLC0vsXykKni8Uztx45xynytOi71Ufx9T8kHptSw9AL4dpqailUJJHavttuzUe1KYuBYtChiWv+BAb7mPmQ==
3538+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001164, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001181:
3539+
version "1.0.30001181"
3540+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001181.tgz#4f0e5184e1ea7c3bf2727e735cbe7ca9a451d673"
3541+
integrity sha512-m5ul/ARCX50JB8BSNM+oiPmQrR5UmngaQ3QThTTp5HcIIQGP/nPBs82BYLE+tigzm3VW+F4BJIhUyaVtEweelQ==
35373542

35383543
capital-case@^1.0.4:
35393544
version "1.0.4"
@@ -5581,10 +5586,10 @@ eslint-visitor-keys@^2.0.0:
55815586
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
55825587
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
55835588

5584-
eslint@^7.18.0:
5585-
version "7.18.0"
5586-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67"
5587-
integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==
5589+
eslint@^7.19.0:
5590+
version "7.19.0"
5591+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.19.0.tgz#6719621b196b5fad72e43387981314e5d0dc3f41"
5592+
integrity sha512-CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg==
55885593
dependencies:
55895594
"@babel/code-frame" "^7.0.0"
55905595
"@eslint/eslintrc" "^0.3.0"
@@ -6332,6 +6337,11 @@ fsevents@~2.1.2:
63326337
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
63336338
integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
63346339

6340+
fsevents@~2.3.1:
6341+
version "2.3.1"
6342+
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
6343+
integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
6344+
63356345
function-bind@^1.1.1:
63366346
version "1.1.1"
63376347
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -8321,13 +8331,12 @@ js-tokens@^3.0.2:
83218331
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
83228332
integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
83238333

8324-
js-yaml@3.14.0:
8325-
version "3.14.0"
8326-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482"
8327-
integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==
8334+
js-yaml@4.0.0:
8335+
version "4.0.0"
8336+
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
8337+
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
83288338
dependencies:
8329-
argparse "^1.0.7"
8330-
esprima "^4.0.0"
8339+
argparse "^2.0.1"
83318340

83328341
js-yaml@^3.11.0, js-yaml@^3.13.1:
83338342
version "3.14.1"
@@ -12174,12 +12183,12 @@ rollup-pluginutils@^2.8.1:
1217412183
dependencies:
1217512184
estree-walker "^0.6.1"
1217612185

12177-
rollup@^2.38.1:
12178-
version "2.38.1"
12179-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.1.tgz#ecea0f7ce6ef2c1f023fdb79524eb7aeb670ea79"
12180-
integrity sha512-q07T6vU/V1kqM8rGRRyCgEvIQcIAXoKIE5CpkYAlHhfiWM1Iuh4dIPWpIbqFngCK6lwAB2aYHiUVhIbSWHQWhw==
12186+
rollup@^2.38.3:
12187+
version "2.38.3"
12188+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.38.3.tgz#2a0b6cc6eab1da4431aab875a31a401fa2988c10"
12189+
integrity sha512-FVx/XzR2DtCozKNDBjHJCHIgkC12rNg/ruAeoYWjLeeKfSKgwhh+lDLDhuCkuRG/fsup8py8dKBTlHdvUFX32A==
1218112190
optionalDependencies:
12182-
fsevents "~2.1.2"
12191+
fsevents "~2.3.1"
1218312192

1218412193
rsvp@^4.8.4:
1218512194
version "4.8.5"

0 commit comments

Comments
 (0)