Skip to content

Commit

Permalink
Merge pull request #859 from jakeherp/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
jakeherp authored Oct 26, 2021
2 parents e1715d7 + 53b1e6e commit 21b3ca8
Show file tree
Hide file tree
Showing 4 changed files with 2,998 additions and 2,536 deletions.
8 changes: 3 additions & 5 deletions next-env.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/// <reference types="next" />
/// <reference types="next/types/global" />
/// <reference types="next/image-types/global" />

declare module '*.svg' {
const content: any;
export default content;
}
// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
87 changes: 43 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,71 +31,71 @@
"test": "jest --selectProjects test"
},
"dependencies": {
"@babel/runtime": "^7.14.6",
"@storybook/addon-actions": "^6.2.9",
"@storybook/addon-essentials": "^6.2.9",
"@storybook/addon-links": "^6.2.9",
"@storybook/react": "^6.2.9",
"@babel/runtime": "^7.15.4",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/react": "^6.3.12",
"@svgr/webpack": "^5.5.0",
"@testing-library/react-hooks": "^7.0.0",
"@testing-library/react-hooks": "^7.0.2",
"babel-polyfill": "^6.26.0",
"classnames": "^2.3.1",
"date-fns": "^2.22.1",
"date-fns": "^2.25.0",
"formik": "^2.2.9",
"gray-matter": "^4.0.3",
"lodash.orderby": "^4.6.0",
"markdown-to-jsx": "^7.1.3",
"next": "11.0.1-canary.5",
"next": "12.0.0",
"next-absolute-url": "^1.2.2",
"next-mdx-remote": "^3.0.2",
"next-redux-wrapper": "^7.0.2",
"next-mdx-remote": "^3.0.6",
"next-redux-wrapper": "^7.0.5",
"nprogress": "^0.2.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-redux": "^7.2.4",
"react-redux": "^7.2.6",
"react-typed": "^1.2.0",
"redux": "^4.1.0",
"redux": "^4.1.1",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.3.0",
"styled-components": "^5.3.0",
"typescript": "^4.3.4",
"uniqid": "^5.3.0",
"yup": "^0.32.9"
"redux-thunk": "^2.4.0",
"styled-components": "^5.3.3",
"typescript": "^4.4.4",
"uniqid": "^5.4.0",
"yup": "^0.32.11"
},
"devDependencies": {
"@babel/core": "^7.14.6",
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@testing-library/dom": "^7.31.2",
"@babel/core": "^7.15.8",
"@commitlint/cli": "^13.2.1",
"@commitlint/config-conventional": "^13.2.0",
"@testing-library/dom": "^8.10.1",
"@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7",
"@types/jest": "^26.0.23",
"@testing-library/react": "^12.1.2",
"@types/jest": "^27.0.2",
"@types/lodash.orderby": "^4.6.6",
"@types/nprogress": "^0.2.0",
"@types/react-redux": "^7.1.16",
"@types/styled-components": "^5.1.10",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"babel-loader": "^8.2.2",
"babel-plugin-styled-components": "^1.12.0",
"core-js": "^3.14.0",
"eslint": "^7.29.0",
"eslint-config-next": "^11.0.0",
"@types/react-redux": "^7.1.20",
"@types/styled-components": "^5.1.15",
"@typescript-eslint/eslint-plugin": "^5.2.0",
"@typescript-eslint/parser": "^5.2.0",
"babel-loader": "^8.2.3",
"babel-plugin-styled-components": "^1.13.3",
"core-js": "^3.19.0",
"eslint": "^8.1.0",
"eslint-config-next": "^12.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jest": "^24.3.6",
"eslint-plugin-jest": "^25.2.2",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.26.1",
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "^6.0.0",
"husky": "^7.0.4",
"hygen": "^6.1.0",
"jest": "^27.0.4",
"jest-runner-eslint": "^0.10.1",
"jest": "^27.3.1",
"jest-runner-eslint": "^1.0.0",
"jest-watch-select-projects": "^2.0.0",
"jest-watch-typeahead": "^0.6.4",
"lint-staged": "^11.0.0",
"prettier": "^2.3.1",
"start-server-and-test": "^1.12.5",
"jest-watch-typeahead": "^1.0.0",
"lint-staged": "^11.2.6",
"prettier": "^2.4.1",
"start-server-and-test": "^1.14.0",
"tsconfig-paths-webpack-plugin": "^3.5.1"
},
"jest-runner-eslint": {
Expand All @@ -119,7 +119,6 @@
}
},
"engines": {
"npm": ">=6.14.0 <8",
"node": ">=14.16.0 <15"
"node": ">=14"
}
}
132 changes: 91 additions & 41 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,93 @@
{
"compilerOptions": {
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"baseUrl": ".",
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"jsx": "preserve",
"paths": {
// Components
"Atoms/*": ["./src/components/atoms/*"],
"Molecules/*": ["./src/components/molecules/*"],
"Organisms/*": ["./src/components/organisms/*"],
"Species/*": ["./src/components/species/*"],
"Templates/*": ["./src/components/templates/*"],
// Other folders
"@Types": ["./@types/"],
"@Types/*": ["./@types/*"],
"Config": ["./src/config/"],
"Config/*": ["./src/config/*"],
"Styles/*": ["./src/styles/*"],
"Hooks": ["./src/hooks/"],
"Hooks/*": ["./src/hooks/*"],
"MockData": ["./src/mocks"],
"MockData/*": ["./src/mocks/*"],
"Pages/*": ["./src/pages*"],
"Public/*": ["./public/*"],
"Redux/*": ["./src/redux/*"],
"Storybook/*": [".storybook/*"],
"Utils/*": ["./src/utils/*"]
},
"isolatedModules": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
"exclude": ["node_modules"]
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"baseUrl": ".",
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"jsx": "preserve",
"paths": {
// Components
"Atoms/*": [
"./src/components/atoms/*"
],
"Molecules/*": [
"./src/components/molecules/*"
],
"Organisms/*": [
"./src/components/organisms/*"
],
"Species/*": [
"./src/components/species/*"
],
"Templates/*": [
"./src/components/templates/*"
],
// Other folders
"@Types": [
"./@types/"
],
"@Types/*": [
"./@types/*"
],
"Config": [
"./src/config/"
],
"Config/*": [
"./src/config/*"
],
"Styles/*": [
"./src/styles/*"
],
"Hooks": [
"./src/hooks/"
],
"Hooks/*": [
"./src/hooks/*"
],
"MockData": [
"./src/mocks"
],
"MockData/*": [
"./src/mocks/*"
],
"Pages/*": [
"./src/pages*"
],
"Public/*": [
"./public/*"
],
"Redux/*": [
"./src/redux/*"
],
"Storybook/*": [
".storybook/*"
],
"Utils/*": [
"./src/utils/*"
]
},
"isolatedModules": true,
"incremental": true
},
"include": [
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",
"**/*.d.ts"
],
"exclude": [
"node_modules"
]
}
Loading

1 comment on commit 21b3ca8

@vercel
Copy link

@vercel vercel bot commented on 21b3ca8 Oct 26, 2021

Choose a reason for hiding this comment

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

Please sign in to comment.