Make favicon path work in dev

adsabs · Feb 12, 2022 · 6caf1d6 · 6caf1d6
1 parent 2b0d2ba
commit 6caf1d6
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 16 deletions.
diff --git a/grunt/aliases.yaml b/grunt/aliases.yaml
@@ -72,6 +72,7 @@ release:
     - env:prod
     - clean:release
     - copy:release
+    - string-replace:favicon
     - string-replace:production
     - check-release-version
     - string-replace:latest_version
@@ -87,6 +88,7 @@ release:quick:
     - env:prod
     - clean:release
     - copy:release
+    - string-replace:favicon
     - string-replace:production
     - check-release-version
     - string-replace:latest_version

diff --git a/grunt/optimize-build.js b/grunt/optimize-build.js
@@ -334,8 +334,6 @@ requirejs.config(${JSON.stringify(contents)});
       grunt.registerTask('generateConfigs', function() {
         const cfg = getDiscoveryConfig();
 
-        console.log(fullConfig);
-
         // generate the rest of the bundles
         _.forEach(fullConfig, function({ name, include }, moduleName) {
           const _cfg = _.extend({}, cfg, {

diff --git a/grunt/string-replace.js b/grunt/string-replace.js
@@ -6,18 +6,13 @@
  * @module grunt/string-replace
  */
 module.exports = {
-  dist: {
-    files: [
-      {
-        src: 'dist/index.html',
-        dest: 'dist/index.html',
-      },
-    ],
+  favicon: {
+    files: { 'dist/': 'dist/*.html' },
     options: {
       replacements: [
         {
-          pattern: 'data-main="./config/discovery.config"',
-          replacement: 'data-main="./bumblebee_app.js"',
+          pattern: /\.\/styles\/favicon/g,
+          replacement: '',
         },
       ],
     },

diff --git a/src/404.html b/src/404.html
@@ -4,6 +4,17 @@
     <link rel="preload" href="./styles/css/styles.css" as="style" />
     <link rel="stylesheet" href="./styles/css/styles.css" />
     <link rel="preload" href="./libs/require.js" as="script" />
+    <!-- favicon -->
+    <link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png" />
+    <link rel="manifest" href="./styles/favicon/site.webmanifest" />
+    <link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+    <meta name="apple-mobile-web-app-title" content="NASA ADS" />
+    <meta name="application-name" content="NASA ADS" />
+    <meta name="msapplication-TileColor" content="#ffc40d" />
+    <meta name="theme-color" content="#ffffff" />
+    <!-- /favicon -->
     <script src="./libs/require.js"></script>
     <script>
       require.config({

diff --git a/src/500.html b/src/500.html
@@ -4,6 +4,35 @@
     <link rel="preload" href="./styles/css/styles.css" as="style" />
     <link rel="preload" href="./libs/require.js" as="script" />
     <link rel="stylesheet" href="./styles/css/styles.css" />
+    <!-- favicon -->
+    <link
+      rel="apple-touch-icon"
+      sizes="180x180"
+      href="./styles/favicon/apple-touch-icon.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="./styles/favicon/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="./styles/favicon/favicon-16x16.png"
+    />
+    <link rel="manifest" href="./styles/favicon/site.webmanifest" />
+    <link
+      rel="mask-icon"
+      href="./styles/favicon/safari-pinned-tab.svg"
+      color="#5bbad5"
+    />
+    <meta name="apple-mobile-web-app-title" content="NASA ADS" />
+    <meta name="application-name" content="NASA ADS" />
+    <meta name="msapplication-TileColor" content="#ffc40d" />
+    <meta name="theme-color" content="#ffffff" />
+    <!-- /favicon -->
     <script src="./libs/require.js"></script>
     <script>
       !window.requirejs &&

diff --git a/src/index.html b/src/index.html
@@ -15,11 +15,11 @@
       content="A powerful, streamlined new Astrophysics Data System"
     />
     <!-- favicon -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
-    <link rel="manifest" href="/site.webmanifest" />
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
+    <link rel="apple-touch-icon" sizes="180x180" href="./styles/favicon/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="./styles/favicon/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="./styles/favicon/favicon-16x16.png" />
+    <link rel="manifest" href="./styles/favicon/site.webmanifest" />
+    <link rel="mask-icon" href="./styles/favicon/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="apple-mobile-web-app-title" content="NASA ADS" />
     <meta name="application-name" content="NASA ADS" />
     <meta name="msapplication-TileColor" content="#ffc40d" />