Merge branch 'release/2.4.24' into craft-webpack

nystudio107 · Feb 3, 2021 · 415f0c8 · 415f0c8
2 parents e1b75f7 + 71797ec
commit 415f0c8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.4.24 - 2021.02.03
+### Fixed
+* Fixed an issue with favicon generation caused by changes in `favicons-webpack-plugin`
+
 ## 2.4.23 - 2021.02.02
 ### Changed
 * Use `get-webpack-config` package

diff --git a/buildchain/package.json b/buildchain/package.json
@@ -76,11 +76,11 @@
     "eslint": "^7.4.0",
     "eslint-plugin-vue": "^7.2.0",
     "favicons": "^6.2.0",
-    "favicons-webpack-plugin": "^5.0.0-alpha.6",
+    "favicons-webpack-plugin": "^5.0.0",
     "file-loader": "^6.0.0",
     "get-webpack-config": "^1.0.0",
     "glob-all": "^3.1.0",
-    "html-webpack-plugin": "^5.0.0-beta.5",
+    "html-webpack-plugin": "^5.0.0",
     "ignore-loader": "^0.1.2",
     "imagemin": "^7.0.0",
     "imagemin-mozjpeg": "^9.0.0",

diff --git a/buildchain/webpack-configs/favicons.config.js b/buildchain/webpack-configs/favicons.config.js
@@ -31,7 +31,7 @@ module.exports = (type = 'modern', settings) => {
                     appDescription: pkg.description,
                     developerName: pkg.author.name,
                     developerURL: pkg.author.url,
-                    path: settings.paths.dist,
+                    path: settings.favicons.publicPath,
                 }
             }),
         ],

diff --git a/buildchain/webpack-settings/favicons.settings.js b/buildchain/webpack-settings/favicons.settings.js
@@ -8,5 +8,6 @@ module.exports = {
     favicons: {
         logo: '../src/img/favicon-src.png',
         prefix: 'img/favicons/',
+        publicPath: '/dist/img/favicons',
     },
 };
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.4.23",
+  "version": "2.4.24",
   "keywords": [
     "craft",
     "cms",