diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..6a17026323 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,12 @@ +.yarn +node_modules +/dist/ + +/packages/_react-icons_all +/packages/_react-icons_all-files + +/packages/react-icons/build +/packages/react-icons/src/icons/* +!/packages/react-icons/src/icons/index.js + +/packages/preview/.next diff --git a/.prettierrc.yaml b/.prettierrc.yaml new file mode 100644 index 0000000000..579cda3c72 --- /dev/null +++ b/.prettierrc.yaml @@ -0,0 +1,6 @@ +overrides: + - files: + - "*.tsx" + - "*.ts" + options: + parser: typescript diff --git a/package.json b/package.json index 4059d4f726..b9e06b11c4 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ ], "license": "MIT", "devDependencies": { - "@typescript-eslint/eslint-plugin": "latest", - "@typescript-eslint/parser": "latest", + "@typescript-eslint/eslint-plugin": "^5.40.0", + "@typescript-eslint/parser": "^5.40.0", "eslint": "^8.25.0", "eslint-plugin-react": "latest", "lerna": "^3.22.1", @@ -17,6 +17,8 @@ "submodule": "git submodule update --init", "submodule-deinit": "git submodule deinit --all", "lint": "yarn eslint .", + "format": "prettier --write --ignore-unknown .", + "format:ci": "prettier --check --ignore-unknown .", "version-up": "lerna version", "version-snapshot": "lerna version --no-push --no-git-tag-version --yes --preid snapshot prepatch --force-publish", "version": "yarn install && git add .", diff --git a/packages/preview/.prettierrc.json b/packages/preview/.prettierrc.json deleted file mode 100644 index 0c9cbeae44..0000000000 --- a/packages/preview/.prettierrc.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "overrides": [ - { - "files": ["*.tsx"], - "options": { - "parser": "babel" - } - } - ], - "printWidth": 80, - "tabWidth": 2, - "useTabs": false, - "semi": true, - "singleQuote": false -} diff --git a/packages/preview/src/pages/search.tsx b/packages/preview/src/pages/search.tsx index 967ec77be4..44237b45fa 100644 --- a/packages/preview/src/pages/search.tsx +++ b/packages/preview/src/pages/search.tsx @@ -9,7 +9,7 @@ export default function SearchPage() { const { q } = router.query; const { query, setQuery } = React.useContext(Context); - if (!query && q) setQuery(q); + if (!query && q) setQuery(q as any); return ( diff --git a/packages/preview/src/utils/search-context.tsx b/packages/preview/src/utils/search-context.tsx index 83fa043288..81f7b83bdb 100644 --- a/packages/preview/src/utils/search-context.tsx +++ b/packages/preview/src/utils/search-context.tsx @@ -1,12 +1,22 @@ -/* eslint-disable @typescript-eslint/no-empty-function */ import React from "react"; -export const Context = React.createContext({ +interface ContextType { + query: string; + setQuery: (query: string) => void; + results: any; + setResults: (results: any) => void; +} + +export const Context: React.Context = React.createContext({ query: "", - setQuery: () => {}, + setQuery: () => { + // nop + }, results: {}, - setResults: () => {} -} as any); + setResults: () => { + //nop + } +}); export const Provider = ({ children }) => { const [query, setQuery] = React.useState(""); diff --git a/yarn.lock b/yarn.lock index 41f3ec5cee..766c50683f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4407,7 +4407,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.5.0, @typescript-eslint/eslint-plugin@npm:latest": +"@typescript-eslint/eslint-plugin@npm:^5.40.0, @typescript-eslint/eslint-plugin@npm:^5.5.0": version: 5.40.0 resolution: "@typescript-eslint/eslint-plugin@npm:5.40.0" dependencies: @@ -4440,7 +4440,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.5.0, @typescript-eslint/parser@npm:latest": +"@typescript-eslint/parser@npm:^5.40.0, @typescript-eslint/parser@npm:^5.5.0": version: 5.40.0 resolution: "@typescript-eslint/parser@npm:5.40.0" dependencies: @@ -15980,8 +15980,8 @@ __metadata: version: 0.0.0-use.local resolution: "react-icons-root@workspace:." dependencies: - "@typescript-eslint/eslint-plugin": latest - "@typescript-eslint/parser": latest + "@typescript-eslint/eslint-plugin": ^5.40.0 + "@typescript-eslint/parser": ^5.40.0 eslint: ^8.25.0 eslint-plugin-react: latest lerna: ^3.22.1