Fix rebase issues

Author: leodube-aot

forms-flow-web/package-lock.json

@@ -6,8 +6,7 @@
   "scripts": {
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
-    "build": "GENERATE_SOURCEMAP=false craco --max_old_space_size=6144 build",
-    "winBuild": "set \"GENERATE_SOURCEMAP=false\" && craco build",
+    "build": "cross-env GENERATE_SOURCEMAP=false craco --max_old_space_size=6144 build",
     "eject": "react-scripts eject",
     "test": "craco test --detectOpenHandles --silent",
     "coverage": "craco test --coverage --watchAll=false",
@@ -36,6 +35,7 @@
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^12.1.5",
+    "cross-env": "^7.0.3",
     "msw": "^0.36.0",
     "redux-mock-store": "^1.5.5"
   },
@@ -47,14 +47,14 @@
     "@babel/helper-split-export-declaration": "^7.24.7",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@bpmn-io/properties-panel": "^3.14.0",
-    "@craco/craco": "7.1.0",
+    "@craco/craco": "^7.1.0",
     "@material-ui/core": "^4.11.4",
     "@reduxjs/toolkit": "^2.5.0",
     "@ronchalant/react-loading-overlay": "^1.1.0",
     "@stomp/stompjs": "^7.0.0",
     "@testing-library/user-event": "^14.6.1",
     "@wojtekmaj/react-daterange-picker": "^3.1.0",
-    "axios": "^1.8.3",
+    "axios": "^1.12.0",
     "bpmn-js": "^18.6.3",
     "bpmn-js-bpmnlint": "^0.19.0",
     "bpmn-js-properties-panel": "^5.7.0",
@@ -83,7 +83,7 @@
     "npm-force-resolutions": "^0.0.10",
     "querystring": "^0.2.1",
     "react": "^17.0.2",
-    "react-bootstrap": "^1.6.0",
+    "react-bootstrap": "^2.10.6",
     "react-date-range": "^1.1.3",
     "react-datepicker": "^3.8.0",
     "react-dom": "^17.0.2",
@@ -115,7 +115,8 @@
     "underscore": "1.13.7",
     "tar": "7.4.3",
     "postcss": "8.4.49",
-    "cookie": "1.0.1"
+    "cookie": "1.0.1",
+    "tmp": "^0.2.3"
   },
   "browserslist": [
     ">0.2%",