Skip to content

Commit

Permalink
build: upgrade packages and fix minor configuration issues
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasKandelborg committed Oct 22, 2020
1 parent 5f750d5 commit b8d19dc
Show file tree
Hide file tree
Showing 7 changed files with 1,056 additions and 662 deletions.
2 changes: 1 addition & 1 deletion .eslintcache

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ module.exports = {
'plugin:jsdoc/recommended',
'plugin:promise/recommended',
'plugin:node/recommended-module',
'plugin:@next/next/recommended',
'plugin:prettier/recommended',
'prettier/react'
],
Expand All @@ -105,7 +106,7 @@ module.exports = {
'jsdoc',
'prefer-arrow',
'promise',
'@next/eslint-plugin-next',
'@next/next',
'prettier'
],

Expand All @@ -126,12 +127,12 @@ module.exports = {
'plugin:import/errors',
'plugin:import/warnings',
'plugin:import/typescript',
'airbnb',
'airbnb/hooks',
'airbnb-typescript',
'airbnb/hooks',
'plugin:jsdoc/recommended',
'plugin:promise/recommended',
'plugin:node/recommended-module',
'plugin:@next/next/recommended',
'plugin:prettier/recommended',
'prettier/@typescript-eslint',
'prettier/react'
Expand All @@ -142,8 +143,8 @@ module.exports = {
'@typescript-eslint',
'jsdoc',
'prefer-arrow',
'@next/next',
'promise',
'@next/eslint-plugin-next',
'prettier'
],
settings: {
Expand All @@ -160,7 +161,7 @@ module.exports = {
rules: {
...rules,
/* TS Specific rules */
'no-undef': 0,
'no-undef': 2,

'@typescript-eslint/naming-convention': [
1,
Expand Down
7 changes: 4 additions & 3 deletions .vim/coc-settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"eslint.run": "onType",
"prettier.eslintIntegration": true,
"eslint.run": "onSave",
"eslint.packageManager": "yarn",
"prettier.formatterPriority": -1
"prettier.eslintIntegration": true,
"prettier.formatterPriority": -1,
"eslint.autoFixOnSave": true
}
12 changes: 8 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"eslint.enable": true,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"typescript.enablePromptUseWorkspaceTsdk": true,
"typescript.tsdk": "../../.yarn/sdks/typescript/lib",
"eslint.nodePath": "../../.yarn/sdks",
"prettier.prettierPath": "../../.yarn/sdks/prettier/index.js"
"editor.formatOnSaveMode": "file",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"eslint.codeActionsOnSave.mode": "all",
"eslint.lintTask.options": "--cache .",
"eslint.packageManager": "yarn"
}
9 changes: 6 additions & 3 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@ module.exports = withPWA({
dest: 'public',
runtimeCaching
},
i18n: {
locales: ['en-US'],
defaultLocale: 'en-US'
experimental: {
i18n: {
locales: ['en-US', 'da-DK', 'da', 'en'],
defaultLocale: 'en-US',
locale: 'en-US'
}
},
reactStrictMode: true,
trailingSlash: false,
Expand Down
42 changes: 22 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,26 @@
"@sanity/client": "2.0.1",
"@sanity/image-url": "0.140.19",
"@types/express": "4.17.8",
"@types/node": "14.11.8",
"@types/react": "16.9.52",
"@types/node": "14.14.2",
"@types/react": "16.9.53",
"@types/react-dom": "16.9.8",
"@types/webpack-env": "1.15.3",
"clsx": "1.1.1",
"easy-peasy": "4.0.1",
"final-form": "4.20.1",
"framer-motion": "2.9.1",
"framer-motion": "2.9.4",
"groq": "2.0.1",
"mdi-material-ui": "6.19.0",
"next": "9.5.6-canary.2",
"i18next-fs-backend": "^1.0.7",
"i18next-http-backend": "^1.0.21",
"mdi-material-ui": "6.20.0",
"next": "^9.5.6-canary.11",
"next-pwa": "3.1.5",
"next-seo": "4.13.0",
"react": "16.14.0",
"react-dom": "16.14.0",
"react-final-form": "6.5.1",
"next-seo": "4.14.0",
"react": "17.0.0",
"react-dom": "17.0.0",
"react-final-form": "6.5.2",
"sitemap": "6.3.2",
"swr": "0.3.5",
"swr": "0.3.6",
"ua-parser-js": "0.7.22"
},
"devDependencies": {
Expand All @@ -68,30 +70,30 @@
"@commitlint/prompt": "11.0.0",
"@next/eslint-plugin-next": "9.5.5",
"@types/ua-parser-js": "0.7.33",
"@typescript-eslint/eslint-plugin": "4.4.1",
"@typescript-eslint/parser": "4.4.1",
"@typescript-eslint/eslint-plugin": "4.5.0",
"@typescript-eslint/parser": "4.5.0",
"babel-eslint": "10.1.0",
"commitizen": "4.2.1",
"commitizen": "4.2.2",
"cz-conventional-changelog": "^3.3.0",
"eslint": "7.11.0",
"eslint-config-airbnb": "18.2.0",
"eslint-config-airbnb-typescript": "11.0.0",
"eslint-config-prettier": "6.12.0",
"eslint-config-airbnb-typescript": "12.0.0",
"eslint-config-prettier": "6.14.0",
"eslint-import-resolver-typescript": "2.3.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsdoc": "30.6.5",
"eslint-plugin-jsdoc": "30.7.3",
"eslint-plugin-jsx-a11y": "6.3.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prefer-arrow": "1.2.2",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-promise": "4.2.1",
"eslint-plugin-react": "7.21.4",
"eslint-plugin-react-hooks": "4.1.2",
"eslint-plugin-react": "7.21.5",
"eslint-plugin-react-hooks": "4.2.0",
"husky": "4.3.0",
"lint-staged": "10.4.0",
"lint-staged": "10.4.2",
"prettier": "2.1.2",
"semantic-release": "17.2.1",
"typescript": "4.0.3",
"webpack": "5.1.2"
"webpack": "5.1.3"
}
}
Loading

0 comments on commit b8d19dc

Please sign in to comment.