chore: update dependencies (#3048)

* chore: move babel to dev, modify webpack config, spring security Signed-off-by: achmelo <a.chmelo@gmail.com> * update npm lock Signed-off-by: achmelo <a.chmelo@gmail.com> * old component update Signed-off-by: achmelo <a.chmelo@gmail.com> --------- Signed-off-by: achmelo <a.chmelo@gmail.com>
zowe · Aug 29, 2023 · 7c4af6a · 7c4af6a
1 parent 31423e3
commit 7c4af6a
Show file tree

Hide file tree

Showing 8 changed files with 34,406 additions and 46,646 deletions.
diff --git a/api-catalog-ui/frontend/config-overrides.js b/api-catalog-ui/frontend/config-overrides.js
@@ -0,0 +1,30 @@
+module.exports = {
+    webpack:  function(config, env) {
+    // New config, e.g. config.plugins.push...
+
+    config.module.rules = [...config.module.rules,
+        {
+            resolve: {
+                fallback: { "querystring": require.resolve("querystring-es3") }
+            }
+        }
+    ]
+
+    return config
+},
+    jest: (config) => {
+        config.transformIgnorePatterns = ["/node_modules/?!(swagger-ui-react/swagger-ui-es-bundle-core.js)"]
+        config.collectCoverageFrom = [
+            "src/App.{jsx,js}",
+            "src/**/*.{jsx,js}",
+            "src/**/reducers/*.{jsx,js}",
+            "!src/index.js",
+            "!src/responsive-tests/**",
+            "!cypress/*"
+        ]
+        return config;
+    }
+}
+
+
+
diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json
diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "homepage": ".",
     "dependencies": {
-        "@babel/core": "7.14.2",
+
         "@emotion/core": "10.1.1",
         "@emotion/is-prop-valid": "1.1.0",
         "@emotion/react": "11.5.0",
@@ -26,6 +26,7 @@
         "lodash": "4.17.21",
         "loglevel": "1.7.1",
         "openapi-snippet": "0.13.0",
+        "querystring-es3": "0.2.1",
         "react": "17.0.2",
         "react-app-polyfill": "2.0.0",
         "react-dom": "17.0.2",
@@ -49,9 +50,9 @@
     },
     "scripts": {
         "lint": "eslint \"src/**/*.{js,jsx}\"",
-        "build": "react-scripts build",
+        "build": "react-app-rewired build",
         "postbuild": "rimraf build/**/*.map",
-        "test": "react-scripts test --silent --watchAll=false --env=jsdom components/* utils/* reducers/* epics/* actions/* selectors/* ErrorBoundary/* helpers/* --reporters=default --reporters=jest-html-reporter --coverage",
+        "test": "react-app-rewired test --silent --watchAll=false --env=jsdom components/* utils/* reducers/* epics/* actions/* selectors/* ErrorBoundary/* helpers/* --reporters=default --reporters=jest-html-reporter --coverage",
         "cy:open": "cypress open",
         "cy:e2e:ci": "cypress run --spec \"cypress/integration/e2e/**/*.test.js\" --env catalogHomePage=https://gateway-service:10010/apicatalog/ui/v1 --browser chrome --headless",
         "cy:e2e:localhost": "cypress run --spec \"cypress/integration/e2e/**/*.test.js\" --browser chrome --headless",
@@ -71,6 +72,8 @@
         "includeFailureMsg": true
     },
     "devDependencies": {
+        "@babel/core": "7.22.11",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.11",
         "@babel/eslint-parser": "7.18.2",
         "@babel/preset-react": "7.18.6",
         "@testing-library/dom": "8.11.1",
@@ -88,13 +91,13 @@
         "eslint": "7.32.0",
         "eslint-config-airbnb": "19.0.4",
         "eslint-config-prettier": "8.3.0",
+        "eslint-plugin-cypress": "2.13.3",
         "eslint-plugin-flowtype": "5.7.2",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.26.0",
         "eslint-plugin-jsx-a11y": "6.6.0",
         "eslint-plugin-prettier": "3.4.0",
         "eslint-plugin-react": "7.30.1",
-        "eslint-plugin-cypress": "2.13.3",
         "express": "4.17.3",
         "jest": "26.6.0",
         "jest-environment-enzyme": "7.1.2",
@@ -108,6 +111,7 @@
         "nodemon": "2.0.18",
         "nth-check": "2.0.1",
         "prettier": "2.3.0",
+        "react-app-rewired": "2.2.1",
         "react-error-overlay": "6.0.9",
         "react-scripts": "5.0.1",
         "react-testing-library": "5.3.0",
@@ -124,19 +128,6 @@
         "got": "12.1.0",
         "react-error-overlay": "6.0.9"
     },
-    "jest": {
-        "transformIgnorePatterns": [
-            "/node_modules/?!(swagger-ui-react/swagger-ui-es-bundle-core.js)"
-        ],
-        "collectCoverageFrom": [
-            "src/App.{jsx,js}",
-            "src/**/*.{jsx,js}",
-            "src/**/reducers/*.{jsx,js}",
-            "!src/index.js",
-            "!src/responsive-tests/**",
-            "!cypress/*"
-        ]
-    },
     "engines": {
         "npm": "=9.3.1",
         "node": "=18.14.0"

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -13,13 +13,13 @@ dependencyResolutionManagement {
             version('springCloudGateway', '3.1.7')
             version('springSecurity') {
                 // older versions are vulnerable to CVE-2023-20862
-                strictly '[5.7.8,6.0.0['
-                prefer '5.7.8'
+                strictly '[5.7.10,6.0.0['
+                prefer '5.7.10'
             }
             version('springFramework') {
                 // older versions are vulnerable to CVE-2023-20863
-                strictly '[5.3.27,6.0.0['
-                prefer '5.3.27'
+                strictly '[5.3.29,6.0.0['
+                prefer '5.3.29'
             }
             version('springRetry', '1.2.5.RELEASE')
             version('springWebTestClient', '5.3.0')
@@ -33,7 +33,7 @@ dependencyResolutionManagement {
             version('commonsCodec', '1.15')
             version('commonsConfiguration', '1.10')
             version('commonsLang3', '3.12.0')
-            version('commonsLogging', '1.1.3')
+            version('commonsLogging', '1.2')
             version('commonsText', '1.10.0')
             version('commonsIo') {
                 // older versions are vulnerable to CVE-2021-29425
@@ -54,9 +54,9 @@ dependencyResolutionManagement {
             version('httpCore', '4.4.16')
             version('hystrix', '1.5.18')
             version('infinispan', '13.0.15.Final')
-            version('jacksonCore', '2.14.3')
-            version('jacksonDatabind', '2.14.3')
-            version('jacksonDataformatYaml', '2.14.3')
+            version('jacksonCore', '2.15.2')
+            version('jacksonDatabind', '2.15.2')
+            version('jacksonDataformatYaml', '2.15.2')
             version('jacksonMapperAsl', '1.9.16-TALEND')
             version('janino', '3.1.10')
             version('javassist', '3.29.2-GA')