Skip to content
This repository was archived by the owner on Oct 10, 2024. It is now read-only.

Commit 7b78767

Browse files
author
Tom Duckering
committed
Update eslint
Was required since typescript version was upgraded Due to the way we import CSS modules there are now a lot of @eslint-disable Many of them will be resolved with the upgrade of gatsby which allows importing of named styles A bunch of other @eslint-disable just to get things passing Will need to come back and look at this
1 parent 223b009 commit 7b78767

File tree

89 files changed

+9179
-8413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+9179
-8413
lines changed

.eslintrc.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ module.exports = {
2222
"@typescript-eslint/no-inferrable-types": 0,
2323
"@typescript-eslint/strict-boolean-expressions": [
2424
2,
25-
{
26-
ignoreRhs: true,
27-
},
2825
],
2926
"@typescript-eslint/switch-exhaustiveness-check": 2,
3027
"@typescript-eslint/restrict-plus-operands": 2,

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.npmjs.org/

package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"react-simple-maps": "^2.3.0",
3535
"react-spinkit": "^3.0.0",
3636
"react-youtube": "^7.11.2",
37-
"sass": "^1.51.0",
3837
"styled-components": "^5.1.0"
3938
},
4039
"devDependencies": {
@@ -43,19 +42,19 @@
4342
"@types/classnames": "^2.2.10",
4443
"@types/jest": "^25.2.1",
4544
"@types/js-cookie": "^2.2.6",
46-
"@types/node": "^13.13.5",
45+
"@types/node": "^13.13.52",
4746
"@types/react": "^16.9.34",
4847
"@types/react-dom": "^16.9.7",
4948
"@types/react-helmet": "^5.0.15",
5049
"@types/react-modal": "^3",
5150
"@types/react-spinkit": "3",
5251
"@types/styled-components": "^5.1.0",
5352
"@types/vfile-message": "^2.0.0",
54-
"@typescript-eslint/eslint-plugin": "^2.30.0",
55-
"@typescript-eslint/parser": "^2.30.0",
53+
"@typescript-eslint/eslint-plugin": "^5.15.0",
54+
"@typescript-eslint/parser": "^5.15.0",
5655
"babel-jest": "^25.5.1",
5756
"babel-preset-gatsby": "^0.4.0",
58-
"eslint": "^6.8.0",
57+
"eslint": "^7.1.0",
5958
"eslint-config-prettier": "^6.11.0",
6059
"eslint-plugin-react": "^7.19.0",
6160
"eslint-plugin-react-hooks": "^3.0.0",
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/node_modules/gatsby-plugin-sharp/index.js b/node_modules/gatsby-plugin-sharp/index.js
2-
index ce52971..0faeec3 100644
2+
index c98f03b..baca53a 100644
33
--- a/node_modules/gatsby-plugin-sharp/index.js
44
+++ b/node_modules/gatsby-plugin-sharp/index.js
5-
@@ -519,9 +519,14 @@ async function fluid({
5+
@@ -512,9 +512,14 @@ async function fluid({
66
]; // use standard breakpoints if no custom breakpoints are specified
77

88
if (!options.srcSetBreakpoints || !options.srcSetBreakpoints.length) {
@@ -20,13 +20,13 @@ index ce52971..0faeec3 100644
2020
fluidSizes.push(options[fixedDimension] * 2);
2121
} else {
2222
options.srcSetBreakpoints.forEach(breakpoint => {
23-
@@ -542,7 +547,8 @@ async function fluid({
23+
@@ -535,7 +540,8 @@ async function fluid({
2424
// is available for small images. Also so we can link to
2525
// the original image.
2626

27-
- filteredSizes.push(fixedDimension === `maxWidth` ? width : height); // Queue sizes for processing.
27+
- filteredSizes.push(fixedDimension === `maxWidth` ? width : height);
2828
+ // Gatsby adds the original image for some reason. This is bizarre so I'm removing that line.
29-
+ // filteredSizes.push(fixedDimension === `maxWidth` ? width : height); // Queue sizes for processing.
29+
+ //filteredSizes.push(fixedDimension === `maxWidth` ? width : height);
30+
filteredSizes = _.sortBy(filteredSizes); // Queue sizes for processing.
3031

3132
const dimensionAttr = fixedDimension === `maxWidth` ? `width` : `height`;
32-
const otherDimensionAttr = fixedDimension === `maxWidth` ? `height` : `width`; // Sort sizes for prettiness.

src/components/basic-text-page.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import React from "react"
27

38
import HeaderUnderlay from "./header-underlay"

src/components/big-video.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import React, { FC } from "react"
27
import YouTube from "react-youtube"
38

src/components/bio.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import React from "react"
27
import { graphql } from "gatsby"
38

@@ -52,7 +57,11 @@ const Bio: React.FC<Props> = ({
5257
{person.jobTitle}
5358
</div>
5459
<div className={styles.email}>
55-
<a href={`mailto:${person.email}`}>
60+
<a
61+
href={`mailto:${
62+
person.email as string
63+
}`}
64+
>
5665
{person.email}
5766
</a>
5867
</div>

src/components/christmas/christmas2020.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import React from "react"
27
import { graphql, useStaticQuery } from "gatsby"
38
import styles from "./christmas2020.module.scss"
@@ -39,6 +44,7 @@ const Christmas2020 = () => {
3944
const event_group_objects = data
4045
.christmas!.frontmatter!.event_groups!.map(
4146
(unstructured_event_group: any) => {
47+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
4248
const events = unstructured_event_group.events.map(
4349
(unstructured_event: any) => {
4450
return {

src/components/christmas/christmas2021.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import React from "react"
27
import { graphql, useStaticQuery } from "gatsby"
38
import styles from "./christmas2021.module.scss"

src/components/christmas/event.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* These will go away when we upgrade to Gatsby >v3
2+
see: https://www.gatsbyjs.com/docs/reference/release-notes/migrating-from-v2-to-v3/#css-modules-are-imported-as-es-modules */
3+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
4+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
5+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
16
import { format, isAfter, sub } from "date-fns"
27
import React from "react"
38
import styles from "./christmas2021.module.scss"

0 commit comments

Comments
 (0)