8000 Merge branch 'dev' into fix-form-group-markup · bootstrap-vue/bootstrap-vue@887c04b · GitHub
[go: up one dir, main page]
Skip to content

Commit 887c04b

Browse files
jacobmllr95jacobmllr95
authored
Merge branch 'dev' into fix-form-group-markup
2 parents e69b7a4 + f00f71b commit 887c04b

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
9797
"@babel/plugin-transform-runtime": "^7.12.10",
9898
"@babel/preset-env": "^7.12.10",
99-
"@babel/standalone": "^7.12.9",
99+
"@babel/standalone": "^7.12.10",
100100
"@nuxt/content": "^1.11.1",
101101
"@nuxtjs/google-analytics": "^2.4.0",
102102
"@nuxtjs/pwa": "^3.3.2",
@@ -137,9 +137,9 @@
137137
"lint-staged": "^10.5.3",
138138
"loader-utils": "^2.0.0",
139139
"lodash": "^4.17.20",
140-
"marked": "^1.2.5",
140+
"marked": "^1.2.6",
141141
"nuxt": "^2.14.11",
142-
"postcss": "^8.2.0",
142+
"postcss": "^8.2.1",
143143
"postcss-cli": "^8.3.0",
144144
"prettier": "1.14.3",
145145
"require-context": "^1.1.0",

‎yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -852,10 +852,10 @@
852852
dependencies:
853853
regenerator-runtime "^0.13.4"
854854

855-
"@babel/standalone@^7.12.9":
856-
version "7.12.9"
857-
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.9.tgz#2da8a223b44498a1e7ca5b83d4e9d010088b0036"
858-
integrity sha512-7SFBBNPjEZnN3dlnOcTa08XLkGUUmZX6Aab2rdeVBfI/bBaZXRRMx5XIMU8piZMVJI+jxu4j7gu0E/yRWmtS4w==
855+
"@babel/standalone@^7.12.10":
856+
version "7.12.10"
857+
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.10.tgz#f77f6750d0ab88c7c23234dd2d2f3800f170a573"
858+
integrity sha512-e3sJ7uwwjiGWv7qeATKrP+Mjltr6JEurPh3yR0dBb9ie2YDnKl52lO82f+Ha+HAtyxTHfsPIXwgFmWKsCT2zOQ==
859859

860860
"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3":
861861
version "7.12.7"
@@ -7352,9 +7352,9 @@ inherits@2.0.3:
73527352
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
73537353

73547354
ini@^1.3.2, ini@^1.3.3, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
7355-
version "1.3.5"
7356-
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
7357-
integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
7355+
version "1.3.7"
7356+
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
7357+
integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
73587358

73597359
inline-style-parser@0.1.1:
73607360
version "0.1.1"
@@ -8996,10 +8996,10 @@ markdown-table@^2.0.0:
89968996
dependencies:
89978997
repeat-string "^1.0.0"
89988998

8999-
marked@^1.2.5:
9000-
version "1.2.5"
9001-
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.5.tgz#a44b31f2a0b8b5bfd610f00d55d1952d1ac1dfdb"
9002-
integrity sha512-2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA==
8999+
marked@^1.2.6:
9000+
version "1.2.6"
9001+
resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.6.tgz#fa55cf38ab3585005c9fb3c1ebfb3d4590c29fdc"
9002+
integrity sha512-7vVuSEZ8g/HH3hK/BH/+7u/NJj7x9VY4EHzujLDcqAQLiOUeFJYAsfSAyoWtR17lKrx7b08qyIno4lffwrzTaA==
90039003

90049004
md5.js@^1.3.4:
90059005
version "1.3.5"
@@ -11293,10 +11293,10 @@ postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17,
1129311293
source-map "^0.6.1"
1129411294
supports-color "^6.1.0"
1129511295

11296-
postcss@^8.2.0:
11297-
version "8.2.0"
11298-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.0.tgz#214be4eda36db762eb8a89d7c7362b9341156eb5"
11299-
integrity sha512-vZ8cb6AlN53hHlnPvR+oj7fA46LU05Ysv7O7sNh1ixQrCbtx+d8/h+5tDER9XAccVhkf3aYskAiWmh0DdjNLbw==
11296+
postcss@^8.2.1:
11297+
version "8.2.1"
11298+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.1.tgz#eabc5557c4558059b9d9e5b15bce7ffa9089c2a8"
11299+
integrity sha512-RhsqOOAQzTgh1UB/IZdca7F9WDb7SUCR2Vnv1x7DbvuuggQIpoDwjK+q0rzoPffhYvWNKX5JSwS4so4K3UC6vA==
1130011300
dependencies:
1130111301
colorette "^1.2.1"
1130211302
nanoid "^3.1.20"
@@ -12124,7 +12124,7 @@ resolve-url@^0.2.1:
1212412124
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
1212512125
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
1212612126

12127-
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.2.0, resolve@^1.8.1:
12127+
resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.2.0:
1212812128
version "1.19.0"
1212912129
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
1213012130
integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==

0 commit comments

Comments
 (0)
0