diff --git a/bot/package.json b/bot/package.json index 5493b0ac5..2540fdec2 100644 --- a/bot/package.json +++ b/bot/package.json @@ -10,7 +10,7 @@ }, "devDependencies": { "@types/express": "4.17.13", - "@types/express-serve-static-core": "4.17.24", + "@types/express-serve-static-core": "4.17.29", "@types/jest": "27.0.1", "@types/json5": "2.2.0", "@types/lodash": "4.14.172" diff --git a/common/package.json b/common/package.json index 3cf09d948..571b0c407 100644 --- a/common/package.json +++ b/common/package.json @@ -16,7 +16,7 @@ "license": "MIT", "devDependencies": {}, "dependencies": { - "@types/express-serve-static-core": "4.17.24", + "@types/express-serve-static-core": "4.17.29", "@types/mongodb": "3.6.18", "prudence": "^0.9.8" }, diff --git a/package.json b/package.json index 77fc2c813..2ddf5ba19 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "homepage": "https://github.com/TNG-dev/Tachi#readme", "devDependencies": { - "@types/node": "17.0.8", + "@types/node": "16.11.7", "@types/tap": "15.0.3", "eslint": "8.18.0", "eslint-plugin-cadence": "0.0.4", @@ -30,6 +30,14 @@ }, "peerDependencies": { "@types/mongodb": "3.6.18", - "@types/bson": "1.0.11" + "@types/bson": "1.0.11", + "@types/node": "16.11.7" + }, + "pnpm": { + "overrides": { + "@types/mongodb": "3.6.18", + "@types/bson": "1.0.11", + "@types/node": "16.11.7" + } } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0c5ab4a74..2d78cc22b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,10 +1,15 @@ lockfileVersion: 5.3 +overrides: + '@types/mongodb': 3.6.18 + '@types/bson': 1.0.11 + '@types/node': 16.11.7 + importers: .: specifiers: - '@types/node': 17.0.8 + '@types/node': 16.11.7 '@types/tap': 15.0.3 '@typescript-eslint/eslint-plugin': 5.22.0 '@typescript-eslint/parser': 5.22.0 @@ -15,14 +20,14 @@ importers: tsconfig-paths: 3.12.0 typescript: 4.6.3 devDependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 '@types/tap': 15.0.3 '@typescript-eslint/eslint-plugin': 5.22.0_3692bfa38c76dfb409a7f758aafdbd9d '@typescript-eslint/parser': 5.22.0_eslint@8.18.0+typescript@4.6.3 eslint: 8.18.0 eslint-plugin-cadence: 0.0.4_eslint@8.18.0+typescript@4.6.3 tap: 15.0.9_ts-node@10.0.0+typescript@4.6.3 - ts-node: 10.0.0_22ec373cc6e5c139fea80a5e1bbc5c61 + ts-node: 10.0.0_c102720f6450b26bef39f1c77b6d5775 tsconfig-paths: 3.12.0 typescript: 4.6.3 @@ -32,7 +37,7 @@ importers: '@discordjs/rest': 0.1.0-canary.0 '@types/bson': 1.0.11 '@types/express': 4.17.13 - '@types/express-serve-static-core': 4.17.24 + '@types/express-serve-static-core': 4.17.29 '@types/humanize-duration': ^3.27.1 '@types/jest': 27.0.1 '@types/json5': 2.2.0 @@ -74,7 +79,7 @@ importers: sync-fetch: 0.3.1 devDependencies: '@types/express': 4.17.13 - '@types/express-serve-static-core': 4.17.24 + '@types/express-serve-static-core': 4.17.29 '@types/jest': 27.0.1 '@types/json5': 2.2.0 '@types/lodash': 4.14.172 @@ -270,11 +275,11 @@ importers: common: specifiers: - '@types/express-serve-static-core': 4.17.24 + '@types/express-serve-static-core': 4.17.29 '@types/mongodb': 3.6.18 prudence: ^0.9.8 dependencies: - '@types/express-serve-static-core': 4.17.24 + '@types/express-serve-static-core': 4.17.29 '@types/mongodb': 3.6.18 prudence: 0.9.8 @@ -4255,20 +4260,13 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: true /@types/bson/1.0.11: resolution: {integrity: sha512-j+UcCWI+FsbI5/FQP/Kj2CXyplWAz39ktHFkXk84h7dNblKRSoNJs95PZFRd96NQGqsPEPgeclqnznWZr14ZDA==} dependencies: - '@types/node': 17.0.8 - dev: false - - /@types/bson/4.2.0: - resolution: {integrity: sha512-ELCPqAdroMdcuxqwMgUpifQyRoTpyYCNr1V9xKyF40VsBobsj+BbWNRvwGchMgBPGqkw655ypkjj2MEF5ywVwg==} - deprecated: This is a stub types definition. bson provides its own type definitions, so you do not need this installed. - dependencies: - bson: 4.6.4 + '@types/node': 16.11.7 dev: false /@types/bunyan/1.8.8: @@ -4289,7 +4287,7 @@ packages: /@types/connect/3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: true /@types/cookiejar/2.1.2: @@ -4308,20 +4306,12 @@ packages: '@types/express': 4.17.13 dev: true - /@types/express-serve-static-core/4.17.24: - resolution: {integrity: sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==} - dependencies: - '@types/node': 17.0.8 - '@types/qs': 6.9.7 - '@types/range-parser': 1.2.4 - /@types/express-serve-static-core/4.17.29: resolution: {integrity: sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 - dev: true /@types/express-session/1.17.4: resolution: {integrity: sha512-7cNlSI8+oOBUHTfPXMwDxF/Lchx5aJ3ho7+p9jJZYVg9dVDJFh3qdMXmJtRsysnvS+C6x46k9DRYmrmCkE+MVg==} @@ -4444,8 +4434,8 @@ packages: /@types/mongodb/3.6.18: resolution: {integrity: sha512-JSVFt9p0rTfZ4EgzXmVHUB3ue00xe3CRbQho8nXfImzEDDM4O7I3po1bwbWl/EIbLENxUreZxqLOc8lvcnLVPA==} dependencies: - '@types/bson': 4.2.0 - '@types/node': 17.0.8 + '@types/bson': 1.0.11 + '@types/node': 16.11.7 dev: false /@types/ms/0.7.31: @@ -4467,9 +4457,6 @@ packages: /@types/node/16.11.7: resolution: {integrity: sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==} - /@types/node/17.0.8: - resolution: {integrity: sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==} - /@types/nodemailer/6.4.4: resolution: {integrity: sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==} dependencies: @@ -4574,7 +4561,7 @@ packages: resolution: {integrity: sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==} dependencies: '@types/mime': 1.3.2 - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: true /@types/source-list-map/0.1.2: @@ -4603,13 +4590,13 @@ packages: /@types/tap/15.0.3: resolution: {integrity: sha512-usOLtmMm1jfjPdkt9R9HMTU/J6m9QNYjgFs5U2tFiOzQSd7lDd/aAMprExYLnJnZb6tM4ujmGv7ITe+1smIRgg==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: true /@types/tap/15.0.5: resolution: {integrity: sha512-MaP+EgZNFAGRvVjHWv8ldrLvYBn4PnmAlzY7IL3/RPAPkOXdggTSTgLFONbnTpdQTe8+ixYGAySKAm9ESlZm1A==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: true /@types/tapable/1.0.8: @@ -4637,7 +4624,7 @@ packages: /@types/webpack-sources/3.2.0: resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 '@types/source-list-map': 0.1.2 source-map: 0.7.4 dev: false @@ -4645,7 +4632,7 @@ packages: /@types/webpack/4.41.32: resolution: {integrity: sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 '@types/tapable': 1.0.8 '@types/uglify-js': 3.16.0 '@types/webpack-sources': 3.2.0 @@ -4656,7 +4643,7 @@ packages: /@types/ws/8.5.3: resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==} dependencies: - '@types/node': 17.0.8 + '@types/node': 16.11.7 dev: false /@typescript-eslint/eslint-plugin/5.22.0_3692bfa38c76dfb409a7f758aafdbd9d: @@ -5827,13 +5814,6 @@ packages: engines: {node: '>=0.6.19'} dev: false - /bson/4.6.4: - resolution: {integrity: sha512-TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ==} - engines: {node: '>=6.9.0'} - dependencies: - buffer: 5.7.1 - dev: false - /buffer-from/1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -14957,7 +14937,7 @@ packages: tap-parser: 10.1.0 tap-yaml: 1.0.0 tcompare: 5.0.7 - ts-node: 10.0.0_22ec373cc6e5c139fea80a5e1bbc5c61 + ts-node: 10.0.0_c102720f6450b26bef39f1c77b6d5775 typescript: 4.6.3 which: 2.0.2 transitivePeerDependencies: @@ -15005,7 +14985,7 @@ packages: tap-parser: 10.1.0 tap-yaml: 1.0.0 tcompare: 5.0.7 - ts-node: 10.0.0_22ec373cc6e5c139fea80a5e1bbc5c61 + ts-node: 10.0.0_c102720f6450b26bef39f1c77b6d5775 typescript: 4.5.5 which: 2.0.2 transitivePeerDependencies: @@ -15231,7 +15211,7 @@ packages: resolution: {integrity: sha512-hvE+ZYXuINrx6Ei6D6hz+PTim0Uf++dYbK9FFifLNwQj+RwKquhQpn868yZsCtJYiclZF1u8l6WZxxKi+vv7Rg==} dev: false - /ts-node/10.0.0_22ec373cc6e5c139fea80a5e1bbc5c61: + /ts-node/10.0.0_c102720f6450b26bef39f1c77b6d5775: resolution: {integrity: sha512-ROWeOIUvfFbPZkoDis0L/55Fk+6gFQNZwwKPLinacRl6tsxstTF1DbAcLKkovwnpKMVvOMHP1TIbnwXwtLg1gg==} engines: {node: '>=12.0.0'} hasBin: true @@ -15250,7 +15230,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.3 - '@types/node': 17.0.8 + '@types/node': 16.11.7 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 diff --git a/server/.taprc b/server/.taprc index caaf45c5d..844fe29ca 100644 --- a/server/.taprc +++ b/server/.taprc @@ -1,5 +1,10 @@ files: "src/test-utils/single-process-tap.ts" -test-env: [NODE_ENV=test, TCHIS_CONF_LOCATION=test.conf.json5] +test-env: + - NODE_ENV=test + - PORT=8080 + - MONGO_URL=127.0.0.1 + - REDIS_URL=127.0.0.1 + - TCHIS_CONF_LOCATION=test.conf.json5 # On a local machine, these tests run in under 2-3 minutes. # On github actions, these tests can take an inordinate amount of time. # The timeout is set to 16 minutes, which is ridiculous. diff --git a/server/tsconfig.json b/server/tsconfig.json index 1873281d1..f1ca2f504 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -28,6 +28,11 @@ ] } }, + "ts-node": { + "require": [ + "tsconfig-paths/register" + ] + }, "include": [ "src/**/*.ts" ],