From a13d1f53c04de7a60447bb4b95921a65d7b5f383 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:52:45 +0000 Subject: [PATCH 1/3] Bump prettier from 2.8.8 to 3.0.3 in /frontend Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.3) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- frontend/package-lock.json | 12 ++++++------ frontend/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 61f884128..8bb7b177c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -77,7 +77,7 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.31.10", "jest-date-mock": "^1.0.8", - "prettier": "^2.7.1", + "prettier": "^3.0.3", "sass": "^1.55.0", "ts-jest": "^29.1.1", "typescript": "^4.8.4" @@ -27245,15 +27245,15 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" diff --git a/frontend/package.json b/frontend/package.json index 53ccbd899..459778223 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -127,7 +127,7 @@ "eslint-plugin-react": "^7.31.10", "sass": "^1.55.0", "jest-date-mock": "^1.0.8", - "prettier": "^2.7.1", + "prettier": "^3.0.3", "ts-jest": "^29.1.1", "typescript": "^4.8.4" } From 985caaa3228a9c879bfe5ba73a27e9676a0bf769 Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Tue, 9 Jan 2024 13:50:37 -0500 Subject: [PATCH 2/3] Update to latest version of eslint-plugin-prettier to address lint issue. --- frontend/package-lock.json | 59 ++++++++++++++++++++++++++++++++------ frontend/package.json | 2 +- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d686ebce7..ca00f4f53 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -78,7 +78,7 @@ "eslint": "^8.26.0", "eslint-config-prettier": "^9.0.0", "eslint-config-react-app": "^7.0.1", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.1.2", "eslint-plugin-react": "^7.31.10", "express": "^4.18.2", "helmet": "^7.0.0", @@ -14815,6 +14815,18 @@ "node": ">= 8" } }, + "node_modules/@pkgr/core": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.0.tgz", + "integrity": "sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, "node_modules/@popperjs/core": { "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", @@ -24854,21 +24866,30 @@ } }, "node_modules/eslint-plugin-prettier": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", - "integrity": "sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.2.tgz", + "integrity": "sha512-dhlpWc9vOwohcWmClFcA+HjlvUpuyynYs0Rf+L/P6/0iQE6vlHW9l5bkfzN62/Stm9fbq8ku46qzde76T1xlSg==", "dev": true, "dependencies": { - "prettier-linter-helpers": "^1.0.0" + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.8.6" }, "engines": { - "node": ">=12.0.0" + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" }, "peerDependencies": { - "eslint": ">=7.28.0", - "prettier": ">=2.0.0" + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": "*", + "prettier": ">=3.0.0" }, "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, "eslint-config-prettier": { "optional": true } @@ -41574,6 +41595,28 @@ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, + "node_modules/synckit": { + "version": "0.8.8", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz", + "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==", + "dev": true, + "dependencies": { + "@pkgr/core": "^0.1.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/unts" + } + }, + "node_modules/synckit/node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true + }, "node_modules/tailwindcss": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1c76c4068..2fdbae381 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -132,7 +132,7 @@ "eslint": "^8.26.0", "eslint-config-prettier": "^9.0.0", "eslint-config-react-app": "^7.0.1", - "eslint-plugin-prettier": "^4.2.1", + "eslint-plugin-prettier": "^5.1.2", "eslint-plugin-react": "^7.31.10", "express": "^4.18.2", "helmet": "^7.0.0", From 4582e7bd51e3d3cb3b46e6a8c956df1d65fedf7d Mon Sep 17 00:00:00 2001 From: "Grayson, Matthew" Date: Tue, 9 Jan 2024 13:59:12 -0500 Subject: [PATCH 3/3] Fix lint errors related to eslint-plugin-prettier update. --- frontend/src/components/Header.tsx | 9 +++++---- frontend/src/pages/Organizations/Organizations.tsx | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx index f9d87e58e..08cf1f7e4 100644 --- a/frontend/src/components/Header.tsx +++ b/frontend/src/components/Header.tsx @@ -430,10 +430,11 @@ const HeaderNoCtx: React.FC = (props) => { ) { return options; } - return options.filter((option) => - option?.name - .toLowerCase() - .includes(state.inputValue.toLowerCase()) + return options.filter( + (option) => + option?.name + .toLowerCase() + .includes(state.inputValue.toLowerCase()) ); }} disableClearable diff --git a/frontend/src/pages/Organizations/Organizations.tsx b/frontend/src/pages/Organizations/Organizations.tsx index 539d5db36..eae041f4c 100644 --- a/frontend/src/pages/Organizations/Organizations.tsx +++ b/frontend/src/pages/Organizations/Organizations.tsx @@ -103,7 +103,7 @@ export const Organizations: React.FC = () => { ({ ...org, tags: org.tags.map((tag) => tag.name) - } as any) + }) as any ) } />