Merge pull request #872 from appirio-tech/feature/favicon_fix

vikasrohit · web-flow · commit 56c98de780a7 · 2017-03-30T11:09:01.000+05:30
Github issue#9, Add favicon.ico
diff --git a/docs/dependency-notes.txt b/docs/dependency-notes.txt
@@ -0,0 +1,4 @@
+
+This document outlines the dependency concerns faced during the development of the application.
+
+1. We have overridden the version to 1.1.2 of to-ico library which is used indirectly by "favicon-webpack-plugin" which in turn is used for generating the favicons for different devices and browser combinations. This was required because with versions above 1.1.2 to-ico library is using some features from node v5.10+.
diff --git a/package.json b/package.json
@@ -18,6 +18,8 @@
     "deep-freeze-node": "^1.1.2",
     "eslint": "^2.2.0",
     "eslint-plugin-react": "^4.1.0",
+    "favicons-webpack-plugin": "0.0.7",
+    "to-ico":"1.1.2",
     "ignore-styles": "^1.2.0",
     "mocha": "^2.4.5",
     "mocha-jsdom": "^1.1.0",
diff --git a/src/favicon.png b/src/favicon.png
diff --git a/src/index.html b/src/index.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link ref="icon" href="/favicon/favicon.ico" />
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,4 +1,5 @@
 require('./node_modules/coffee-script/register')
+const FaviconsWebpackPlugin = require('favicons-webpack-plugin')
 
 const branch = process.env.TRAVIS_BRANCH
 
@@ -43,4 +44,6 @@ config.module.loaders.forEach((loader, i, loaders) => {
   }
 })
 
+config.plugins.push(new FaviconsWebpackPlugin('./src/favicon.png'))
+
 module.exports = config

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +This document outlines the dependency concerns faced during the development of the application.
++
 +1. We have overridden the version to 1.1.2 of to-ico library which is used indirectly by "favicon-webpack-plugin" which in turn is used for generating the favicons for different devices and browser combinations. This was required because with versions above 1.1.2 to-ico library is using some features from node v5.10+.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`require('./node_modules/coffee-script/register')`
	`2`	`+const FaviconsWebpackPlugin = require('favicons-webpack-plugin')`
`2`	`3`
`3`	`4`	`const branch = process.env.TRAVIS_BRANCH`
`4`	`5`
`@@ -43,4 +44,6 @@ config.module.loaders.forEach((loader, i, loaders) => {`
`43`	`44`	`}`
`44`	`45`	`})`
`45`	`46`
	`47`	`+config.plugins.push(new FaviconsWebpackPlugin('./src/favicon.png'))`
	`48`	`+`
`46`	`49`	`module.exports = config`