Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gatsby and all other packages #186

Merged
merged 10 commits into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ defaults: &defaults
working_directory: ~/repo
docker:
# Specify the version you desire here.
- image: circleci/node:12
- image: circleci/node:16

# Specify service dependencies here if necessary.
# CircleCI maintains a library of pre-built images,
Expand Down
18 changes: 15 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": [
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint",
"prettier",
"plugin:prettier/recommended",
"plugin:jsx-a11y/recommended",
"plugin:json/recommended"
Expand All @@ -23,9 +23,21 @@
}
},
"rules": {
"@typescript-eslint/interface-name-prefix": [
"@typescript-eslint/naming-convention": [
"error",
{ "prefixWithI": "always" }
{
"selector": "interface",
"format": ["PascalCase"],
"custom": {
"regex": "^I[A-Z]",
"match": true
}
},
{
"selector": ["variable", "function"],
"format": ["camelCase", "PascalCase", "UPPER_CASE"],
"leadingUnderscore": "allow"
}
],
"no-tabs": "error",
"react/prop-types": "off",
Expand Down
10 changes: 9 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,13 @@
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"proseWrap": "always"
"proseWrap": "always",
"overrides": [
{
"files": "*.css",
"options": {
"singleQuote": false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should look into adding this to dvc.org!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dvc.org took a different approach by changing format-staged not to target css files, but giving it this configuration will probably make linting more robust.

}
}
]
}
31 changes: 21 additions & 10 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,25 @@
"no-duplicate-selectors": null,
"declaration-colon-newline-after": null,
"value-list-comma-newline-after": null,
"property-no-unknown": [true, {
"ignoreProperties": ["composes"]
}],
"selector-pseudo-class-no-unknown": [true, {
"ignorePseudoClasses": ["global", "local"]
}],
"at-rule-no-unknown": [true, {
"ignoreAtRules": ["mixin"]
}]
},
"property-no-unknown": [
true,
{
"ignoreProperties": ["composes"]
}
],
"selector-pseudo-class-no-unknown": [
true,
{
"ignorePseudoClasses": ["global", "local"]
}
],
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": ["mixin"]
}
],
"selector-class-pattern": null,
"keyframes-name-pattern": null
}
}
14 changes: 8 additions & 6 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ const plugins = [
path: path.join(__dirname, 'content')
}
},
{
resolve: 'gatsby-source-filesystem',
options: {
name: 'images',
path: path.join(__dirname, 'static', 'img')
}
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad we're using gatsby-plugin-image for our docs! The images look kind of blurry. If I remember correctly from us fixing this with dvc.org, we need to add quality: 90 to our gatsby-remark-images options.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember the same solution to this problem, but after implementing it I don't notice any improvement. 🤔

{
resolve: 'gatsby-transformer-remark',
options: {
Expand Down Expand Up @@ -102,18 +109,14 @@ const plugins = [
{
resolve: 'gatsby-plugin-svgr',
options: {
ref: true,
svgoConfig: {
plugins: [{ removeViewBox: false }]
}
ref: true
}
},
'gatsby-plugin-sharp',
'gatsby-plugin-catch-links',
{
resolve: 'gatsby-plugin-manifest',
options: {
/* eslint-disable @typescript-eslint/camelcase */
background_color: '#663399',
display: 'minimal-ui',
icon: 'static/favicon-512x512.png',
Expand Down Expand Up @@ -168,7 +171,6 @@ const plugins = [
type: 'image/png'
}
]
/* eslint-enable @typescript-eslint/camelcase */
}
},
{
Expand Down
183 changes: 93 additions & 90 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,130 +35,133 @@
"node": "<=14.x"
},
"dependencies": {
"@emotion/react": "^11.7.1",
"@emotion/styled": "^11.6.0",
"@hapi/wreck": "^17.0.0",
"@mdx-js/react": "^1.6.22",
"@octokit/graphql": "^4.3.1",
"@reach/portal": "^0.10.0",
"@reach/portal": "^0.16.2",
"@reach/router": "^1.3.3",
"@reach/tooltip": "^0.10.0",
"@theme-ui/color": "^0.9.1",
"@theme-ui/components": "^0.9.1",
"@theme-ui/presets": "^0.9.1",
"@reach/tooltip": "^0.16.2",
"@theme-ui/color": "^0.13.1",
"@theme-ui/components": "^0.13.1",
"@theme-ui/presets": "^0.13.1",
"classnames": "^2.2.6",
"color": "^3.1.2",
"color": "^4.2.0",
"compression": "^1.7.4",
"date-fns": "^2.11.1",
"date-fns": "^2.28.0",
"docsearch.js": "^2.6.3",
"ease-component": "^1.0.0",
"express": "^4.17.1",
"fs-extra": "^9.0.0",
"gatsby": "^2.20.13",
"gatsby-cli": "2.12.54",
"gatsby-image": "^2.3.1",
"gatsby-link": "^2.3.2",
"express": "^4.17.2",
"fs-extra": "^10.0.0",
"gatsby": "^4.5.3",
"gatsby-cli": "4.5.2",
"gatsby-image": "^3.11.0",
"gatsby-link": "^4.5.0",
"gatsby-plugin-alias-imports": "^1.0.5",
"gatsby-plugin-image": "0.7.2",
"gatsby-plugin-image": "2.5.2",
"gatsby-plugin-parent-resolvers": "^1.0.1",
"gatsby-plugin-robots-txt": "^1.6.2",
"gatsby-plugin-theme-ui": "^0.9.1",
"gatsby-source-github-api": "^0.2.1",
"github-markdown-css": "^4.0.0",
"iso-url": "^0.4.7",
"isomorphic-fetch": "^2.2.1",
"gatsby-plugin-robots-txt": "^1.7.0",
"gatsby-plugin-theme-ui": "^0.13.1",
"gatsby-source-github-api": "^1.0.0",
"github-markdown-css": "^5.1.0",
"iso-url": "^1.2.1",
"isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"moment": "^2.25.3",
"nanoid": "^3.0.2",
"nanoid": "^3.2.0",
"node-cache": "^5.1.0",
"perfect-scrollbar": "^1.5.0",
"pretty-quick": "^2.0.1",
"prismjs": "^1.25.0",
"promise-polyfill": "^8.1.3",
"prop-types": "^15.7.2",
"perfect-scrollbar": "^1.5.5",
"pretty-quick": "^3.1.3",
"prismjs": "^1.26.0",
"promise-polyfill": "^8.2.1",
"prop-types": "^15.8.1",
"raf-polyfill": "^1.0.0",
"react": "^16.13.1",
"react-collapse": "^5.0.1",
"react": "^17.0.2",
"react-collapse": "^5.1.1",
"react-collapsible": "^2.7.0",
"react-dom": "^16.13.1",
"react-ga": "^2.7.0",
"react-helmet": "^5.2.1",
"react-dom": "^17.0.2",
"react-ga": "^3.3.0",
"react-helmet": "^6.1.0",
"react-popover": "^0.5.10",
"react-slick": "^0.25.2",
"react-use": "^14.0.0",
"rehype-react": "^5.0.1",
"remark-preset-lint-recommended": "^5.0.0",
"repo-link-check": "^0.7.1",
"react-slick": "^0.28.1",
"react-use": "^17.3.2",
"rehype-react": "^7.0.4",
"remark-preset-lint-recommended": "^6.1.2",
"repo-link-check": "^0.8.0",
"s3-client": "^4.4.2",
"scroll": "^3.0.1",
"serve-handler": "^6.1.2",
"slick-carousel": "^1.8.1",
"theme-ui": "^0.9.1",
"theme-ui": "^0.13.1",
"title-case": "^3.0.2",
"upath": "^1.2.0"
"upath": "^2.0.1"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@svgr/webpack": "^5.3.1",
"@babel/core": "^7.16.7",
"@svgr/webpack": "^6.2.0",
"@types/classnames": "^2.2.10",
"@types/isomorphic-fetch": "^0.0.35",
"@types/promise-polyfill": "^6.0.3",
"@types/react": "^16.9.32",
"@types/react": "^17.0.38",
"@types/react-collapse": "^5.0.0",
"@types/react-dom": "^16.9.6",
"@types/react-helmet": "^5.0.15",
"@types/react-dom": "^17.0.11",
"@types/react-helmet": "^6.1.5",
"@types/react-popover": "^0.5.3",
"@types/react-slick": "^0.23.4",
"@types/rehype-react": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^2.27.0",
"@typescript-eslint/parser": "^2.27.0",
"autoprefixer": "^9.7.6",
"@types/react-slick": "^0.23.8",
"@types/rehype-react": "^6.0.0",
"@typescript-eslint/eslint-plugin": "^5.10.0",
"@typescript-eslint/parser": "^5.10.0",
"autoprefixer": "^10.4.2",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.0.1",
"babel-plugin-transform-define": "^2.0.0",
"babel-jest": "^27.4.6",
"babel-plugin-transform-define": "^2.0.1",
"babel-plugin-transform-object-assign": "^6.22.0",
"eslint": "^6.8.0",
"eslint-config-prettier": "^6.10.1",
"eslint-plugin-json": "^2.1.1",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-react": "^7.19.0",
"gatsby-plugin-catch-links": "^2.2.1",
"gatsby-plugin-manifest": "2.2.23",
"gatsby-plugin-postcss": "^2.2.1",
"gatsby-plugin-react-helmet": "^3.2.1",
"eslint": "^8.7.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"gatsby-plugin-catch-links": "^4.5.0",
"gatsby-plugin-manifest": "4.5.2",
"gatsby-plugin-postcss": "^5.5.0",
"gatsby-plugin-react-helmet": "^5.5.0",
"gatsby-plugin-sentry": "^1.0.1",
"gatsby-plugin-sharp": "2.2.32",
"gatsby-plugin-sitemap": "^2.3.1",
"gatsby-plugin-svgr": "^2.0.2",
"gatsby-plugin-typescript": "^2.3.1",
"gatsby-plugin-sharp": "4.5.2",
"gatsby-plugin-sitemap": "^5.5.0",
"gatsby-plugin-svgr": "^3.0.0-beta.0",
"gatsby-plugin-typescript": "^4.5.2",
"gatsby-plugin-webpack-bundle-analyzer": "^1.0.5",
"gatsby-remark-autolink-headers": "^2.2.1",
"gatsby-remark-copy-linked-files": "^2.2.1",
"gatsby-remark-autolink-headers": "^5.5.0",
"gatsby-remark-copy-linked-files": "^5.5.0",
"gatsby-remark-embed-gist": "^1.1.9",
"gatsby-remark-embedder": "^2.0.0",
"gatsby-remark-embedder": "^5.0.0",
"gatsby-remark-external-links": "^0.0.4",
"gatsby-remark-images": "^3.2.2",
"gatsby-remark-prismjs": "^3.4.1",
"gatsby-remark-relative-images": "0.2.3",
"gatsby-remark-responsive-iframe": "^2.3.1",
"gatsby-remark-smartypants": "^2.2.1",
"gatsby-source-filesystem": "^2.2.2",
"gatsby-transformer-remark": "^2.7.1",
"hast-util-select": "^4.0.0",
"husky": "^4.2.3",
"jest": "^26.0.1",
"lint-staged": "^10.1.2",
"gatsby-remark-images": "^6.5.2",
"gatsby-remark-prismjs": "^6.5.0",
"gatsby-remark-relative-images": "2.0.2",
"gatsby-remark-responsive-iframe": "^5.5.0",
"gatsby-remark-smartypants": "^5.5.0",
"gatsby-source-filesystem": "^4.5.2",
"gatsby-transformer-remark": "^5.5.2",
"hast-util-select": "^5.0.1",
"husky": "4",
"jest": "^27.4.7",
"lint-staged": "^12.2.0",
"postcss-color-mod-function": "^3.0.3",
"postcss-custom-media": "^7.0.8",
"postcss-custom-properties": "^9.1.1",
"postcss-mixins": "^6.2.3",
"postcss-nested": "^4.2.1",
"prettier": "^2.2.1",
"remark": "^12.0.0",
"remark-html": "^13.0.2",
"remark-parse": "^8.0.2",
"stylelint": "^13.3.0",
"stylelint-config-standard": "^20.0.0",
"typescript": "^3.8.3",
"unist-util-remove-position": "^2.0.1"
"postcss-custom-media": "^8.0.0",
"postcss-custom-properties": "^12.1.3",
"postcss-mixins": "^9.0.1",
"postcss-nested": "^5.0.6",
"prettier": "^2.5.1",
"remark": "^14.0.2",
"remark-html": "^15.0.1",
"remark-parse": "^10.0.1",
"stylelint": "^14.2.0",
"stylelint-config-standard": "^24.0.0",
"typescript": "^4.5.4",
"unist-util-remove-position": "^4.0.1"
},
"husky": {
"hooks": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/LayoutWidthContainer/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import cn from 'classnames'

import styles from './styles.module.css'
import * as styles from './styles.module.css'

interface ILayoutWidthContainerProps {
className?: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}

@media (--xs-scr) {
padding: 0 31px 0 31px;
padding: 0 31px;
}
}
2 changes: 1 addition & 1 deletion src/components/atoms/ShowOnly/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import cn from 'classnames'

import styles from './styles.module.css'
import * as styles from './styles.module.css'

interface IShowOnlyProps {
on: 'mobile' | 'desktop'
Expand Down
Loading