Skip to content

Commit aa421ca

Browse files
authored
Merge branch 'dev' into dependabot/npm_and_yarn/husky-4.3.6
2 parents b03f378 + a24f623 commit aa421ca

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"@nuxtjs/robots": "^2.4.2",
104104
"@nuxtjs/sitemap": "^2.4.0",
105105
"@testing-library/jest-dom": "^5.11.6",
106-
"@vue/test-utils": "^1.1.1",
106+
"@vue/test-utils": "^1.1.2",
107107
"autoprefixer": "^10.1.0",
108108
"babel-core": "^7.0.0-bridge.0",
109109
"babel-eslint": "^10.1.0",
@@ -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,10 +140,10 @@
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",
146-
"rollup": "^2.34.2",
146+
"rollup": "^2.35.0",
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: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,10 +2189,10 @@
21892189
optionalDependencies:
21902190
prettier "^1.18.2"
21912191

2192-
"@vue/test-utils@^1.1.1":
2193-
version "1.1.1"
2194-
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.1.tgz#01c3e4b22ed2b85d2e276b34d32c8ac4b726e452"
2195-
integrity sha512-/32538ilZ9qSiu1gui7zfBn+IFy+zoTaQTZ1qiLfQXzZtaeAD23kJMrnqaoe2w8JzJoXuqHUl2ruuStG8rwFYQ==
2192+
"@vue/test-utils@^1.1.2":
2193+
version "1.1.2"
2194+
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.2.tgz#fdb487448dceefeaf3d01d465f7c836a3d666dbc"
2195+
integrity sha512-utbIL7zn9c+SjhybPwh48lpWCiluFCbP1yyRNAy1fQsw/6hiNFioaWy05FoVAFIZXC5WwBf+5r4ypfM1j/nI4A==
21962196
dependencies:
21972197
dom-event-types "^1.0.0"
21982198
lodash "^4.17.15"
@@ -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"
@@ -12242,10 +12242,10 @@ rollup-pluginutils@^2.8.1:
1224212242
dependencies:
1224312243
estree-walker "^0.6.1"
1224412244

12245-
rollup@^2.34.2:
12246-
version "2.34.2"
12247-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.2.tgz#fa73e05c64df587e9ed4dc80d7d4e7d4a43f8908"
12248-
integrity sha512-mvtQLqu3cNeoctS+kZ09iOPxrc1P1/Bt1z15enuQ5feyKOdM3MJAVFjjsygurDpSWn530xB4AlA83TWIzRstXA==
12245+
rollup@^2.35.0:
12246+
version "2.35.0"
12247+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.0.tgz#47b77827b122fbeca6a2c494fb2258db73d04fa9"
12248+
integrity sha512-AkiRsGBlHbP+bnAcOgiCRp6jm0BEGHXJk7TGZ+GpKyTL3EiSv+v+zEHlaB1gy1Ql2zyblBhzo5X346bCL45OAg==
1224912249
optionalDependencies:
1225012250
fsevents "~2.1.2"
1225112251

0 commit comments

Comments
 (0)