aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-01-21 11:11:03 +0100
committerChocobozzz <me@florianbigard.com>2022-01-21 11:11:03 +0100
commitebe4b3df5c4e595f3fcf92b8ecf6c5174b13b3b0 (patch)
tree5eff2e14fcb5dcdce391270917f8f2f8d6295733
parentd92d070c91ee73657f2e3a5756954ef63fdba306 (diff)
downloadPeerTube-ebe4b3df5c4e595f3fcf92b8ecf6c5174b13b3b0.tar.gz
PeerTube-ebe4b3df5c4e595f3fcf92b8ecf6c5174b13b3b0.tar.zst
PeerTube-ebe4b3df5c4e595f3fcf92b8ecf6c5174b13b3b0.zip
Remove fixed workaround
-rw-r--r--package.json2
-rw-r--r--server/tools/tsconfig.json7
-rw-r--r--yarn.lock29
3 files changed, 14 insertions, 24 deletions
diff --git a/package.json b/package.json
index 784b69aba..67ea2be75 100644
--- a/package.json
+++ b/package.json
@@ -204,7 +204,7 @@
204 "fast-xml-parser": "^4.0.0-beta.8", 204 "fast-xml-parser": "^4.0.0-beta.8",
205 "mocha": "^9.0.0", 205 "mocha": "^9.0.0",
206 "proxy": "^1.0.2", 206 "proxy": "^1.0.2",
207 "resolve-tspaths": "^0.2.1", 207 "resolve-tspaths": "^0.2.3",
208 "socket.io-client": "^4.0.1", 208 "socket.io-client": "^4.0.1",
209 "supertest": "^6.0.1", 209 "supertest": "^6.0.1",
210 "swagger-cli": "^4.0.2", 210 "swagger-cli": "^4.0.2",
diff --git a/server/tools/tsconfig.json b/server/tools/tsconfig.json
index 8264f5b35..39f8e74e4 100644
--- a/server/tools/tsconfig.json
+++ b/server/tools/tsconfig.json
@@ -1,12 +1,7 @@
1{ 1{
2 "extends": "../../tsconfig.json", 2 "extends": "../../tsconfig.json",
3 "compilerOptions": { 3 "compilerOptions": {
4 "baseUrl": "./", 4 "outDir": "../../dist/server/tools"
5 "outDir": "../../dist/server/tools",
6 "paths": { // FIXME: https://github.com/benyap/resolve-tspaths/issues/10
7 "@server/*": [ "../../server/*" ],
8 "@shared/*": [ "../../shared/*" ]
9 }
10 }, 5 },
11 "include": [ ".", "../typings" ], 6 "include": [ ".", "../typings" ],
12 "references": [ 7 "references": [
diff --git a/yarn.lock b/yarn.lock
index 85af298b7..b1edee521 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4215,18 +4215,7 @@ fast-fifo@^1.0.0:
4215 resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.0.0.tgz#9bc72e6860347bb045a876d1c5c0af11e9b984e7" 4215 resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.0.0.tgz#9bc72e6860347bb045a876d1c5c0af11e9b984e7"
4216 integrity sha512-4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ== 4216 integrity sha512-4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ==
4217 4217
4218fast-glob@3.2.7: 4218fast-glob@3.2.11, fast-glob@^3.2.9:
4219 version "3.2.7"
4220 resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
4221 integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
4222 dependencies:
4223 "@nodelib/fs.stat" "^2.0.2"
4224 "@nodelib/fs.walk" "^1.2.3"
4225 glob-parent "^5.1.2"
4226 merge2 "^1.3.0"
4227 micromatch "^4.0.4"
4228
4229fast-glob@^3.2.9:
4230 version "3.2.11" 4219 version "3.2.11"
4231 resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" 4220 resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
4232 integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== 4221 integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -5352,6 +5341,11 @@ json5@^2.1.1, json5@^2.1.3:
5352 dependencies: 5341 dependencies:
5353 minimist "^1.2.5" 5342 minimist "^1.2.5"
5354 5343
5344jsonc-parser@3.0.0:
5345 version "3.0.0"
5346 resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
5347 integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
5348
5355jsonfile@^6.0.1: 5349jsonfile@^6.0.1:
5356 version "6.1.0" 5350 version "6.1.0"
5357 resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" 5351 resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -7292,14 +7286,15 @@ resolve-from@^4.0.0:
7292 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" 7286 resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
7293 integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== 7287 integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
7294 7288
7295resolve-tspaths@^0.2.1: 7289resolve-tspaths@^0.2.3:
7296 version "0.2.1" 7290 version "0.2.3"
7297 resolved "https://registry.yarnpkg.com/resolve-tspaths/-/resolve-tspaths-0.2.1.tgz#3e148ed4c8806b54b0fba27e0c781529e0d0de30" 7291 resolved "https://registry.yarnpkg.com/resolve-tspaths/-/resolve-tspaths-0.2.3.tgz#0b7200e44db785eb316a508dcc4dae4649840135"
7298 integrity sha512-waDnPicvN/dCGKaVZOuQXj440sYKg5tckOug8s76XiNpdFOwSsnkl9TP7coYWYEysxsO1pGTkOFs6UMATde/mg== 7292 integrity sha512-h3mbiTixJVwwot2kbEYDlHHxw8f+rUOYiv3t/e6XLEnFEztIL4IiensO9xlQEYZfJt44zrBkw8R+Icy1N1Sc+A==
7299 dependencies: 7293 dependencies:
7300 ansi-colors "4.1.1" 7294 ansi-colors "4.1.1"
7301 commander "8.3.0" 7295 commander "8.3.0"
7302 fast-glob "3.2.7" 7296 fast-glob "3.2.11"
7297 jsonc-parser "3.0.0"
7303 7298
7304resolve@^1.10.1, resolve@^1.15.1, resolve@^1.18.1, resolve@^1.20.0: 7299resolve@^1.10.1, resolve@^1.15.1, resolve@^1.18.1, resolve@^1.20.0:
7305 version "1.21.0" 7300 version "1.21.0"