mastodon: 3.3.0 -> 3.4.0

./update.sh --ver v3.4.0 --patches ./resolutions.patch
This commit is contained in:
Kerstin Humm
2021-05-21 15:04:12 +02:00
committed by erictapen
parent 433a9f8f85
commit dfd9d996e2
7 changed files with 1631 additions and 1454 deletions
+17 -16
View File
@@ -1,31 +1,32 @@
diff --git a/package.json b/package.json
index 7b8f49dd8..24cdd3498 100644
index 5bc1f6bf3..8cc22a403 100644
--- a/package.json
+++ b/package.json
@@ -168,7 +168,8 @@
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.4.0",
- "wicg-inert": "^3.1.0"
+ "wicg-inert": "^3.1.0",
"webpack-merge": "^5.7.3",
"wicg-inert": "^3.1.1",
- "ws": "^7.4.5"
+ "ws": "^7.4.5",
+ "kind-of": "^6.0.3"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.6",
@@ -187,8 +188,5 @@
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.11.0",
"yargs": "^16.1.1"
- },
"@testing-library/jest-dom": "^5.12.0",
@@ -188,9 +189,6 @@
"webpack-dev-server": "^3.11.2",
"yargs": "^17.0.1"
},
- "resolutions": {
- "kind-of": "^6.0.3"
}
}
- },
"optionalDependencies": {
"bufferutil": "^4.0.3",
"utf-8-validate": "^5.0.5"
diff --git a/yarn.lock b/yarn.lock
index 4aa8f6380..68d2fd8b5 100644
index 6c8bcf549..bda3adbe8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5689,6 +5689,11 @@ is-binary-path@~2.1.0:
@@ -5833,6 +5833,11 @@ is-binary-path@~2.1.0:
dependencies:
binary-extensions "^2.0.0"
@@ -37,7 +38,7 @@ index 4aa8f6380..68d2fd8b5 100644
is-callable@^1.1.4, is-callable@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
@@ -6639,7 +6644,26 @@ killable@^1.0.1:
@@ -6769,7 +6774,26 @@ killable@^1.0.1:
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==