8000 Merge remote-tracking branch 'origin/dev' into feat-code-enhancements · bootstrap-vue/bootstrap-vue@41ff28b · GitHub
[go: up one dir, main page]

Skip to content

Commit 41ff28b

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feat-code-enhancements
2 parents c901856 + d2083e6 commit 41ff28b

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
"clean-css-cli": "^4.3.0",
115115
"codemirror": "^5.58.3",
116116
"codesandbox": "^2.2.1",
117-
"core-js": "^3.8.0",
117+
"core-js": "^3.8.1",
118118
"cross-env": "^7.0.3",
119-
"eslint": "^7.14.0",
120-
"eslint-config-prettier": "^6.15.0",
119+
"eslint": "^7.15.0",
120+
"eslint-config-prettier": "^7.0.0",
121121
"eslint-config-standard": "^16.0.2",
122122
"eslint-config-vue": "^2.0.2",
123123
"eslint-plugin-import": "^2.22.1",

yarn.lock

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4397,7 +4397,7 @@ core-js@^2.4.0, core-js@^2.6.5:
43974397
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
43984398
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
43994399

4400-
core-js@^3.8.0:
4400+
core-js@^3.8.1:
44014401
version "3.8.1"
44024402
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47"
44034403
integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg==
@@ -5473,12 +5473,10 @@ escodegen@^1.14.1:
54735473
optionalDependencies:
54745474
source-map "~0.6.1"
54755475

5476-
eslint-config-prettier@^6.15.0:
5477-
version "6.15.0"
5478-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
5479-
integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
5480-
dependencies:
5481-
get-stdin "^6.0.0"
5476+
eslint-config-prettier@^7.0.0:
5477+
version "7.0.0"
5478+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#c1ae4106f74e6c0357f44adb076771d032ac0e97"
5479+
integrity sha512-8Y8lGLVPPZdaNA7JXqnvETVC7IiVRgAP6afQu9gOQRn90YY3otMNh+x7Vr2vMePQntF+5erdSUBqSzCmU/AxaQ==
54825480

54835481
eslint-config-standard@^16.0.2:
54845482
version "16.0.2"
@@ -5616,7 +5614,7 @@ eslint-visitor-keys@^2.0.0:
56165614
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
56175615
integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
56185616

5619-
eslint@^7.14.0:
5617+
eslint@^7.15.0:
56205618
version "7.15.0"
56215619
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"
56225620
integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA==
@@ -6422,11 +6420,6 @@ get-stdin@^4.0.1:
64226420
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
64236421
integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
64246422

6425-
get-stdin@^6.0.0:
6426-
version "6.0.0"
6427-
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
6428-
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
6429-
64306423
get-stdin@^8.0.0:
64316424
version "8.0.0"
64326425
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"

0 commit comments

Comments
 (0)
0