From 40983d1c7e3c81808810e5ede08afc1c3a265a3a Mon Sep 17 00:00:00 2001 From: biodiscus Date: Tue, 16 Jan 2024 14:17:17 +0100 Subject: [PATCH] fix: save the webmanifest files in directory defined in `faviconOptions.path` --- CHANGELOG.md | 4 +++ LICENSE | 2 +- package.json | 2 +- plugins/favicons-bundler-plugin/index.js | 3 +- .../favicons/android-chrome-144x144.png | Bin .../favicons/android-chrome-192x192.png | Bin .../favicons/android-chrome-256x256.png | Bin .../favicons/android-chrome-36x36.png | Bin .../favicons/android-chrome-384x384.png | Bin .../favicons/android-chrome-48x48.png | Bin .../favicons/android-chrome-512x512.png | Bin .../favicons/android-chrome-72x72.png | Bin .../favicons/android-chrome-96x96.png | Bin .../favicons/apple-touch-icon-1024x1024.png | Bin .../favicons/apple-touch-icon-114x114.png | Bin .../favicons/apple-touch-icon-120x120.png | Bin .../favicons/apple-touch-icon-144x144.png | Bin .../favicons/apple-touch-icon-152x152.png | Bin .../favicons/apple-touch-icon-167x167.png | Bin .../favicons/apple-touch-icon-180x180.png | Bin .../favicons/apple-touch-icon-57x57.png | Bin .../favicons/apple-touch-icon-60x60.png | Bin .../favicons/apple-touch-icon-72x72.png | Bin .../favicons/apple-touch-icon-76x76.png | Bin .../favicons/apple-touch-icon-precomposed.png | Bin .../{img => }/favicons/apple-touch-icon.png | Bin .../{img => }/favicons/favicon-16x16.png | Bin .../{img => }/favicons/favicon-32x32.png | Bin .../{img => }/favicons/favicon-48x48.png | Bin .../expected/{img => }/favicons/favicon.ico | Bin .../{ => favicons}/manifest.webmanifest | 18 +++++----- .../expected/index.html | 2 +- .../webpack.config.js | 2 +- .../favicons/android-chrome-144x144.png | Bin .../favicons/android-chrome-192x192.png | Bin .../favicons/android-chrome-256x256.png | Bin .../favicons/android-chrome-36x36.png | Bin .../favicons/android-chrome-384x384.png | Bin .../favicons/android-chrome-48x48.png | Bin .../favicons/android-chrome-512x512.png | Bin .../favicons/android-chrome-72x72.png | Bin .../favicons/android-chrome-96x96.png | Bin .../favicons/apple-touch-icon-1024x1024.png | Bin .../favicons/apple-touch-icon-114x114.png | Bin .../favicons/apple-touch-icon-120x120.png | Bin .../favicons/apple-touch-icon-144x144.png | Bin .../favicons/apple-touch-icon-152x152.png | Bin .../favicons/apple-touch-icon-167x167.png | Bin .../favicons/apple-touch-icon-180x180.png | Bin .../favicons/apple-touch-icon-57x57.png | Bin .../favicons/apple-touch-icon-60x60.png | Bin .../favicons/apple-touch-icon-72x72.png | Bin .../favicons/apple-touch-icon-76x76.png | Bin .../favicons/apple-touch-icon-precomposed.png | Bin .../{img => }/favicons/apple-touch-icon.png | Bin .../{img => }/favicons/favicon-16x16.png | Bin .../{img => }/favicons/favicon-32x32.png | Bin .../{img => }/favicons/favicon-48x48.png | Bin .../expected/{img => }/favicons/favicon.ico | Bin .../{ => favicons}/manifest.webmanifest | 18 +++++----- .../cases/plugin-favicons/expected/index.html | 32 +++++++++--------- test/cases/plugin-favicons/webpack.config.js | 2 +- 62 files changed, 45 insertions(+), 40 deletions(-) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-144x144.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-192x192.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-256x256.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-36x36.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-384x384.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-48x48.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-512x512.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-72x72.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/android-chrome-96x96.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-1024x1024.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-114x114.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-120x120.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-144x144.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-152x152.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-167x167.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-180x180.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-57x57.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-60x60.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-72x72.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-76x76.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon-precomposed.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/apple-touch-icon.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/favicon-16x16.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/favicon-32x32.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/favicon-48x48.png (100%) rename test/cases/plugin-favicons-minify-true/expected/{img => }/favicons/favicon.ico (100%) rename test/cases/plugin-favicons-minify-true/expected/{ => favicons}/manifest.webmanifest (67%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-144x144.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-192x192.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-256x256.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-36x36.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-384x384.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-48x48.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-512x512.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-72x72.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/android-chrome-96x96.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-1024x1024.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-114x114.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-120x120.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-144x144.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-152x152.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-167x167.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-180x180.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-57x57.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-60x60.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-72x72.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-76x76.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon-precomposed.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/apple-touch-icon.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/favicon-16x16.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/favicon-32x32.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/favicon-48x48.png (100%) rename test/cases/plugin-favicons/expected/{img => }/favicons/favicon.ico (100%) rename test/cases/plugin-favicons/expected/{ => favicons}/manifest.webmanifest (67%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6873d534..35f50223 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 3.4.10 (2024-01-16) + +- fix: save the webmanifest files in the directory defined in the `faviconOptions.path` option + ## 3.4.9 (2024-01-15) - fix: use the favicons default options for the build-in FaviconsBundlerPlugin when no plugin options diff --git a/LICENSE b/LICENSE index 36f4b409..757360a9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ ISC License -Copyright (c) 2023, webdiscus +Copyright (c) 2024, webdiscus Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/package.json b/package.json index 63e37dfb..8d92287b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "html-bundler-webpack-plugin", - "version": "3.4.9", + "version": "3.4.10", "description": "HTML bundler plugin for webpack handles a template as an entry point, extracts CSS and JS from their sources referenced in HTML, supports template engines like Eta, EJS, Handlebars, Nunjucks.", "keywords": [ "html", diff --git a/plugins/favicons-bundler-plugin/index.js b/plugins/favicons-bundler-plugin/index.js index b08b1ec6..e24cf9f8 100644 --- a/plugins/favicons-bundler-plugin/index.js +++ b/plugins/favicons-bundler-plugin/index.js @@ -87,7 +87,8 @@ class FaviconsBundlerPlugin { // save favicon manifest files on disk response.files.forEach(({ name, contents }) => { - compilation.emitAsset(name, new RawSource(contents)); + let outputFile = path.posix.join(this.options.faviconsConfig.path, name); + compilation.emitAsset(outputFile, new RawSource(contents)); }); }); } diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-144x144.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-144x144.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-144x144.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-144x144.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-192x192.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-192x192.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-192x192.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-192x192.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-256x256.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-256x256.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-256x256.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-256x256.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-36x36.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-36x36.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-36x36.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-36x36.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-384x384.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-384x384.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-384x384.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-384x384.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-48x48.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-48x48.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-48x48.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-48x48.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-512x512.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-512x512.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-512x512.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-512x512.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-72x72.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-72x72.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-72x72.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-72x72.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-96x96.png b/test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-96x96.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/android-chrome-96x96.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/android-chrome-96x96.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-1024x1024.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-1024x1024.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-1024x1024.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-1024x1024.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-114x114.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-114x114.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-114x114.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-114x114.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-120x120.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-120x120.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-120x120.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-120x120.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-144x144.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-144x144.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-144x144.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-144x144.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-152x152.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-152x152.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-152x152.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-152x152.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-167x167.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-167x167.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-167x167.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-167x167.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-180x180.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-180x180.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-180x180.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-180x180.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-57x57.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-57x57.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-57x57.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-57x57.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-60x60.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-60x60.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-60x60.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-60x60.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-72x72.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-72x72.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-72x72.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-72x72.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-76x76.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-76x76.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-76x76.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-76x76.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-precomposed.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-precomposed.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon-precomposed.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon-precomposed.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon.png b/test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/apple-touch-icon.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/apple-touch-icon.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-16x16.png b/test/cases/plugin-favicons-minify-true/expected/favicons/favicon-16x16.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-16x16.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/favicon-16x16.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-32x32.png b/test/cases/plugin-favicons-minify-true/expected/favicons/favicon-32x32.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-32x32.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/favicon-32x32.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-48x48.png b/test/cases/plugin-favicons-minify-true/expected/favicons/favicon-48x48.png similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon-48x48.png rename to test/cases/plugin-favicons-minify-true/expected/favicons/favicon-48x48.png diff --git a/test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon.ico b/test/cases/plugin-favicons-minify-true/expected/favicons/favicon.ico similarity index 100% rename from test/cases/plugin-favicons-minify-true/expected/img/favicons/favicon.ico rename to test/cases/plugin-favicons-minify-true/expected/favicons/favicon.ico diff --git a/test/cases/plugin-favicons-minify-true/expected/manifest.webmanifest b/test/cases/plugin-favicons-minify-true/expected/favicons/manifest.webmanifest similarity index 67% rename from test/cases/plugin-favicons-minify-true/expected/manifest.webmanifest rename to test/cases/plugin-favicons-minify-true/expected/favicons/manifest.webmanifest index 21cf5906..9097b37f 100644 --- a/test/cases/plugin-favicons-minify-true/expected/manifest.webmanifest +++ b/test/cases/plugin-favicons-minify-true/expected/favicons/manifest.webmanifest @@ -11,55 +11,55 @@ "theme_color": "#fff", "icons": [ { - "src": "/img/favicons/android-chrome-36x36.png", + "src": "/favicons/android-chrome-36x36.png", "sizes": "36x36", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-48x48.png", + "src": "/favicons/android-chrome-48x48.png", "sizes": "48x48", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-72x72.png", + "src": "/favicons/android-chrome-72x72.png", "sizes": "72x72", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-96x96.png", + "src": "/favicons/android-chrome-96x96.png", "sizes": "96x96", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-144x144.png", + "src": "/favicons/android-chrome-144x144.png", "sizes": "144x144", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-192x192.png", + "src": "/favicons/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-256x256.png", + "src": "/favicons/android-chrome-256x256.png", "sizes": "256x256", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-384x384.png", + "src": "/favicons/android-chrome-384x384.png", "sizes": "384x384", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-512x512.png", + "src": "/favicons/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png", "purpose": "any" diff --git a/test/cases/plugin-favicons-minify-true/expected/index.html b/test/cases/plugin-favicons-minify-true/expected/index.html index fbb4a1ae..c870e3fa 100644 --- a/test/cases/plugin-favicons-minify-true/expected/index.html +++ b/test/cases/plugin-favicons-minify-true/expected/index.html @@ -1 +1 @@ -Test

Hello World!

\ No newline at end of file +Test

Hello World!

\ No newline at end of file diff --git a/test/cases/plugin-favicons-minify-true/webpack.config.js b/test/cases/plugin-favicons-minify-true/webpack.config.js index 76af3d98..d651f144 100644 --- a/test/cases/plugin-favicons-minify-true/webpack.config.js +++ b/test/cases/plugin-favicons-minify-true/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { enabled: 'auto', // true, false, auto - generate favicons in production mode only // favicons configuration options, see https://github.com/itgalaxy/favicons#usage faviconOptions: { - path: '/img/favicons', + path: '/favicons', appName: 'My App', icons: { android: true, // Create Android homescreen icon. diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-144x144.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-144x144.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-144x144.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-144x144.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-192x192.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-192x192.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-192x192.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-192x192.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-256x256.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-256x256.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-256x256.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-256x256.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-36x36.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-36x36.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-36x36.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-36x36.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-384x384.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-384x384.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-384x384.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-384x384.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-48x48.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-48x48.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-48x48.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-48x48.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-512x512.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-512x512.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-512x512.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-512x512.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-72x72.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-72x72.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-72x72.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-72x72.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/android-chrome-96x96.png b/test/cases/plugin-favicons/expected/favicons/android-chrome-96x96.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/android-chrome-96x96.png rename to test/cases/plugin-favicons/expected/favicons/android-chrome-96x96.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-1024x1024.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-1024x1024.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-1024x1024.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-1024x1024.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-114x114.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-114x114.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-114x114.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-114x114.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-120x120.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-120x120.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-120x120.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-120x120.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-144x144.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-144x144.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-144x144.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-144x144.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-152x152.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-152x152.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-152x152.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-152x152.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-167x167.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-167x167.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-167x167.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-167x167.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-180x180.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-180x180.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-180x180.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-180x180.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-57x57.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-57x57.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-57x57.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-57x57.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-60x60.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-60x60.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-60x60.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-60x60.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-72x72.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-72x72.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-72x72.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-72x72.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-76x76.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-76x76.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-76x76.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-76x76.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-precomposed.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon-precomposed.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon-precomposed.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon-precomposed.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon.png b/test/cases/plugin-favicons/expected/favicons/apple-touch-icon.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/apple-touch-icon.png rename to test/cases/plugin-favicons/expected/favicons/apple-touch-icon.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/favicon-16x16.png b/test/cases/plugin-favicons/expected/favicons/favicon-16x16.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/favicon-16x16.png rename to test/cases/plugin-favicons/expected/favicons/favicon-16x16.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/favicon-32x32.png b/test/cases/plugin-favicons/expected/favicons/favicon-32x32.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/favicon-32x32.png rename to test/cases/plugin-favicons/expected/favicons/favicon-32x32.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/favicon-48x48.png b/test/cases/plugin-favicons/expected/favicons/favicon-48x48.png similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/favicon-48x48.png rename to test/cases/plugin-favicons/expected/favicons/favicon-48x48.png diff --git a/test/cases/plugin-favicons/expected/img/favicons/favicon.ico b/test/cases/plugin-favicons/expected/favicons/favicon.ico similarity index 100% rename from test/cases/plugin-favicons/expected/img/favicons/favicon.ico rename to test/cases/plugin-favicons/expected/favicons/favicon.ico diff --git a/test/cases/plugin-favicons/expected/manifest.webmanifest b/test/cases/plugin-favicons/expected/favicons/manifest.webmanifest similarity index 67% rename from test/cases/plugin-favicons/expected/manifest.webmanifest rename to test/cases/plugin-favicons/expected/favicons/manifest.webmanifest index 21cf5906..9097b37f 100644 --- a/test/cases/plugin-favicons/expected/manifest.webmanifest +++ b/test/cases/plugin-favicons/expected/favicons/manifest.webmanifest @@ -11,55 +11,55 @@ "theme_color": "#fff", "icons": [ { - "src": "/img/favicons/android-chrome-36x36.png", + "src": "/favicons/android-chrome-36x36.png", "sizes": "36x36", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-48x48.png", + "src": "/favicons/android-chrome-48x48.png", "sizes": "48x48", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-72x72.png", + "src": "/favicons/android-chrome-72x72.png", "sizes": "72x72", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-96x96.png", + "src": "/favicons/android-chrome-96x96.png", "sizes": "96x96", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-144x144.png", + "src": "/favicons/android-chrome-144x144.png", "sizes": "144x144", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-192x192.png", + "src": "/favicons/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-256x256.png", + "src": "/favicons/android-chrome-256x256.png", "sizes": "256x256", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-384x384.png", + "src": "/favicons/android-chrome-384x384.png", "sizes": "384x384", "type": "image/png", "purpose": "any" }, { - "src": "/img/favicons/android-chrome-512x512.png", + "src": "/favicons/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png", "purpose": "any" diff --git a/test/cases/plugin-favicons/expected/index.html b/test/cases/plugin-favicons/expected/index.html index be8ae8f5..284930b6 100644 --- a/test/cases/plugin-favicons/expected/index.html +++ b/test/cases/plugin-favicons/expected/index.html @@ -2,22 +2,22 @@ Test - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/test/cases/plugin-favicons/webpack.config.js b/test/cases/plugin-favicons/webpack.config.js index 7401de82..7167700a 100644 --- a/test/cases/plugin-favicons/webpack.config.js +++ b/test/cases/plugin-favicons/webpack.config.js @@ -28,7 +28,7 @@ module.exports = { enabled: 'auto', // true, false, auto - generate favicons in production mode only // favicons configuration options, see https://github.com/itgalaxy/favicons#usage faviconOptions: { - path: '/img/favicons', + path: '/favicons', appName: 'My App', icons: { android: true, // Create Android homescreen icon.