Skip to content

Commit fc366d2

Browse files
authored
Merge branch 'development' into renovate/stylelint-scss-3.x
2 parents 4e76360 + 14c80fa commit fc366d2

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"cross-env": "7.0.3",
3636
"express": "4.17.1",
3737
"nuxt": "2.15.7",
38-
"nuxt-i18n": "6.27.2",
38+
"nuxt-i18n": "6.27.3",
3939
"nuxt-property-decorator": "2.9.1",
4040
"nuxt-svg-loader": "1.2.0",
4141
"nuxt-webfontloader": "1.1.0",
@@ -58,7 +58,7 @@
5858
"babel-jest": "27.0.6",
5959
"consola": "2.15.3",
6060
"cpx": "1.5.0",
61-
"eslint": "7.30.0",
61+
"eslint": "7.31.0",
6262
"eslint-config-prettier": "8.3.0",
6363
"eslint-loader": "4.0.2",
6464
"eslint-plugin-nuxt": "2.0.0",
@@ -67,7 +67,7 @@
6767
"fibers": "5.0.0",
6868
"husky": "7.0.1",
6969
"jest": "27.0.6",
70-
"lint-staged": "11.0.0",
70+
"lint-staged": "11.0.1",
7171
"nodemon": "2.0.9",
7272
"prettier": "2.3.2",
7373
"rimraf": "3.0.2",

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2485,10 +2485,10 @@
24852485
resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
24862486
integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
24872487

2488-
"@eslint/eslintrc@^0.4.2":
2489-
version "0.4.2"
2490-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
2491-
integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
2488+
"@eslint/eslintrc@^0.4.3":
2489+
version "0.4.3"
2490+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
2491+
integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
24922492
dependencies:
24932493
ajv "^6.12.4"
24942494
debug "^4.1.1"
@@ -6942,13 +6942,13 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
69426942
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
69436943
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
69446944

6945-
eslint@7.30.0:
6946-
version "7.30.0"
6947-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.30.0.tgz#6d34ab51aaa56112fd97166226c9a97f505474f8"
6948-
integrity sha512-VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg==
6945+
eslint@7.31.0:
6946+
version "7.31.0"
6947+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca"
6948+
integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==
69496949
dependencies:
69506950
"@babel/code-frame" "7.12.11"
6951-
"@eslint/eslintrc" "^0.4.2"
6951+
"@eslint/eslintrc" "^0.4.3"
69526952
"@humanwhocodes/config-array" "^0.5.0"
69536953
ajv "^6.10.0"
69546954
chalk "^4.0.0"
@@ -9680,10 +9680,10 @@ lines-and-columns@^1.1.6:
96809680
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
96819681
integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
96829682

9683-
9684-
version "11.0.0"
9685-
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.0.tgz#24d0a95aa316ba28e257f5c4613369a75a10c712"
9686-
integrity sha512-3rsRIoyaE8IphSUtO1RVTFl1e0SLBtxxUOPBtHxQgBHS5/i6nqvjcUfNioMa4BU9yGnPzbO+xkfLtXtxBpCzjw==
9683+
9684+
version "11.0.1"
9685+
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.1.tgz#1b8ae8ed5a52ed87252db95fe008c2618c85f55a"
9686+
integrity sha512-RkTA1ulE6jAGFskxpGAwxfVRXjHp7D9gFg/+KMARUWMPiVFP0t28Em2u0gL8sA0w3/ck3TC57F2v2RNeQ5XPnw==
96879687
dependencies:
96889688
chalk "^4.1.1"
96899689
cli-truncate "^2.1.0"
@@ -10667,10 +10667,10 @@ num2fraction@^1.2.2:
1066710667
resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
1066810668
integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
1066910669

10670-
10671-
version "6.27.2"
10672-
resolved "https://registry.yarnpkg.com/nuxt-i18n/-/nuxt-i18n-6.27.2.tgz#278d7fafa180c473471ca7ae9bdf105eb8bab796"
10673-
integrity sha512-9L2Wfokm2iLWJi5coh9xzGvy9ipX2Fb/5hyIY0pnim87MpL6M5bxIkuEo34NkU0IvxeMkfEqYjxQh0E9Do8S9A==
10670+
10671+
version "6.27.3"
10672+
resolved "https://registry.yarnpkg.com/nuxt-i18n/-/nuxt-i18n-6.27.3.tgz#3d79b73e50c8cb5f17dbc6451069a37bf5e4832b"
10673+
integrity sha512-7+UeMM5hHZ7TGsU+t9DFsRSEgAh9FGN2DG10d/uF+l6ziie6XrlA4lTXD6aeE9i07vjt7Ifoz36r0gSuapullg==
1067410674
dependencies:
1067510675
"@babel/parser" "^7.14.7"
1067610676
"@babel/traverse" "^7.14.7"
@@ -10682,7 +10682,7 @@ [email protected]:
1068210682
js-cookie "^2.2.1"
1068310683
klona "^2.0.4"
1068410684
lodash.merge "^4.6.2"
10685-
ufo "^0.7.5"
10685+
ufo "^0.7.7"
1068610686
vue-i18n "^8.24.5"
1068710687

1068810688
@@ -14154,7 +14154,7 @@ ufo@^0.7.4:
1415414154
resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.5.tgz#5d5b2174747c0072edd30501994c8ac4ad2e77ea"
1415514155
integrity sha512-FGG+EgguC1oz5dTE1JptPWCyj6Z9mYpwvZY8PTu9Vh/Aoy+Mj9cpeQ3gg4kyEMDbMrH+lTYiw7bomG58B8X7Kg==
1415614156

14157-
ufo@^0.7.5:
14157+
ufo@^0.7.7:
1415814158
version "0.7.7"
1415914159
resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.7.tgz#0062f9e5e790819b0fb23ca24d7c63a4011c036a"
1416014160
integrity sha512-N25aY3HBkJBnahm+2l4JRBBrX5I+JPakF/tDHYDTjd3wUR7iFLdyiPhj8mBwBz21v728BKwM9L9tgBfCntgdlw==

0 commit comments

Comments
 (0)