Merge branch 'master' into feature/next-js

This commit is contained in:
Aarni Halinen
2020-12-29 01:55:23 +02:00
68 changed files with 2632 additions and 1103 deletions
+10 -6
View File
@@ -23,10 +23,10 @@
"build": "next build",
"build:server": "webpack -p --config=configs/webpack/prod.js --env.platform=server",
"build:client": "webpack -p --config=configs/webpack/prod.js --env.platform=client",
"lint": "npm run lint:es && npm run lint:sass",
"lint": "npm run lint:es && npm run lint:css",
"lint:es": "eslint \"./src/**/*.{ts,tsx}\"",
"lint:es:fix": "eslint --fix \"./src/**/*.{ts,tsx}\"",
"lint:sass": "stylelint \"./src/**/*.{scss,css}\"",
"lint:css": "stylelint \"./src/**/*.{ts,tsx}\"",
"start": "npm run start-dev",
"start-dev": "next dev",
"serve": "next start",
@@ -46,9 +46,12 @@
"@types/jest": "24.0.22",
"@types/js-cookie": "2.2.4",
"@types/react": "16.8.18",
"@types/react-beautiful-dnd": "13.0.0",
"@types/react-csv": "1.1.1",
"@types/react-dom": "16.8.4",
"@types/react-helmet": "6.0.0",
"@types/react-jsonschema-form": "1.7.3",
"@types/shortid": "0.0.29",
"@types/styled-components": "5.1.1",
"@typescript-eslint/eslint-plugin": "^4.8.2",
"@typescript-eslint/parser": "^4.8.2",
@@ -70,9 +73,9 @@
"react-addons-test-utils": "15.6.2",
"react-dom": "16.8.6",
"stylelint": "11.1.1",
"stylelint-config-recommended-scss": "4.0.0",
"stylelint-config-standard": "19.0.0",
"stylelint-scss": "3.12.1",
"stylelint-config-recommended": "3.0.0",
"stylelint-config-styled-components": "0.1.1",
"stylelint-processor-styled-components": "1.10.0",
"testcafe": "1.6.1",
"testcafe-react-selectors": "2.1.0",
"typescript": "3.9.5",
@@ -83,10 +86,11 @@
"date-fns": "2.0.0-alpha.27",
"js-cookie": "2.2.0",
"lodash": "4.17.20",
"next": "^10.0.3",
"next": "10.0.4",
"normalize.css": "8.0.1",
"query-string": "6.5.0",
"react-beautiful-dnd": "10.1.1",
"react-csv": "2.0.3",
"react-helmet": "5.2.1",
"react-jsonschema-form": "^1.8.1",
"react-markdown": "4.3.1",