8000 Merge branch 'dev' into dev-v4 · lyrl/github-pages-deploy-action@02fcf2d · GitHub
[go: up one dir, main page]

Skip to content

Commit 02fcf2d

Browse files
committed
Merge branch 'dev' into dev-v4
2 parents 0b7a591 + 637320f commit 02fcf2d

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
},
4141
"devDependencies": {
4242
"@types/jest": "26.0.20",
43-
"@types/node": "14.14.20",
44-
"eslint": "7.17.0",
43+
"@types/node": "14.14.21",
44+
"eslint": "7.18.0",
4545
"eslint-plugin-github": "4.1.1",
4646
"eslint-plugin-jest": "24.1.3",
4747
"eslint-plugin-prettier": "^3.1.2",

yarn.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@
312312
exec-sh "^0.3.2"
313313
minimist "^1.2.0"
314314

315-
"@eslint/eslintrc@^0.2.2":
316-
version "0.2.2"
317-
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"
318-
integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ==
315+
"@eslint/eslintrc@^0.3.0":
316+
version "0.3.0"
317+
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318"
318+
integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==
319319
dependencies:
320320
ajv "^6.12.4"
321321
debug "^4.1.1"
@@ -324,7 +324,7 @@
324324
ignore "^4.0.6"
325325
import-fresh "^3.2.1"
326326
js-yaml "^3.13.1"
327-
lodash "^4.17.19"
327+
lodash "^4.17.20"
328328
minimatch "^3.0.4"
329329
strip-json-comments "^3.1.1"
330330

@@ -837,10 +837,10 @@
837837
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
838838
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
839839

840-
"@types/node@*", "@types/node@14.14.20", "@types/node@>= 8":
841-
version "14.14.20"
842-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340"
843-
integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A==
840+
"@types/node@*", "@types/node@14.14.21", "@types/node@>= 8":
841+
version "14.14.21"
842+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.21.tgz#d934aacc22424fe9622ebf6857370c052eae464e"
843+
integrity sha512-cHYfKsnwllYhjOzuC5q1VpguABBeecUp24yFluHpn/BQaVxB1CuQ1FSRZCzrPxrkIfWISXV2LbeoBthLWg0+0A==
844844

845845
"@types/normalize-package-data@^2.4.0":
846846
version "2.4.0"
@@ -1835,13 +1835,13 @@ eslint-visitor-keys@^2.0.0:
18351835
version "2.0.0"
18361836
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
18371837

1838-
eslint@7.17.0:
1839-
version "7.17.0"
1840-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0"
1841-
integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ==
1838+
eslint@7.18.0:
1839+
version "7.18.0"
1840+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67"
1841+
integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ==
18421842
dependencies:
18431843
"@babel/code-frame" "^7.0.0"
1844-
"@eslint/eslintrc" "^0.2.2"
1844+
"@eslint/eslintrc" "^0.3.0"
18451845
ajv "^6.10.0"
18461846
chalk "^4.0.0"
18471847
cross-spawn "^7.0.2"
@@ -1865,7 +1865,7 @@ eslint@7.17.0:
18651865
js-yaml "^3.13.1"
18661866
json-stable-stringify-without-jsonify "^1.0.1"
18671867
levn "^0.4.1"
1868-
lodash "^4.17.19"
1868+
lodash "^4.17.20"
18691869
minimatch "^3.0.4"
18701870
natural-compare "^1.4.0"
18711871
optionator "^0.9.1"
@@ -3478,7 +3478,7 @@ lodash.sortby@^4.7.0:
34783478
version "4.7.0"
34793479
resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
34803480

3481-
lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20:
3481+
lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.20:
34823482
version "4.17.20"
34833483
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
34843484
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==

0 commit comments

Comments
 (0)
0