Web: fix double slash for favicon

This commit is contained in:
Timofey Boyko 2023-01-24 17:37:18 +03:00
parent 06bdcd6cd2
commit 9e5f76d7c0
8 changed files with 21 additions and 9 deletions

View File

@ -18,7 +18,7 @@
href="<%=htmlWebpackPlugin.files.favicon%>"
/>
<link rel="manifest" href="../../../public/manifest.json" />
<link rel="manifest" href="/manifest.json" />
<!-- Tell the browser it's a PWA -->
<!-- <meta name="mobile-web-app-capable" content="yes" /> -->
<!-- Tell iOS it's a PWA -->

View File

@ -96,7 +96,9 @@ const config = {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
},
},

View File

@ -5,7 +5,7 @@ import DocseditorSvgUrl from "../../../public/images/logo/docseditor.svg?url";
import LightSmallSvgUrl from "../../../public/images/logo/lightsmall.svg?url";
import DocsEditoRembedSvgUrl from "../../../public/images/logo/docseditorembed.svg?url";
import DarkLightSmallSvgUrl from "../../../public/images/logo/dark_lightsmall.svg?url";
import FaviconIcoUrl from "../../../public/favicon.ico?url";
import FaviconIco from "../../../public/favicon.ico";
import BackgroundPatternReactSvgUrl from "../../../public/images/background.pattern.react.svg?url";
import BackgroundPatternOrangeReactSvgUrl from "../../../public/images/background.pattern.orange.react.svg?url";
@ -519,7 +519,7 @@ export const getLogoFromPath = (path) => {
case "docseditorembed.svg":
return DocsEditoRembedSvgUrl;
case "favicon.ico":
return FaviconIcoUrl;
return FaviconIco;
default:
break;
}

View File

@ -21,7 +21,9 @@ module.exports = ({ config }) => {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`; ;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`; ;
};
// rules.push({

View File

@ -42,7 +42,9 @@ const clientConfig = {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
},
},

View File

@ -29,7 +29,9 @@ const serverConfig = {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
},
},

View File

@ -42,7 +42,9 @@ const clientConfig = {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; // `${folder}/[name].[contenthash][ext]`;
},
},

View File

@ -29,7 +29,9 @@ const serverConfig = {
let folder = result.join("/");
return `${folder}/[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
folder += result.length === 0 ? "" : "/";
return `${folder}[name][ext]?hash=[contenthash]`; //`${folder}/[name].[contenthash][ext]`;
},
},