From 1b0e31027e8858b2ccb968a94b7a5c9b05d72a79 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Thu, 12 Sep 2024 20:39:31 +0530 Subject: [PATCH] fix: lint fixes and typescript version fixes --- admin/package.json | 6 +-- live/package.json | 2 +- packages/editor/package.json | 2 +- packages/eslint-config-custom/index.js | 2 +- packages/eslint-config-custom/package.json | 3 +- packages/ui/package.json | 2 +- space/package.json | 6 +-- web/.eslintrc.js | 7 +++- web/package.json | 4 +- yarn.lock | 49 ++++++++++++++-------- 10 files changed, 50 insertions(+), 33 deletions(-) diff --git a/admin/package.json b/admin/package.json index 0117ec86c..7fe1901b6 100644 --- a/admin/package.json +++ b/admin/package.json @@ -12,10 +12,10 @@ }, "dependencies": { "@headlessui/react": "^1.7.19", - "@plane/types": "*", - "@plane/ui": "*", "@plane/constants": "*", "@plane/helpers": "*", + "@plane/types": "*", + "@plane/ui": "*", "@tailwindcss/typography": "^0.5.9", "@types/lodash": "^4.17.0", "autoprefixer": "10.4.14", @@ -46,6 +46,6 @@ "eslint-config-custom": "*", "tailwind-config-custom": "*", "tsconfig": "*", - "typescript": "^5.4.2" + "typescript": "5.4.5" } } diff --git a/live/package.json b/live/package.json index f854f10df..e67cd5588 100644 --- a/live/package.json +++ b/live/package.json @@ -54,6 +54,6 @@ "nodemon": "^3.1.0", "ts-node": "^10.9.2", "tsup": "^7.2.0", - "typescript": "^5.4.5" + "typescript": "5.4.5" } } diff --git a/packages/editor/package.json b/packages/editor/package.json index bb4e50ffd..b92336ddd 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -79,7 +79,7 @@ "tailwind-config-custom": "*", "tsconfig": "*", "tsup": "^7.2.0", - "typescript": "4.9.5" + "typescript": "5.4.5" }, "keywords": [ "editor", diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js index 6f651f08e..36149e361 100644 --- a/packages/eslint-config-custom/index.js +++ b/packages/eslint-config-custom/index.js @@ -8,7 +8,7 @@ module.exports = { plugins: ["react", "@typescript-eslint", "import"], settings: { next: { - rootDir: ["web/", "space/", "admin/", "packages/*/"], + rootDir: ["."], }, }, globals: { diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json index 161ca7182..40db84009 100644 --- a/packages/eslint-config-custom/package.json +++ b/packages/eslint-config-custom/package.json @@ -4,7 +4,6 @@ "version": "0.22.0", "main": "index.js", "license": "MIT", - "devDependencies": {}, "dependencies": { "@typescript-eslint/eslint-plugin": "^7.1.1", "@typescript-eslint/parser": "^7.1.1", @@ -14,6 +13,6 @@ "eslint-config-turbo": "^1.12.4", "eslint-plugin-import": "^2.29.1", "eslint-plugin-react": "^7.33.2", - "typescript": "^5.3.3" + "typescript": "5.4.5" } } diff --git a/packages/ui/package.json b/packages/ui/package.json index c5a1d279c..3ad129003 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -66,6 +66,6 @@ "tailwindcss": "^3.4.3", "tsconfig": "*", "tsup": "^7.2.0", - "typescript": "4.7.4" + "typescript": "5.4.5" } } diff --git a/space/package.json b/space/package.json index f7fbf73b9..5d5a4e3ad 100644 --- a/space/package.json +++ b/space/package.json @@ -17,10 +17,10 @@ "@emotion/styled": "^11.11.0", "@headlessui/react": "^1.7.13", "@mui/material": "^5.14.1", + "@plane/constants": "*", "@plane/editor": "*", "@plane/types": "*", "@plane/ui": "*", - "@plane/constants": "*", "@sentry/nextjs": "^8", "axios": "^1.7.4", "clsx": "^2.0.0", @@ -44,7 +44,6 @@ "react-popper": "^2.3.0", "swr": "^2.2.2", "tailwind-merge": "^2.0.0", - "typescript": "4.9.5", "uuid": "^9.0.0", "zxcvbn": "^4.4.2" }, @@ -61,6 +60,7 @@ "@typescript-eslint/eslint-plugin": "^5.48.2", "eslint-config-custom": "*", "tailwind-config-custom": "*", - "tsconfig": "*" + "tsconfig": "*", + "typescript": "5.4.5" } } diff --git a/web/.eslintrc.js b/web/.eslintrc.js index 57d39bcfa..4cc81f336 100644 --- a/web/.eslintrc.js +++ b/web/.eslintrc.js @@ -9,12 +9,15 @@ module.exports = { moduleDirectory: ["node_modules", "."], }, }, + next: { + rootDir: ["."], + }, }, rules: { "import/order": [ "error", { - groups: ["builtin", "external", "internal", "parent", "sibling",], + groups: ["builtin", "external", "internal", "parent", "sibling"], pathGroups: [ { pattern: "react", @@ -39,7 +42,7 @@ module.exports = { { pattern: "@/**", group: "internal", - } + }, ], pathGroupsExcludedImportTypes: ["builtin", "internal", "react"], alphabetize: { diff --git a/web/package.json b/web/package.json index bb3c94663..554aac229 100644 --- a/web/package.json +++ b/web/package.json @@ -7,7 +7,7 @@ "develop": "next dev --port 3000", "build": "next build", "start": "next start", - "lint": "next lint --dir .", + "lint": "next lint", "export": "next export", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist" }, @@ -80,6 +80,6 @@ "prettier": "^3.2.5", "tailwind-config-custom": "*", "tsconfig": "*", - "typescript": "^5.4.2" + "typescript": "5.4.5" } } diff --git a/yarn.lock b/yarn.lock index b1922e392..3024890ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11625,7 +11625,16 @@ string-argv@~0.3.2: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -11721,7 +11730,14 @@ string_decoder@^1.1.1, string_decoder@^1.3.0: dependencies: safe-buffer "~5.2.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -12424,20 +12440,10 @@ typed-styles@^0.0.7: resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9" integrity sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q== -typescript@4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== - -typescript@4.9.5: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - -typescript@^5.3.3, typescript@^5.4.2, typescript@^5.4.5: - version "5.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0" - integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw== +typescript@5.4.5: + version "5.4.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611" + integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ== uc.micro@^2.0.0, uc.micro@^2.1.0: version "2.1.0" @@ -12995,7 +13001,16 @@ word-wrap@^1.2.5: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==