migrate to webpack 5

dvlden · Oct 4, 2021 · 63e25f8 · 63e25f8
1 parent 0b4c1d1
commit 63e25f8
Show file tree

Hide file tree

Showing 6 changed files with 3,875 additions and 8,127 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
   },
   "license": "MIT",
   "scripts": {
-    "serve": "webpack-dev-server --progress --hide-modules --mode development",
-    "build": "webpack --progress --hide-modules --mode production"
+    "serve": "webpack-dev-server --progress  --mode development",
+    "build": "webpack --progress  --mode production"
   },
   "homepage": "https://github.com/dvlden/webpack-config#readme",
   "bugs": "https://github.com/dvlden/webpack-config/issues",
@@ -30,36 +30,36 @@
     "> 1%"
   ],
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "autoprefixer": "^9.7.6",
-    "babel-loader": "^8.1.0",
-    "browser-sync": "^2.26.7",
-    "browser-sync-webpack-plugin": "^2.2.2",
-    "clean-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^6.0.0",
-    "css-loader": "^3.5.3",
-    "cssnano": "^4.1.10",
+    "@babel/core": "^7.15.5",
+    "@babel/preset-env": "^7.15.6",
+    "autoprefixer": "^10.3.6",
+    "babel-loader": "^8.2.2",
+    "browser-sync": "^2.27.5",
+    "browser-sync-webpack-plugin": "^2.3.0",
+    "clean-webpack-plugin": "^4.0.0",
+    "copy-webpack-plugin": "^9.0.1",
+    "css-loader": "^6.3.0",
+    "cssnano": "^5.0.8",
     "fibers": "^5.0.0",
-    "file-loader": "^6.0.0",
-    "html-loader": "^1.1.0",
-    "html-webpack-plugin": "^4.3.0",
-    "image-webpack-loader": "^6.0.0",
+    "file-loader": "^6.2.0",
+    "html-loader": "^2.1.2",
+    "html-webpack-plugin": "^5.3.2",
+    "image-webpack-loader": "^8.0.1",
     "jsonminify": "^0.4.1",
-    "mini-css-extract-plugin": "^0.9.0",
-    "postcss-loader": "^3.0.0",
+    "mini-css-extract-plugin": "^2.3.0",
+    "postcss-loader": "^6.1.1",
     "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-subresource-integrity": "^1.4.1",
+    "sass-loader": "^12.1.0",
+    "webpack": "^5.56.1",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.3.0",
+    "webpack-subresource-integrity": "^5.0.0",
     "webpackbar": "^4.0.0"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-pro": "^5.13.0",
+    "@fortawesome/fontawesome-free": "^5.15.4",
     "bootstrap": "^4.5.0",
-    "jquery": "^3.5.1",
+    "jquery": "^3.5.0",
     "popper.js": "^1.16.1"
   }
 }
diff --git a/src/data/sample.json b/src/data/sample.json
diff --git a/src/styles/vendor/font-awesome/_main.scss b/src/styles/vendor/font-awesome/_main.scss
@@ -1,22 +1,22 @@
 // Variable overrides
-@import 'variables';
+@import "variables";
 
 // Core
-@import '~@fortawesome/fontawesome-pro/scss/variables';
-@import '~@fortawesome/fontawesome-pro/scss/mixins';
-@import '~@fortawesome/fontawesome-pro/scss/core';
-@import '~@fortawesome/fontawesome-pro/scss/larger';
-@import '~@fortawesome/fontawesome-pro/scss/fixed-width';
-@import '~@fortawesome/fontawesome-pro/scss/list';
-@import '~@fortawesome/fontawesome-pro/scss/bordered-pulled';
-@import '~@fortawesome/fontawesome-pro/scss/animated';
-@import '~@fortawesome/fontawesome-pro/scss/rotated-flipped';
-@import '~@fortawesome/fontawesome-pro/scss/stacked';
-@import '~@fortawesome/fontawesome-pro/scss/icons';
-@import '~@fortawesome/fontawesome-pro/scss/screen-reader';
+@import "~@fortawesome/fontawesome-free/scss/variables";
+@import "~@fortawesome/fontawesome-free/scss/mixins";
+@import "~@fortawesome/fontawesome-free/scss/core";
+@import "~@fortawesome/fontawesome-free/scss/larger";
+@import "~@fortawesome/fontawesome-free/scss/fixed-width";
+@import "~@fortawesome/fontawesome-free/scss/list";
+@import "~@fortawesome/fontawesome-free/scss/bordered-pulled";
+@import "~@fortawesome/fontawesome-free/scss/animated";
+@import "~@fortawesome/fontawesome-free/scss/rotated-flipped";
+@import "~@fortawesome/fontawesome-free/scss/stacked";
+@import "~@fortawesome/fontawesome-free/scss/icons";
+@import "~@fortawesome/fontawesome-free/scss/screen-reader";
 
 // Fonts
-// @import '~@fortawesome/fontawesome-pro/scss/light';
-// @import '~@fortawesome/fontawesome-pro/scss/regular';
-@import '~@fortawesome/fontawesome-pro/scss/solid';
-@import '~@fortawesome/fontawesome-pro/scss/brands';
+// @import '~@fortawesome/fontawesome-free/scss/light';
+// @import '~@fortawesome/fontawesome-free/scss/regular';
+@import "~@fortawesome/fontawesome-free/scss/solid";
+@import "~@fortawesome/fontawesome-free/scss/brands";
diff --git a/src/styles/vendor/font-awesome/_variables.scss b/src/styles/vendor/font-awesome/_variables.scss
@@ -1,3 +1,3 @@
 // This is a place to override all Font-Awesome variables
 
-$fa-font-path: '~@fortawesome/fontawesome-pro/webfonts/';
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";