Merge branch 'main' into fix/selectDatamodelShouldNotCrash

Altinn · Jun 7, 2024 · 2de1c94 · 2de1c94
2 parents 9614cdd + bf84169
commit 2de1c94
Show file tree

Hide file tree

Showing 11 changed files with 1,152 additions and 1,958 deletions.
diff --git a/frontend/app-development/package.json b/frontend/app-development/package.json
@@ -9,26 +9,24 @@
     "not op_mini all"
   ],
   "dependencies": {
-    "@mui/material": "5.15.19",
     "@reduxjs/toolkit": "1.9.7",
     "@studio/icons": "workspace:^",
     "@studio/pure-functions": "workspace:^",
     "axios": "1.7.2",
     "classnames": "2.5.1",
-    "history": "5.3.0",
     "i18next": "23.11.5",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-i18next": "14.1.2",
     "react-redux": "9.1.2",
     "react-router-dom": "6.23.1",
     "redux": "5.0.1",
-    "redux-saga": "1.3.0",
-    "reselect": "5.1.0"
+    "redux-saga": "1.3.0"
   },
   "devDependencies": {
     "cross-env": "7.0.3",
     "jest": "29.7.0",
+    "redux-mock-store": "1.5.4",
     "typescript": "5.4.5",
     "webpack": "5.91.0",
     "webpack-dev-server": "5.0.4"

diff --git a/frontend/app-preview/package.json b/frontend/app-preview/package.json
@@ -9,12 +9,8 @@
     "not op_mini all"
   ],
   "dependencies": {
-    "axios": "1.7.2",
-    "classnames": "2.5.1",
-    "qs": "6.12.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-redux": "9.1.2",
     "react-router-dom": "6.23.1"
   },
   "devDependencies": {

diff --git a/frontend/packages/schema-editor/package.json b/frontend/packages/schema-editor/package.json
@@ -2,19 +2,13 @@
   "name": "@altinn/schema-editor",
   "description": "JSON schema editor",
   "version": "0.1.0",
-  "dependencies": {
-    "jsonpointer": "5.0.1"
-  },
   "devDependencies": {
     "jest": "29.7.0"
   },
   "peerDependencies": {
-    "@mui/material": "5.15.19",
     "axios": "1.7.2",
     "classnames": "2.5.1",
     "react": "18.3.1",
-    "react-dnd": "16.0.1",
-    "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.3.1"
   },
   "private": true,

diff --git a/frontend/packages/shared/package.json b/frontend/packages/shared/package.json
@@ -4,29 +4,21 @@
   "author": "Altinn",
   "dependencies": {
     "@mui/material": "5.15.19",
-    "@reduxjs/toolkit": "1.9.7",
-    "axios": "1.7.2",
     "classnames": "2.5.1",
     "qs": "6.12.1",
     "react": "18.3.1",
     "react-content-loader": "7.0.0",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.3.1",
-    "react-redux": "9.1.2",
-    "react-router-dom": "6.23.1",
-    "react-select": "5.8.0",
-    "redux-saga": "1.3.0"
+    "react-router-dom": "6.23.1"
   },
   "devDependencies": {
     "@types/react": "18.3.3",
     "jest": "29.7.0",
     "typescript": "5.4.5"
   },
   "license": "3-Clause BSD",
-  "peerDependencies": {
-    "redux": "5.0.1"
-  },
   "private": true,
   "scripts": {
     "test": "jest --maxWorkers=50%"

diff --git a/frontend/packages/ux-editor-v3/package.json b/frontend/packages/ux-editor-v3/package.json
@@ -7,23 +7,21 @@
     "@mui/material": "5.15.19",
     "@reduxjs/toolkit": "1.9.7",
     "@studio/icons": "workspace:^",
-    "axios": "1.7.2",
     "classnames": "2.5.1",
     "react": "18.3.1",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.3.1",
     "react-modal": "3.16.1",
     "react-redux": "9.1.2",
-    "react-select": "5.8.0",
     "redux": "5.0.1",
     "reselect": "5.1.0",
     "typescript": "5.4.5",
     "uuid": "9.0.1"
   },
   "devDependencies": {
-    "@redux-devtools/extension": "3.3.0",
-    "jest": "29.7.0"
+    "jest": "29.7.0",
+    "redux-mock-store": "1.5.4"
   },
   "license": "3-Clause BSD",
   "main": "index.js",

diff --git a/frontend/packages/ux-editor/package.json b/frontend/packages/ux-editor/package.json
@@ -6,14 +6,12 @@
   "dependencies": {
     "@mui/material": "5.15.19",
     "@studio/icons": "workspace:^",
-    "axios": "1.7.2",
     "classnames": "2.5.1",
     "react": "18.3.1",
     "react-dnd": "16.0.1",
     "react-dnd-html5-backend": "16.0.1",
     "react-dom": "18.3.1",
     "react-modal": "3.16.1",
-    "react-select": "5.8.0",
     "reselect": "5.1.0",
     "typescript": "5.4.5",
     "uuid": "9.0.1"

diff --git a/frontend/scripts/package.json b/frontend/scripts/package.json
@@ -7,11 +7,10 @@
     "@typescript-eslint/eslint-plugin": "7.11.0",
     "@typescript-eslint/parser": "7.11.0",
     "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-prettier": "5.1.3",
     "glob": "10.4.1",
     "husky": "9.0.11",
+    "jsonpointer": "5.0.1",
     "lint-staged": "15.2.5",
     "prettier": "^3.0.3",
     "ts-node": "^10.9.1",

diff --git a/frontend/scripts/yarn.lock b/frontend/scripts/yarn.lock
@@ -160,13 +160,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pkgr/core@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "@pkgr/core@npm:0.1.0"
-  checksum: 10/eeff0e0e517b1ed10eb4c1a8971413a8349bbfdab727dbe7d4085fd94eab95f0c3beb51b9245fef30562849d2a7a119e07ca48c343c8c4ec4e64ee289f50fe5e
-  languageName: node
-  linkType: hard
-
 "@tsconfig/node10@npm:^1.0.7":
   version: 1.0.9
   resolution: "@tsconfig/node10@npm:1.0.9"
@@ -372,11 +365,10 @@ __metadata:
     "@typescript-eslint/parser": "npm:7.11.0"
     axios: "npm:1.7.2"
     eslint: "npm:8.57.0"
-    eslint-config-prettier: "npm:9.1.0"
     eslint-plugin-import: "npm:2.29.1"
-    eslint-plugin-prettier: "npm:5.1.3"
     glob: "npm:10.4.1"
     husky: "npm:9.0.11"
+    jsonpointer: "npm:5.0.1"
     lint-staged: "npm:15.2.5"
     prettier: "npm:^3.0.3"
     ts-node: "npm:^10.9.1"
@@ -923,17 +915,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:9.1.0":
-  version: 9.1.0
-  resolution: "eslint-config-prettier@npm:9.1.0"
-  peerDependencies:
-    eslint: ">=7.0.0"
-  bin:
-    eslint-config-prettier: bin/cli.js
-  checksum: 10/411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830
-  languageName: node
-  linkType: hard
-
 "eslint-import-resolver-node@npm:^0.3.9":
   version: 0.3.9
   resolution: "eslint-import-resolver-node@npm:0.3.9"
@@ -984,26 +965,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:5.1.3":
-  version: 5.1.3
-  resolution: "eslint-plugin-prettier@npm:5.1.3"
-  dependencies:
-    prettier-linter-helpers: "npm:^1.0.0"
-    synckit: "npm:^0.8.6"
-  peerDependencies:
-    "@types/eslint": ">=8.0.0"
-    eslint: ">=8.0.0"
-    eslint-config-prettier: "*"
-    prettier: ">=3.0.0"
-  peerDependenciesMeta:
-    "@types/eslint":
-      optional: true
-    eslint-config-prettier:
-      optional: true
-  checksum: 10/4f26a30444adc61ed692cdb5a9f7e8d9f5794f0917151051e66755ce032a08c3cc72c8b5d56101412e90f6d77035bd8194ea8731e9c16aacdd5ae345a8dae188
-  languageName: node
-  linkType: hard
-
 "eslint-scope@npm:^7.2.2":
   version: 7.2.2
   resolution: "eslint-scope@npm:7.2.2"
@@ -1143,13 +1104,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-diff@npm:^1.1.2":
-  version: 1.3.0
-  resolution: "fast-diff@npm:1.3.0"
-  checksum: 10/9e57415bc69cd6efcc720b3b8fe9fdaf42dcfc06f86f0f45378b1fa512598a8aac48aa3928c8751d58e2f01bb4ba4f07e4f3d9bc0d57586d45f1bd1e872c6cde
-  languageName: node
-  linkType: hard
-
 "fast-glob@npm:^3.2.9":
   version: 3.3.2
   resolution: "fast-glob@npm:3.3.2"
@@ -1840,6 +1794,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsonpointer@npm:5.0.1":
+  version: 5.0.1
+  resolution: "jsonpointer@npm:5.0.1"
+  checksum: 10/0b40f712900ad0c846681ea2db23b6684b9d5eedf55807b4708c656f5894b63507d0e28ae10aa1bddbea551241035afe62b6df0800fc94c2e2806a7f3adecd7c
+  languageName: node
+  linkType: hard
+
 "keyv@npm:^4.5.3":
   version: 4.5.4
   resolution: "keyv@npm:4.5.4"
@@ -2288,15 +2249,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier-linter-helpers@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "prettier-linter-helpers@npm:1.0.0"
-  dependencies:
-    fast-diff: "npm:^1.1.2"
-  checksum: 10/00ce8011cf6430158d27f9c92cfea0a7699405633f7f1d4a45f07e21bf78e99895911cbcdc3853db3a824201a7c745bd49bfea8abd5fb9883e765a90f74f8392
-  languageName: node
-  linkType: hard
-
 "prettier@npm:^3.0.3":
   version: 3.2.5
   resolution: "prettier@npm:3.2.5"
@@ -2677,16 +2629,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.8.6":
-  version: 0.8.8
-  resolution: "synckit@npm:0.8.8"
-  dependencies:
-    "@pkgr/core": "npm:^0.1.0"
-    tslib: "npm:^2.6.2"
-  checksum: 10/2864a5c3e689ad5b991bebbd8a583c5682c4fa08a4f39986b510b6b5d160c08fc3672444069f8f96ed6a9d12772879c674c1f61e728573eadfa90af40a765b74
-  languageName: node
-  linkType: hard
-
 "text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
@@ -2773,13 +2715,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.6.2":
-  version: 2.6.2
-  resolution: "tslib@npm:2.6.2"
-  checksum: 10/bd26c22d36736513980091a1e356378e8b662ded04204453d353a7f34a4c21ed0afc59b5f90719d4ba756e581a162ecbf93118dc9c6be5acf70aa309188166ca
-  languageName: node
-  linkType: hard
-
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"

diff --git a/frontend/testing/cypress/package.json b/frontend/testing/cypress/package.json
@@ -3,14 +3,12 @@
   "description": "studio tests",
   "version": "1.0.0",
   "devDependencies": {
-    "@faker-js/faker": "8.4.1",
     "@testing-library/cypress": "10.0.2",
     "axe-core": "4.9.1",
     "cypress": "13.10.0",
     "cypress-axe": "1.5.0",
     "cypress-plugin-tab": "1.0.5",
-    "eslint": "8.57.0",
-    "eslint-plugin-cypress": "2.15.2"
+    "eslint": "8.57.0"
   },
   "main": "index.js",
   "scripts": {

diff --git a/package.json b/package.json
@@ -12,6 +12,9 @@
     "@tanstack/react-query-devtools": "5.40.0",
     "ajv": "8.14.0",
     "ajv-formats": "3.0.1",
+    "i18next": "23.11.5",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-error-boundary": "4.0.13",
     "react-i18next": "14.1.2",
     "react-router-dom": "6.23.1",
@@ -20,8 +23,6 @@
   "devDependencies": {
     "@emotion/react": "11.11.4",
     "@emotion/styled": "11.11.5",
-    "@redux-saga/is": "1.1.3",
-    "@redux-saga/symbols": "1.1.3",
     "@svgr/webpack": "8.1.0",
     "@swc/core": "1.5.24",
     "@swc/jest": "0.2.36",
@@ -31,27 +32,22 @@
     "@testing-library/user-event": "14.5.2",
     "@types/css-modules": "1.0.5",
     "@types/jest": "29.5.12",
-    "@types/lodash-es": "4.17.12",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@types/react-redux": "7.1.33",
     "@types/redux-mock-store": "1.0.6",
     "@typescript-eslint/eslint-plugin": "7.11.0",
     "@typescript-eslint/parser": "7.11.0",
-    "clean-webpack-plugin": "4.0.0",
     "cross-env": "7.0.3",
     "css-loader": "6.11.0",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-react": "7.34.2",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-testing-library": "6.2.2",
     "glob": "10.4.1",
-    "html-webpack-plugin": "5.6.0",
     "husky": "9.0.11",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
@@ -60,18 +56,9 @@
     "lint-staged": "15.2.5",
     "mini-css-extract-plugin": "2.9.0",
     "prettier": "3.2.5",
-    "react": "18.3.1",
-    "react-dom": "18.3.1",
-    "redux-mock-store": "1.5.4",
-    "redux-saga": "1.3.0",
-    "redux-saga-test-plan": "4.0.6",
     "source-map-loader": "5.0.0",
-    "style-loader": "4.0.0",
-    "svg-inline-loader": "0.8.2",
     "swc-loader": "0.2.6",
     "terser-webpack-plugin": "5.3.10",
-    "ts-loader": "9.5.1",
-    "ts-morph": "22.0.0",
     "typescript": "5.4.5",
     "typescript-plugin-css-modules": "5.1.0",
     "webpack": "5.91.0",