From 2d3d74fae2c82ad04395a3cc61392da4ed699c7b Mon Sep 17 00:00:00 2001 From: Radu-Cristian Popa Date: Mon, 22 Jan 2024 16:43:06 +0200 Subject: [PATCH] Update TSConfig --- .eslintignore | 1 - package.json | 4 +- packages/extension/package.json | 1 - packages/extension/tsconfig.json | 4 +- packages/server/package.json | 3 +- packages/server/src/index.ts | 2 +- packages/server/tsconfig.json | 2 +- pnpm-lock.yaml | 64 +++++++++++++++++++++++++++++--- 8 files changed, 65 insertions(+), 16 deletions(-) diff --git a/.eslintignore b/.eslintignore index a5e0897b..9c2bae7c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,3 @@ !.github node_modules/ dist -*/dist diff --git a/package.json b/package.json index a66fb99e..3d57ea8b 100644 --- a/package.json +++ b/package.json @@ -45,9 +45,11 @@ "jest-environment-jsdom": "^29.7.0", "jest-transform-stub": "^2.0.0", "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "^0.5.11", "ts-jest": "^29.1.1", "ts-loader": "^9.4.4", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "typescript": "^5.2.2" }, "engines": { "pnpm": "^8.10.5", diff --git a/packages/extension/package.json b/packages/extension/package.json index e60601a5..95a8f4bc 100644 --- a/packages/extension/package.json +++ b/packages/extension/package.json @@ -63,7 +63,6 @@ "postcss": "^8.4.32", "postcss-loader": "^7.3.3", "tailwindcss": "^3.4.0", - "typescript": "^5.2.2", "webpack-cli": "^5.1.4" }, "engines": { diff --git a/packages/extension/tsconfig.json b/packages/extension/tsconfig.json index b1339d0c..42472d5e 100644 --- a/packages/extension/tsconfig.json +++ b/packages/extension/tsconfig.json @@ -1,7 +1,6 @@ { "compilerOptions": { "noImplicitAny": true, - "composite": true, "strictNullChecks": true, "noImplicitThis": true, "esModuleInterop": true, @@ -10,7 +9,6 @@ "allowJs": true, "jsx": "react", "sourceMap": true, - "declaration": true, "moduleResolution": "node", "allowSyntheticDefaultImports": true, "allowUmdGlobalAccess": true, @@ -26,6 +24,6 @@ "@/hooks/*": ["./src/hooks/*"] } }, - "include": ["./src/**/*", "local-signature/**/*", "./jest.config.ts", "./jest.setup.ts"], + "include": ["./src/**/*", "./jest.config.ts", "./jest.setup.ts"], "exclude": ["dist", "dev", "temp"] } diff --git a/packages/server/package.json b/packages/server/package.json index 4fbb7e19..9f2797f6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -24,7 +24,6 @@ "devDependencies": { "@types/koa": "^2.14.0", "@types/koa-bodyparser": "^4.3.12", - "tsx": "^4.7.0", - "typescript": "^5.2.2" + "tsx": "^4.7.0" } } diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 41d984b7..7761e50e 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -18,7 +18,7 @@ function validateBody(body: any): body is GenerateSignatureRequestBody { async function validatePath(ctx: Context, next: Koa.Next): Promise { if (ctx.path !== '/') { - ctx.status = 404; + ctx.status = 403; } else { await next(); } diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 68dbff7e..b5a366a6 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,12 +1,12 @@ { "compilerOptions": { "target": "ES2020", - "composite": true, "lib": ["ES2020"], "module": "commonjs", "moduleResolution": "Node", "resolveJsonModule": true, "allowJs": false, + "rootDir": "./src", "declarationMap": true, "sourceMap": true, "declaration": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e46d50f..8fe4f2fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -77,6 +77,9 @@ importers: prettier: specifier: ^3.0.3 version: 3.1.0 + prettier-plugin-tailwindcss: + specifier: ^0.5.11 + version: 0.5.11(prettier@3.1.0) ts-jest: specifier: ^29.1.1 version: 29.1.1(@babel/core@7.23.5)(jest@29.7.0)(typescript@5.3.3) @@ -86,6 +89,9 @@ importers: ts-node: specifier: ^10.9.2 version: 10.9.2(@types/node@20.10.4)(typescript@5.3.3) + typescript: + specifier: ^5.2.2 + version: 5.3.3 packages/extension: dependencies: @@ -204,9 +210,6 @@ importers: tailwindcss: specifier: ^3.4.0 version: 3.4.0(ts-node@10.9.2) - typescript: - specifier: ^5.2.2 - version: 5.3.3 webpack-cli: specifier: ^5.1.4 version: 5.1.4(webpack-bundle-analyzer@4.10.1)(webpack@5.89.0) @@ -232,9 +235,6 @@ importers: tsx: specifier: ^4.7.0 version: 4.7.0 - typescript: - specifier: ^5.2.2 - version: 5.3.3 packages: @@ -5998,6 +5998,58 @@ packages: engines: {node: '>= 0.8.0'} dev: true + /prettier-plugin-tailwindcss@0.5.11(prettier@3.1.0): + resolution: {integrity: sha512-AvI/DNyMctyyxGOjyePgi/gqj5hJYClZ1avtQvLlqMT3uDZkRbi4HhGUpok3DRzv9z7Lti85Kdj3s3/1CeNI0w==} + engines: {node: '>=14.21.3'} + peerDependencies: + '@ianvs/prettier-plugin-sort-imports': '*' + '@prettier/plugin-pug': '*' + '@shopify/prettier-plugin-liquid': '*' + '@trivago/prettier-plugin-sort-imports': '*' + prettier: ^3.0 + prettier-plugin-astro: '*' + prettier-plugin-css-order: '*' + prettier-plugin-import-sort: '*' + prettier-plugin-jsdoc: '*' + prettier-plugin-marko: '*' + prettier-plugin-organize-attributes: '*' + prettier-plugin-organize-imports: '*' + prettier-plugin-style-order: '*' + prettier-plugin-svelte: '*' + prettier-plugin-twig-melody: '*' + peerDependenciesMeta: + '@ianvs/prettier-plugin-sort-imports': + optional: true + '@prettier/plugin-pug': + optional: true + '@shopify/prettier-plugin-liquid': + optional: true + '@trivago/prettier-plugin-sort-imports': + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-css-order: + optional: true + prettier-plugin-import-sort: + optional: true + prettier-plugin-jsdoc: + optional: true + prettier-plugin-marko: + optional: true + prettier-plugin-organize-attributes: + optional: true + prettier-plugin-organize-imports: + optional: true + prettier-plugin-style-order: + optional: true + prettier-plugin-svelte: + optional: true + prettier-plugin-twig-melody: + optional: true + dependencies: + prettier: 3.1.0 + dev: true + /prettier@3.1.0: resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'}