fix: use modern icon tag rel attribute for favicons

jantimon · Apr 29, 2020 · c40dd85 · c40dd85
1 parent 4785281
commit c40dd85
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/examples/favicon/dist/webpack-4/favicon.html b/examples/favicon/dist/webpack-4/favicon.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"><title>HtmlWebpackPlugin example</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>
+<!doctype html><html><head><meta charset="utf-8"><title>HtmlWebpackPlugin example</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>
diff --git a/examples/favicon/dist/webpack-5/favicon.html b/examples/favicon/dist/webpack-5/favicon.html
@@ -1 +1 @@
-<!doctype html><html><head><meta charset="utf-8"><title>HtmlWebpackPlugin example</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>
+<!doctype html><html><head><meta charset="utf-8"><title>HtmlWebpackPlugin example</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>
diff --git a/examples/html-loader/dist/webpack-4/about.html b/examples/html-loader/dist/webpack-4/about.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
diff --git a/examples/html-loader/dist/webpack-4/index.html b/examples/html-loader/dist/webpack-4/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
diff --git a/examples/html-loader/dist/webpack-5/about.html b/examples/html-loader/dist/webpack-5/about.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
diff --git a/examples/html-loader/dist/webpack-5/index.html b/examples/html-loader/dist/webpack-5/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><title>Example template</title><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>
diff --git a/examples/pug-loader/dist/webpack-4/index.html b/examples/pug-loader/dist/webpack-4/index.html
@@ -1 +1 @@
-<!doctype html><html><head><title>pug demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div><script src="bundle.js"></script></body></html>
+<!doctype html><html><head><title>pug demo</title><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div><script src="bundle.js"></script></body></html>
diff --git a/examples/pug-loader/dist/webpack-5/index.html b/examples/pug-loader/dist/webpack-5/index.html
@@ -1 +1 @@
-<!doctype html><html><head><title>pug demo</title><link rel="shortcut icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div><script src="bundle.js"></script></body></html>
+<!doctype html><html><head><title>pug demo</title><link rel="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><div id="main"><div class="time"><b>Current time</b><p>1998-12-31T23:00:00.000Z</p></div><img src="#{require('./logo.png')}"></div><script src="bundle.js"></script></body></html>
diff --git a/index.js b/index.js
@@ -785,7 +785,7 @@ class HtmlWebpackPlugin {
  tagName: 'link',
  voidTag: true,
  attributes: {
- rel: 'shortcut icon',
+ rel: 'icon',
  href: faviconPath
  }
  }];

diff --git a/spec/basic.spec.js b/spec/basic.spec.js
@@ -1625,7 +1625,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
  });
 
  it('adds a base tag with attributes', done => {
@@ -1716,7 +1716,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="\/some\/+[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="\/some\/+[^"]+\.ico">/], null, done);
  });
 
  it('adds a favicon with publicPath set to /some', done => {
@@ -1733,7 +1733,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="\/some\/+[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="\/some\/+[^"]+\.ico">/], null, done);
  });
 
  it('adds a favicon with publicPath set to some/', done => {
@@ -1750,7 +1750,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="some\/+[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="some\/+[^"]+\.ico">/], null, done);
  });
 
  it('adds a favicon with publicPath undefined', done => {
@@ -1766,7 +1766,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
  });
 
  it('adds a favicon with publicPath undefined', done => {
@@ -1783,7 +1783,7 @@ describe('HtmlWebpackPlugin', () => {
  filename: path.resolve(OUTPUT_DIR, 'subfolder', 'test.html')
  })
  ]
- }, [/<link rel="shortcut icon" href="\.\.\/[^"]+\.ico">/], path.join('subfolder', 'test.html'), done);
+ }, [/<link rel="icon" href="\.\.\/[^"]+\.ico">/], path.join('subfolder', 'test.html'), done);
  });
 
  it('adds a favicon with a publichPath set to /[hash]/ and replaces the hash', done => {
@@ -1800,7 +1800,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="\/[a-z0-9]{20}\/favicon\.ico">/], null, done);
+ }, [/<link rel="icon" href="\/[a-z0-9]{20}\/favicon\.ico">/], null, done);
  });
 
  it('adds a favicon with a publichPath set to [hash]/ and replaces the hash', done => {
@@ -1817,7 +1817,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="[a-z0-9]{20}\/favicon\.ico">/], null, done);
+ }, [/<link rel="icon" href="[a-z0-9]{20}\/favicon\.ico">/], null, done);
  });
 
  it('adds a favicon with inject enabled', done => {
@@ -1834,7 +1834,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
+ }, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
  });
 
  it('adds a favicon with xhtml enabled', done => {
@@ -1855,7 +1855,7 @@ describe('HtmlWebpackPlugin', () => {
  favicon: path.join(__dirname, 'fixtures/favicon.ico')
  })
  ]
- }, [/<link rel="shortcut icon" href="[^"]+\.ico"\/>/], null, done);
+ }, [/<link rel="icon" href="[^"]+\.ico"\/>/], null, done);
  });
 
  it('shows an error if the favicon could not be load', done => {