8000 Merge branch 'dev' into dependabot/npm_and_yarn/rollup-2.35.0 · bootstrap-vue/bootstrap-vue@a5e3341 · GitHub
[go: up one dir, main page]

Skip to content

Commit a5e3341

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/rollup-2.35.0
2 parents 310aca6 + f2fde99 commit a5e3341

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
"eslint-plugin-jest": "^24.1.3",
125125
"eslint-plugin-markdown": "^1.0.2",
126126
"eslint-plugin-node": "^11.1.0",
127-
"eslint-plugin-prettier": "^3.2.0",
127+
"eslint-plugin-prettier": "^3.3.0",
128128
"eslint-plugin-promise": "^4.2.1",
129129
"eslint-plugin-vue": "^7.2.0",
130130
"esm": "^3.2.25",
@@ -140,7 +140,7 @@
140140
"marked": "^1.2.6",
141141
"nuxt": "^2.14.11",
142142
"postcss": "^8.2.1",
143-
"postcss-cli": "^8.3.0",
143+
"postcss-cli": "^8.3.1",
144144
"prettier": "1.14.3",
145145
"require-context": "^1.1.0",
146146
"rollup": "^2.35.0",

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5558,10 +5558,10 @@ eslint-plugin-node@^11.1.0:
55585558
resolve "^1.10.1"
55595559
semver "^6.1.0"
55605560

5561-
eslint-plugin-prettier@^3.2.0:
5562-
version "3.2.0"
5563-
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.2.0.tgz#af391b2226fa0e15c96f36c733f6e9035dbd952c"
5564-
integrity sha512-kOUSJnFjAUFKwVxuzy6sA5yyMx6+o9ino4gCdShzBNx4eyFRudWRYKCFolKjoM40PEiuU6Cn7wBLfq3WsGg7qg==
5561+
eslint-plugin-prettier@^3.3.0:
5562+
version "3.3.0"
5563+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.0.tgz#61e295349a65688ffac0b7808ef0a8244bdd8d40"
5564+
integrity sha512-tMTwO8iUWlSRZIwS9k7/E4vrTsfvsrcM5p1eftyuqWH25nKsz/o6/54I7jwQ/3zobISyC7wMy9ZsFwgTxOcOpQ==
55655565
dependencies:
55665566
prettier-linter-helpers "^1.0.0"
55675567

@@ -10623,10 +10623,10 @@ postcss-calc@^7.0.1:
1062310623
postcss-selector-parser "^6.0.2"
1062410624
postcss-value-parser "^4.0.2"
1062510625

10626-
postcss-cli@^8.3.0:
10627-
version "8.3.0"
10628-
resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-8.3.0.tgz#fa06c96cbd0620768c788cae74ba462622a9013c"
10629-
integrity sha512-GqWohD9VmH+LCe+xsv6VCdcgNylNBmsrbxJlyXUGteGGdcmazj2YxSiJMUmQpg8pE6LRox9idtsTB7JZq5a+rw==
10626+
postcss-cli@^8.3.1:
10627+
version "8.3.1"
10628+
resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-8.3.1.tgz#865dad08300ac59ae9cecb7066780aa81c767a77"
10629+
integrity sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==
1063010630
dependencies:
1063110631
chalk "^4.0.0"
1063210632
chokidar "^3.3.0"

0 commit comments

Comments
 (0)
0