diff --git a/apps/slackbot-proxy/.eslintrc.js b/apps/slackbot-proxy/.eslintrc.js index 303b7fd8d1e..f133e88b6b0 100644 --- a/apps/slackbot-proxy/.eslintrc.js +++ b/apps/slackbot-proxy/.eslintrc.js @@ -24,5 +24,6 @@ module.exports = { // set 'warn' temporarily -- 2022.07.13 Yuki Takei '@typescript-eslint/no-explicit-any': ['warn'], + '@typescript-eslint/consistent-type-imports': 'off', }, }; diff --git a/apps/slackbot-proxy/package.json b/apps/slackbot-proxy/package.json index a31d332ed28..eed918b0a31 100644 --- a/apps/slackbot-proxy/package.json +++ b/apps/slackbot-proxy/package.json @@ -29,6 +29,7 @@ }, "// comments for dependencies": { "@tsed/*": "v6.133.1 causes 'TypeError: Cannot read properties of undefined (reading 'prototype')' with `@Middleware()`", + "@tsed/common,di,schema": "force package to local node_modules in tsconfig.json since pnpm reads wrong hoisted tsed version (https://github.com/pnpm/pnpm/issues/7158)", "read-pkg-up": "v8 doesn't support CommonJS anymore. https://github.com/sindresorhus/read-pkg-up/issues/17", "typeorm": "Upgrading to v0.3.x requires significant changes. https://github.com/tsedio/tsed/blob/production/docs/tutorials/typeorm.md" }, @@ -39,6 +40,7 @@ "@slack/web-api": "^6.2.4", "@tsed/common": "=6.43.0", "@tsed/di": "=6.43.0", + "@tsed/logger": "=6.7.8", "@tsed/platform-express": "=6.43.0", "@tsed/schema": "=6.43.0", "@tsed/swagger": "=6.43.0", @@ -66,6 +68,7 @@ }, "// comments for devDependencies": { "@tsed/*": "v6.133.1 causes 'TypeError: Cannot read properties of undefined (reading 'prototype')' with `@Middleware()`", + "@tsed/core,exceptions": "force package to local node_modules in tsconfig.json since pnpm reads wrong hoisted tsed version (https://github.com/pnpm/pnpm/issues/7158)", "bootstrap": "v5.3.3 has a bug. refs: https://github.com/twbs/bootstrap/issues/39798" }, "devDependencies": { diff --git a/apps/slackbot-proxy/tsconfig.json b/apps/slackbot-proxy/tsconfig.json index 7df12a8c095..d84bdf1495b 100644 --- a/apps/slackbot-proxy/tsconfig.json +++ b/apps/slackbot-proxy/tsconfig.json @@ -7,7 +7,13 @@ "baseUrl": ".", "paths": { - "~/*": ["./src/*"] + "~/*": ["./src/*"], + // force package to local node_modules since pnpm reads wrong hoisted tsed version used in pdf-converter (https://github.com/pnpm/pnpm/issues/7158) + "@tsed/core": ["./node_modules/@tsed/core"], + "@tsed/schema": ["./node_modules/@tsed/schema"], + "@tsed/exceptions": ["./node_modules/@tsed/exceptions"], + "@tsed/common": ["./node_modules/@tsed/common"], + "@tsed/di": ["./node_modules/@tsed/di"], }, /* TODO: remove below flags for strict checking */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1efe15702ea..a8df38204f3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -494,7 +494,7 @@ importers: version: 15.3.1(i18next@23.16.5)(next@14.2.15(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(react-i18next@15.1.1(i18next@23.16.5)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0) next-superjson: specifier: ^1.0.7 - version: 1.0.7(@swc/helpers@0.5.15)(next@14.2.13(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(superjson@1.13.3) + version: 1.0.7(@swc/helpers@0.5.15)(next@14.2.15(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(superjson@1.13.3) next-themes: specifier: ^0.2.1 version: 0.2.1(next@14.2.15(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -1046,6 +1046,9 @@ importers: '@tsed/di': specifier: '=6.43.0' version: 6.43.0 + '@tsed/logger': + specifier: '=6.7.8' + version: 6.7.8 '@tsed/platform-express': specifier: '=6.43.0' version: 6.43.0(@types/multer@1.4.12)(body-parser@1.20.3) @@ -4672,6 +4675,9 @@ packages: '@tsed/logger@5.17.0': resolution: {integrity: sha512-co8DdRgtQaisudEQFP2/7y/ji9bnB9QrJYfEr0SEqdHIBJdwuq8joo2vyfOY8ht/w5LOcqo2NVebtwULSsD9Pg==} + '@tsed/logger@6.7.8': + resolution: {integrity: sha512-4VB4+nt7Ljihp7IEv7RmosxsRyXZGhnesqlcNEyE8r1WZCVdXvUn2YmyF+4zMkaX1pR5Vaf80i4IDp7WSW9gwg==} + '@tsed/logger@7.0.1': resolution: {integrity: sha512-jasFFSi1O2QCEHBX925Ao8N10mqNGeQEMzvyncGU4dxBmeXzjnmX/00og5uMy2eX++7xSVE5YmH1qczSXM3TPg==} @@ -18750,6 +18756,13 @@ snapshots: transitivePeerDependencies: - supports-color + '@tsed/logger@6.7.8': + dependencies: + colors: 1.4.0 + date-format: 4.0.14 + semver: 7.6.3 + tslib: 2.6.2 + '@tsed/logger@7.0.1': dependencies: colors: 1.4.0 @@ -22068,7 +22081,7 @@ snapshots: eslint: 8.41.0 eslint-import-resolver-node: 0.3.6 eslint-import-resolver-typescript: 2.7.1(eslint-plugin-import@2.26.0)(eslint@8.41.0) - eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-typescript@2.7.1)(eslint@8.41.0) + eslint-plugin-import: 2.26.0(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.26.0)(eslint@8.41.0))(eslint@8.41.0) eslint-plugin-jsx-a11y: 6.5.1(eslint@8.41.0) eslint-plugin-react: 7.30.1(eslint@8.41.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.41.0) @@ -22128,7 +22141,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.7.3(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@2.7.1): + eslint-module-utils@2.7.3(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.26.0)(eslint@8.41.0)): dependencies: debug: 3.2.7 find-up: 2.1.0 @@ -22150,7 +22163,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-typescript@2.7.1)(eslint@8.41.0): + eslint-plugin-import@2.26.0(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.26.0)(eslint@8.41.0))(eslint@8.41.0): dependencies: array-includes: 3.1.5 array.prototype.flat: 1.3.2 @@ -22158,7 +22171,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.41.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@2.7.1) + eslint-module-utils: 2.7.3(@typescript-eslint/parser@5.59.7(eslint@8.41.0)(typescript@5.0.4))(eslint-import-resolver-node@0.3.6)(eslint-import-resolver-typescript@2.7.1(eslint-plugin-import@2.26.0)(eslint@8.41.0)) has: 1.0.3 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -25806,7 +25819,7 @@ snapshots: next: 14.2.15(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6) superjson: 1.13.3 - next-superjson@1.0.7(@swc/helpers@0.5.15)(next@14.2.13(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(superjson@1.13.3): + next-superjson@1.0.7(@swc/helpers@0.5.15)(next@14.2.15(@babel/core@7.24.6)(@playwright/test@1.46.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(sass@1.77.6))(superjson@1.13.3): dependencies: '@swc/core': 1.4.17(@swc/helpers@0.5.15) '@swc/types': 0.1.12