Merge pull request #26 from osstotalsoft/upgrade-packages

Upgrade packages

.gitignore

@@ -25,4 +25,5 @@ yarn-error.log*
 junit.xml
 .eslintcache
 .vscode/*
+.yarn/*
 gql-bff/.env.development

gql-bff/.env

@@ -1,13 +1,14 @@
 PORT ="5000"
 
 IDENTITY_AUTHORITY=
+IDENTITY_OPENID_CONFIGURATION=/.well-known/openid-configuration/jwks
 
 ELASTIC_SEARCH_HOST=http://localhost:9200
 ELASTIC_USER=
 ELASTIC_PASSWORD=
 ELASTIC_VERSION=7
 ELASTIC_PREFIX=atlas
-SCHEDULE_URL=http://localhost:3001
+#SCHEDULE_URL=http://localhost:3001
 # DEBUG, ERROR, INFO
 APOLLO_LOGGING_LEVEL=ERROR
 

react-ui/.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+build
+.vscode
+.yarn/cache

react-ui/.gitignore

@@ -24,3 +24,4 @@ yarn-error.log*
 /.vs
 junit.xml
 .eslintcache
+.yarn/cache

react-ui/.npmrc

@@ -1 +1 @@
-@bit:registry=https://node.bit.dev
+@totalsoft_oss:registry=https://node.bit.cloud

react-ui/.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.5.0.cjs

react-ui/Dockerfile

@@ -1,10 +1,12 @@
 # build environment
-FROM node:18 as builder
+FROM node:18-slim as builder
 WORKDIR /app
 
 COPY package.json ./
 COPY yarn.lock ./
 COPY .npmrc ./
+RUN yarn set version 3.5.0
+COPY .yarnrc.yml ./
 RUN yarn install
 
 ARG REACT_APP_VERSION=0.0.0.0

react-ui/package.json

@@ -7,74 +7,62 @@
     "npm": ">= 7.16.0"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.6",
+    "@apollo/client": "^3.7.16",
     "@axa-fr/react-oidc-context": "3.1.6",
-    "@bit/totalsoft_oss.react-mui.date-time": "2.9.61",
-    "@bit/totalsoft_oss.react-mui.kit.core": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.styles": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.blue-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.default-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.green-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.light-blue-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.orange-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.red-theme": "^2.9.61",
-    "@bit/totalsoft_oss.react-mui.themes.vivid-orange-theme": "^2.9.61",
     "@date-io/moment": "^2.16.1",
-    "@emotion/react": "^11.1.5",
-    "@emotion/styled": "^11.1.5",
-    "@material-ui/core": "^4.12.2",
-    "@material-ui/icons": "^4.11.2",
-    "@projectstorm/react-diagrams": "6.5.0",
+    "@emotion/react": "^11.11.1",
+    "@emotion/styled": "^11.11.0",
+    "@mui/icons-material": "^5.11.16",
+    "@mui/lab": "^5.0.0-alpha.134",
+    "@mui/material": "^5.13.6",
+    "@mui/styles": "^5.13.2",
+    "@projectstorm/react-diagrams": "7.0.2",
     "@totalsoft/change-tracking-react": "^5.0.22",
     "@totalsoft/pure-validations-react": "^5.0.22",
+    "@totalsoft/rocket-ui": "^0.1.25",
     "@totalsoft/rules-algebra-react": "^5.0.22",
     "@totalsoft/validations": "^1.0.4",
-    "ace-builds": "^1.4.12",
+    "ace-builds": "1.23.1",
     "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
     "apollo-link-mock": "^1.0.1",
     "apollo-upload-client": "^17.0.0",
     "classnames": "^2.3.1",
     "closest": "0.0.1",
-    "d3": "5.9.7",
+    "d3": "7.8.5",
     "dagre-d3": "0.6.4",
-    "date-fns": "2.29.3",
+    "date-fns": "2.30.0",
     "deep-sort-object": "^1.0.2",
     "file-saver": "^2.0.5",
     "graphql": "^16.2.0",
-    "i18next": "^21.6.4",
-    "i18next-browser-languagedetector": "^6.1.2",
-    "i18next-http-backend": "^1.3.1",
+    "i18next": "^23.2.7",
+    "i18next-browser-languagedetector": "^7.1.0",
+    "i18next-http-backend": "^2.2.1",
     "js-beautify": "^1.14.0",
     "jsonlint-mod": "1.7.6",
     "lodash": "^4.17.21",
     "lodash.curry": "^4.1.1",
-    "moment": "2.29.1",
+    "moment": "2.29.4",
     "oidc-client": "^1.11.5",
     "omit-deep-lodash": "^1.1.5",
     "parse-svg-path": "0.1.2",
     "pathfinding": "^0.4.18",
     "paths-js": "^0.4.11",
-    "ramda": "^0.28.0",
-    "react": "^17.0.2",
-    "react-ace": "^9.4.0",
+    "ramda": "^0.29.0",
+    "react": "18.2.0 ",
+    "react-ace": "10.1.0",
+    "react-country-flag": "3.1.0",
     "react-diff-viewer": "^3.1.1",
-    "react-dom": "^17.0.2",
-    "react-flags": "^0.1.18",
-    "react-i18next": "^11.15.3",
-    "react-intersection-observer": "^8.32.0",
+    "react-dom": "18.2.0 ",
+    "react-i18next": "^13.0.1",
+    "react-intersection-observer": "^9.5.2",
     "react-json-view": "1.21.3",
-    "react-number-format": "^4.6.3",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^6.14.1",
     "react-scripts": "^5.0.0",
     "react-super-responsive-table": "^5.2.0",
     "reactour": "^1.18.6",
     "resize-observer-polyfill": "^1.5.1",
-    "simplebar-react": "^2.3.6",
-    "styled-components": "^5.3.1",
-    "subscriptions-transport-ws": "^0.11.0",
-    "url-search-params-polyfill": "^8.1.1",
-    "use-debounce": "^7.0.0"
+    "simplebar-react": "^3.2.4",
+    "subscriptions-transport-ws": "^0.11.0"
   },
   "resolutions": {
     "@projectstorm/react-diagrams-core": "6.5.0",
@@ -86,7 +74,7 @@
   "scripts": {
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
-    "test": "jest",
+    "test": "react-app-rewired test --transformIgnorePatterns \"node_modules/(?!react-dnd)/\" --env=jsdom",
     "test:ci": "cross-env CI=true npm test -- --reporters=default --reporters=jest-junit --coverage --coverageReporters=cobertura --coverageReporters=lcov --coverageReporters=html",
     "eject": "react-scripts eject",
     "eslint:report": "eslint --fix --ext .js .",
@@ -111,42 +99,38 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.16.7",
-    "@babel/eslint-parser": "^7.16.5",
+    "@babel/core": "^7.22.6",
+    "@babel/eslint-parser": "^7.22.6",
     "@babel/plugin-proposal-pipeline-operator": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
     "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.0.0",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
+    "@testing-library/react": "^14.0.0",
+    "babel-jest": "^29.6.1",
     "cross-env": "^7.0.3",
     "customize-cra": "^1.0.0",
     "enzyme": "^3.11.0",
-    "eslint-plugin-jest": "^26.1.0",
+    "eslint-plugin-jest": "^27.2.2",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "husky": "^7.0.4",
-    "jest": "^27.5.1",
-    "jest-junit": "^13.0.0",
-    "mini-css-extract-plugin": "2.5.3",
-    "prettier": "^2.5.1",
+    "husky": "^8.0.3",
+    "jest": "^29.6.0",
+    "jest-environment-jsdom": "^29.6.1",
+    "jest-junit": "^16.0.0",
+    "mini-css-extract-plugin": "2.7.6",
+    "prettier": "^3.0.0",
     "react-app-rewired": "^2.1.11",
-    "react-error-overlay": "6.0.9",
-    "react-test-renderer": "^17.0.2"
+    "react-error-overlay": "6.0.11",
+    "react-test-renderer": "^18.2.0",
+    "styled-components": "6.0.2"
   },
   "jest": {
-    "verbose": true,
-    "testEnvironment": "jsdom",
-    "moduleDirectories": [
-      "node_modules",
-      "src"
+    "transformIgnorePatterns": [
+      "node_modules/(?!@ngrx|(?!deck.gl)|ng-dynamic)"
     ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/src/__mocks__/fileMock.js",
       "\\.(css|less)$": "identity-obj-proxy"
-    },
-    "setupFilesAfterEnv": [
-      "./setupTests.js"
-    ]
+    }
   },
   "babel": {
     "presets": [
@@ -157,21 +141,30 @@
       [
         "@babel/plugin-proposal-pipeline-operator",
         {
-          "proposal": "minimal"
+          "proposal": "minimal",
+          "loose": true
         }
       ],
       [
         "@babel/plugin-transform-runtime",
         {
+          "loose": true,
           "regenerator": true
         }
       ],
       [
-        "@babel/plugin-transform-modules-commonjs"
+        "@babel/plugin-transform-modules-commonjs",
+        {
+          "loose": true
+        }
       ],
       [
-        "@babel/plugin-proposal-class-properties"
+        "@babel/plugin-proposal-class-properties",
+        {
+          "loose": true
+        }
       ]
     ]
-  }
+  },
+  "packageManager": "[email protected]"
 }