diff --git a/.eslintrc b/.eslintrc index 81b11869..1559f6a0 100644 --- a/.eslintrc +++ b/.eslintrc @@ -24,23 +24,24 @@ "version": "detect" } }, + "plugins": ["import", "@typescript-eslint", "react", "react-hooks", "jsx-a11y", "prettier"], "extends": [ "airbnb-typescript", "airbnb/hooks", - "react-app", - "prettier/react", - "plugin:jest/recommended", "plugin:react/recommended", "plugin:@typescript-eslint/recommended", - // Uses eslint-config-prettier to disable ESLint rules from - // @typescript-eslint/eslint-plugin that would conflict with prettier - "prettier/@typescript-eslint", - // Enables eslint-plugin-prettier and eslint-config-prettier. This will - // display prettier errors as ESLint errors. Make sure this is always the - // last configuration in the extends array. + // eslint-config-prettier 8+ merged the previously-separate + // `prettier/react` and `prettier/@typescript-eslint` configs into + // the single `prettier` entry. Keep this last so it can override + // formatting rules from the configs above. "plugin:prettier/recommended" ], - "ignorePatterns": ["scratch", "src/serviceWorker.ts", "build"], + "ignorePatterns": [ + "scratch", + "build", + "src/**/*.test.ts", + "src/**/*.test.tsx" + ], "rules": { "array-bracket-newline": [ "error", @@ -178,6 +179,6 @@ "import/newline-after-import": "error", "import/extensions": 0, "import/prefer-default-export": 0, - "@typescript-eslint/no-unused-vars": ["error"] + "@typescript-eslint/no-unused-vars": ["error", { "args": "none" }] } } diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 00000000..37236231 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1 @@ +yarn lint-staged diff --git a/public/index.html b/index.html similarity index 83% rename from public/index.html rename to index.html index ef88da4c..b1a4f333 100644 --- a/public/index.html +++ b/index.html @@ -17,9 +17,9 @@ - - - + + + @@ -29,7 +29,7 @@ name="description" content="An interactive language diversity map of New York City" /> - + @@ -56,17 +56,8 @@ manifest.json provides metadata used when your web app is installed on a user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> - - - + + Languages of New York City @@ -82,6 +73,7 @@
+