8000 Merge branch 'dev' into new-config · bootstrap-vue/bootstrap-vue@248fbca · GitHub
[go: up one dir, main page]

Skip to content

Commit 248fbca

Browse files
authored
Merge branch 'dev' into new-config
2 parents 9c667de + 84366bf commit 248fbca

File tree

2 files changed

+15
-25
lines changed

2 files changed

+15
-25
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"lodash": "^4.17.20",
141141
"marked": "^1.2.3",
142142
"nuxt": "^2.14.7",
143-
"postcss": "^8.1.4",
143+
"postcss": "^8.1.6",
144144
"postcss-cli": "^8.2.0",
145145
"prettier": "1.14.3",
146146
"require-context": "^1.1.0",
@@ -154,7 +154,7 @@
154154
"terser": "^5.3.8",
155155
"vue": "^2.6.12",
156156
"vue-jest": "^3.0.7",
157-
"vue-router": "^3.4.8",
157+
"vue-router": "^3.4.9",
158158
"vue-server-renderer": "^2.6.12",
159159
"vue-template-compiler": "^2.6.12"
160160
},

yarn.lock

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9458,15 +9458,10 @@ nanoid@^2.1.0:
94589458
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
94599459
integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
94609460

9461-
nanoid@^3.1.10:
9462-
version "3.1.12"
9463-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
9464-
integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
9465-
9466-
nanoid@^3.1.15:
9467-
version "3.1.15"
9468-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.15.tgz#28e7c4ce56aff2d0c2d37814c7aef9d6c5b3e6f3"
9469-
integrity sha512-n8rXUZ8UU3lV6+43atPrSizqzh25n1/f00Wx1sCiE7R1sSHytZLTTiQl8DjC4IDLOnEZDlgJhy0yO4VsIpMxow==
9461+
nanoid@^3.1.10, nanoid@^3.1.16:
9462+
version "3.1.16"
9463+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.16.tgz#b21f0a7d031196faf75314d7c65d36352beeef64"
9464+
integrity sha512-+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w==
94709465

94719466
nanomatch@^1.2.9:
94729467
version "1.2.13"
@@ -11157,14 +11152,14 @@ postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17,
1115711152
source-map "^0.6.1"
1115811153
supports-color "^6.1.0"
1115911154

11160-
postcss@^8.1.4:
11161-
version "8.1.4"
11162-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.4.tgz#356dfef367a70f3d04347f74560c85846e20e4c1"
11163-
integrity sha512-LfqcwgMq9LOd8pX7K2+r2HPitlIGC5p6PoZhVELlqhh2YGDVcXKpkCseqan73Hrdik6nBd2OvoDPUaP/oMj9hQ==
11155+
postcss@^8.1.6:
11156+
version "8.1.6"
11157+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.6.tgz#b022ba2cfb8701da234d073ed3128c5a384c35ff"
11158+
integrity sha512-JuifSl4h8dJ70SiMXKjzCxhalE6p2TnMHuq9G8ftyXj2jg6SXzqCsEuxMj9RkmJoO5D+Z9YrWunNkxqpRT02qg==
1116411159
dependencies:
1116511160
colorette "^1.2.1"
1116611161
line-column "^1.0.2"
11167-
nanoid "^3.1.15"
11162+
nanoid "^3.1.16"
1116811163
source-map "^0.6.1"
1116911164

1117011165
prelude-ls@^1.2.1:
@@ -14146,15 +14141,10 @@ vue-no-ssr@^1.1.1:
1414614141
resolved "https://registry.yarnpkg.com/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz#875f3be6fb0ae41568a837f3ac1a80eaa137b998"
1414714142
integrity sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g==
1414814143

14149-
vue-router@^3.4.6:
14150-
version "3.4.7"
14151-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz#bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b"
14152-
integrity sha512-CbHXue5BLrDivOk5O4eZ0WT4Yj8XwdXa4kCnsEIOzYUPF/07ZukayA2jGxDCJxLc9SgVQX9QX0OuGOwGlVB4Qg==
14153-
14154-
vue-router@^3.4.8:
14155-
version "3.4.8"
14156-
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.8.tgz#2c06261d35d8075893470352d42d70b6287b8194"
14157-
integrity sha512-3BsR84AqarcmweXjItxw3jwQsiYNssYg090yi4rlzTnCJxmHtkyCvhNz9Z7qRSOkmiV485KkUCReTp5AjNY4wg==
14144+
vue-router@^3.4.6, vue-router@^3.4.9:
14145+
version "3.4.9"
14146+
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz#c016f42030ae2932f14e4748b39a1d9a0e250e66"
14147+
integrity sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA==
1415814148

1415914149
vue-server-renderer@^2.6.12:
1416014150
version "2.6.12"

0 commit comments

Comments
 (0)
0