Merge branch 'master' into feat/custom-favicon

2020-05-02 22:45:08 +02:00 · 2020-05-02 07:57:24 +02:00 · 2020-05-01 17:23:41 +02:00 · 2020-04-28 23:41:17 +08:00
2 changed files with 1 additions and 2 deletions
--- a/src/template/index.html
+++ b/src/template/index.html
@ -6,7 +6,7 @@
    <title>
        <%= htmlWebpackPlugin.options.title %>
    </title>
-    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.verdaccioURL %>/-/static/favicon.ico" />
+    <link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.verdaccioURL %>/-/mapped/favicon" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <script>
        window.__VERDACCIO_BASENAME_UI_OPTIONS = JSON.parse('<%= htmlWebpackPlugin.options.__UI_OPTIONS %>');
--- a/tools/webpack.prod.config.babel.js
+++ b/tools/webpack.prod.config.babel.js
@ -49,7 +49,6 @@ const prodConf = {
      logo: 'ToReplaceByLogo',
      primary_color: 'ToReplaceByPrimaryColor',
      filename: 'index.html',
-      favicon: `${env.SRC_ROOT}/template/favicon.ico`,
      verdaccioURL: 'ToReplaceByVerdaccio',
      version_app: 'ToReplaceByVersion',
      template: `${env.SRC_ROOT}/template/index.html`,
Author	SHA1	Message	Date
Juan Picado	f1dd3bb378	Merge branch 'master' into feat/custom-favicon	2020-05-02 22:45:08 +02:00
Juan Picado	462c287e2e	Merge branch 'master' into feat/custom-favicon	2020-05-02 07:57:24 +02:00
Priscila Oliveira	985cdb3df0	Merge branch 'master' into feat/custom-favicon	2020-05-01 17:23:41 +02:00
Meeeeow	9e91d64513	feat: custom favicon	2020-04-28 23:41:17 +08:00