diff --git a/package.json b/package.json index 784b69aba..67ea2be75 100644 --- a/package.json +++ b/package.json @@ -204,7 +204,7 @@ "fast-xml-parser": "^4.0.0-beta.8", "mocha": "^9.0.0", "proxy": "^1.0.2", - "resolve-tspaths": "^0.2.1", + "resolve-tspaths": "^0.2.3", "socket.io-client": "^4.0.1", "supertest": "^6.0.1", "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 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "baseUrl": "./", - "outDir": "../../dist/server/tools", - "paths": { // FIXME: https://github.com/benyap/resolve-tspaths/issues/10 - "@server/*": [ "../../server/*" ], - "@shared/*": [ "../../shared/*" ] - } + "outDir": "../../dist/server/tools" }, "include": [ ".", "../typings" ], "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: resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.0.0.tgz#9bc72e6860347bb045a876d1c5c0af11e9b984e7" integrity sha512-4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ== -fast-glob@3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-glob@^3.2.9: +fast-glob@3.2.11, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -5352,6 +5341,11 @@ json5@^2.1.1, json5@^2.1.3: dependencies: minimist "^1.2.5" +jsonc-parser@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== + jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -7292,14 +7286,15 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-tspaths@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-tspaths/-/resolve-tspaths-0.2.1.tgz#3e148ed4c8806b54b0fba27e0c781529e0d0de30" - integrity sha512-waDnPicvN/dCGKaVZOuQXj440sYKg5tckOug8s76XiNpdFOwSsnkl9TP7coYWYEysxsO1pGTkOFs6UMATde/mg== +resolve-tspaths@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/resolve-tspaths/-/resolve-tspaths-0.2.3.tgz#0b7200e44db785eb316a508dcc4dae4649840135" + integrity sha512-h3mbiTixJVwwot2kbEYDlHHxw8f+rUOYiv3t/e6XLEnFEztIL4IiensO9xlQEYZfJt44zrBkw8R+Icy1N1Sc+A== dependencies: ansi-colors "4.1.1" commander "8.3.0" - fast-glob "3.2.7" + fast-glob "3.2.11" + jsonc-parser "3.0.0" resolve@^1.10.1, resolve@^1.15.1, resolve@^1.18.1, resolve@^1.20.0: version "1.21.0"