chore: Update webpack (#4581)

Flagsmith · Oct 1, 2024 · 38207ce · 38207ce
1 parent 59aa2f7
commit 38207ce
Show file tree

Hide file tree

Showing 7 changed files with 7,388 additions and 21,728 deletions.
diff --git a/frontend/.npmrc b/frontend/.npmrc
@@ -1 +0,0 @@
-legacy-peer-deps=true

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -27,6 +27,10 @@
     "node": "18.x",
     "npm": "9.x"
   },
+  "overrides": {
+    "react": "16.14.0",
+    "@material-ui/core": "4.12.4"
+  },
   "dependencies": {
     "@amplitude/analytics-browser": "^2.11.3",
     "@amplitude/plugin-session-replay-browser": "^1.6.24",
@@ -127,15 +131,15 @@
     "redux-persist": "^6.0.0",
     "refractor": "^4.8.1",
     "sass": "1.54.8",
-    "sass-loader": "13.0.2",
+    "sass-loader": "16.0.1",
     "semver": "^7.5.2",
     "style-loader": "1.3.0",
     "suppress-exit-code": "^1.0.0",
     "terser-webpack-plugin": "^5.3.6",
     "testcafe-react-selectors": "^5.0.3",
     "toml": "^3.0.0",
     "ts-node": "^10.9.1",
-    "webpack": "5.76.0",
+    "webpack": "5.94.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.10.0",
     "webpack-dev-middleware": "5.3.4",

diff --git a/frontend/web/styles/3rdParty/_hljs.scss b/frontend/web/styles/3rdParty/_hljs.scss
@@ -183,7 +183,7 @@
   padding: 7px 12px;
   border-radius: $border-radius-sm;
   margin-right: 5px;
-  margin-bottom: $input-padding-y/2;
+  margin-bottom: calc($input-padding-y / 2);
   .hljs-description {
     color: $code-btn-description-color;
   }

diff --git a/frontend/web/styles/components/_tabs.scss b/frontend/web/styles/components/_tabs.scss
@@ -148,6 +148,6 @@
   }
 }
 .pill .btn-tab .unread {
-  margin-left: $spacer/2;
+  margin-left: calc($spacer / 2);
   position: static;
 }
diff --git a/frontend/web/styles/flexbox/_index.scss b/frontend/web/styles/flexbox/_index.scss
@@ -33,8 +33,8 @@
 }
 
 .flex-column {
-  margin-left: $input-padding-x/2;
-  margin-right: $input-padding-x/2;
+  margin-left: calc($input-padding-x / 2);
+  margin-right: calc($input-padding-x / 2);
 }
 
 .flex-1 {

diff --git a/frontend/web/styles/project/_forms.scss b/frontend/web/styles/project/_forms.scss
@@ -5,7 +5,7 @@
     font-size: $font-caption;
     line-height: $line-height-xsm;
     &__line {
-        margin-left: $spacer/4;
+        margin-left: calc($spacer / 4);
         height: 2px;
         border-bottom: 1px dashed $hr-border-color;
     }
@@ -16,10 +16,10 @@
     font-size: $font-caption;
     line-height: $line-height-xsm;
     &__line {
-        margin-right: $spacer/4;
+        margin-right: calc($spacer / 4);
         &:last-child {
             margin-right: 0;
-            margin-left: $spacer/4;
+            margin-left: calc($spacer / 4);
         }
         height: 2px;
         border-bottom: 1px solid $hr-border-color;