diff --git a/apps/accounts/package.json b/apps/accounts/package.json index 51425ab60d..6a50ed08fc 100644 --- a/apps/accounts/package.json +++ b/apps/accounts/package.json @@ -5,6 +5,7 @@ "dependencies": { "@/next": "*", "@ente/accounts": "*", + "@ente/eslint-config": "*", "@ente/shared": "*" }, "devDependencies": { diff --git a/apps/auth/package.json b/apps/auth/package.json index d5e7b91dd1..d21e1dc055 100644 --- a/apps/auth/package.json +++ b/apps/auth/package.json @@ -5,6 +5,7 @@ "dependencies": { "@/next": "*", "@ente/accounts": "*", + "@ente/eslint-config": "*", "@ente/shared": "*" } } diff --git a/apps/cast/package.json b/apps/cast/package.json index 337c6a15bc..e544cd3701 100644 --- a/apps/cast/package.json +++ b/apps/cast/package.json @@ -5,6 +5,7 @@ "dependencies": { "@/next": "*", "@ente/accounts": "*", + "@ente/eslint-config": "*", "@ente/shared": "*", "jszip": "3.10.1", "mime-types": "^2.1.35" diff --git a/apps/photos/package.json b/apps/photos/package.json index 02808b1b3a..972f1788d5 100644 --- a/apps/photos/package.json +++ b/apps/photos/package.json @@ -6,6 +6,7 @@ "@/next": "*", "@date-io/date-fns": "^2.14.0", "@ente/accounts": "*", + "@ente/eslint-config": "*", "@ente/shared": "*", "@mui/x-date-pickers": "^5.0.0-alpha.6", "@stripe/stripe-js": "^1.13.2", @@ -61,6 +62,7 @@ "zxcvbn": "^4.4.2" }, "devDependencies": { + "@ente/eslint-config": "*", "@next/bundle-analyzer": "^14.1", "@types/bs58": "^4.0.1", "@types/leaflet": "^1.9.3", diff --git a/docs/dev.md b/docs/dev.md index 764c5240e9..62a578e2a7 100644 --- a/docs/dev.md +++ b/docs/dev.md @@ -31,6 +31,10 @@ denotes any version. yarn workspace photos add '@/utils@*' ``` +> Note: The yarn (classic) command above causes harmless but noisy diffs in +> `yarn.lock` when adding or removing dependencies to the workspaces. To fix +> them, run `yarn` again once to reset these unnecessary changes. + To see what packages depend on each other locally, use ```sh diff --git a/package.json b/package.json index e80b865af5..9687da8c2c 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,7 @@ "lint": "yarn prettier --check . && yarn workspaces run eslint .", "lint-fix": "yarn prettier --write . && yarn workspaces run eslint --fix ." }, - "dependencies": {}, "devDependencies": { - "@ente/eslint-config": "*", - "@typescript-eslint/eslint-plugin": "^7", - "@typescript-eslint/parser": "^7", "eslint": "^8", "prettier": "^3", "typescript": "^5" diff --git a/packages/accounts/package.json b/packages/accounts/package.json index d4d377845f..ebfa03eb02 100644 --- a/packages/accounts/package.json +++ b/packages/accounts/package.json @@ -8,6 +8,7 @@ }, "dependencies": { "@/next": "*", + "@ente/eslint-config": "*", "@ente/shared": "*" }, "devDependencies": {} diff --git a/packages/build-config/package.json b/packages/build-config/package.json index d5eb3f9b5e..4bacb61f38 100644 --- a/packages/build-config/package.json +++ b/packages/build-config/package.json @@ -1,5 +1,10 @@ { "name": "@/build-config", "version": "0.0.0", - "private": true + "private": true, + "devDependencies": { + "@typescript-eslint/eslint-plugin": "^7", + "@typescript-eslint/parser": "^7", + "prettier-plugin-organize-imports": "^3.2.4" + } } diff --git a/packages/shared/package.json b/packages/shared/package.json index 2d621db862..b4d4e1671a 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -4,6 +4,7 @@ "private": true, "dependencies": { "@/next": "*", + "@ente/eslint-config": "*", "@sentry/nextjs": "7.77.0", "axios": "^1.6.7" } diff --git a/packages/utils/.prettierrc.json b/packages/utils/.prettierrc.json index 0a02bcefda..f657075f0c 100644 --- a/packages/utils/.prettierrc.json +++ b/packages/utils/.prettierrc.json @@ -1,3 +1,4 @@ { - "tabWidth": 4 + "tabWidth": 4, + "plugins": ["prettier-plugin-organize-imports"] } diff --git a/yarn.lock b/yarn.lock index 9517205134..e82a02da75 100644 --- a/yarn.lock +++ b/yarn.lock @@ -239,10 +239,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@floating-ui/core@^1.0.0": version "1.6.0" @@ -271,7 +271,7 @@ resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.1.tgz#16308cea045f0fc777b6ff20a9f25474dd8293d2" integrity sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q== -"@humanwhocodes/config-array@^0.11.13": +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -822,9 +822,9 @@ integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== "@types/node@*": - version "20.11.19" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195" - integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ== + version "20.11.20" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659" + integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg== dependencies: undici-types "~5.26.4" @@ -922,9 +922,9 @@ "@types/react" "*" "@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^18": - version "18.2.57" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.57.tgz#147b516d8bdb2900219acbfc6f939bdeecca7691" - integrity sha512-ZvQsktJgSYrQiMirAN60y4O/LRevIV8hUzSOSNB6gfR3/o3wCBFQx3sPwIYtuDMeiVgsSS3UzCV26tEzgnfvQw== + version "18.2.58" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.58.tgz#22082d12898d11806f4a1aefb5583116a047493d" + integrity sha512-TaGvMNhxvG2Q0K0aYxiKfNDS5m5ZsoIBBbtfUorxdH4NGSXIlYvZxLJI+9Dd3KjeB3780bciLyAb7ylO8pLhPw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2014,15 +2014,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -3485,6 +3485,11 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== +prettier-plugin-organize-imports@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz#77967f69d335e9c8e6e5d224074609309c62845e" + integrity sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog== + prettier@^3: version "3.2.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" @@ -4228,9 +4233,9 @@ tr46@~0.0.3: integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== transformation-matrix@^2.15.0: - version "2.16.0" - resolved "https://registry.yarnpkg.com/transformation-matrix/-/transformation-matrix-2.16.0.tgz#190ca2a95a2abfb2390f7258b393c552ef6b4c9a" - integrity sha512-4XwWHnwmQwhxFfEdDpBhMBYs8ZCly55hrAuggQZJCtJN1CDx+jDZrbCJ0BYgpqVivOMMq7pOzktfm8mZk2nF3A== + version "2.16.1" + resolved "https://registry.yarnpkg.com/transformation-matrix/-/transformation-matrix-2.16.1.tgz#4a2de06331b94ae953193d1b9a5ba002ec5f658a" + integrity sha512-tdtC3wxVEuzU7X/ydL131Q3JU5cPMEn37oqVLITjRDSDsnSHVFzW2JiCLfZLIQEgWzZHdSy3J6bZzvKEN24jGA== truncate-utf8-bytes@^1.0.0: version "1.0.2"