Skip to content

Commit c40dd85

Browse files
Vladi4-ghjantimon
Vladi4-gh
authored and
jantimon
committed
fix: use modern icon tag rel attribute for favicons
1 parent 4785281 commit c40dd85

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

‎examples/favicon/dist/webpack-4/favicon.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>

‎examples/favicon/dist/webpack-5/favicon.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><script src="bundle.js"></script></body></html>

‎examples/html-loader/dist/webpack-4/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

‎examples/html-loader/dist/webpack-4/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

‎examples/html-loader/dist/webpack-5/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

‎examples/html-loader/dist/webpack-5/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
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="icon" href="favicon.ico"><link href="styles.css" rel="stylesheet"></head><body><img src="0714810ae3fb211173e2964249507195.png"><script src="bundle.js"></script></body></html>

‎examples/pug-loader/dist/webpack-4/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
1+
<!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>

‎examples/pug-loader/dist/webpack-5/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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>
1+
<!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>

‎index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ class HtmlWebpackPlugin {
785785
tagName: 'link',
786786
voidTag: true,
787787
attributes: {
788-
rel: 'shortcut icon',
788+
rel: 'icon',
789789
href: faviconPath
790790
}
791791
}];

‎spec/basic.spec.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ describe('HtmlWebpackPlugin', () => {
16251625
favicon: path.join(__dirname, 'fixtures/favicon.ico')
16261626
})
16271627
]
1628-
}, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
1628+
}, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
16291629
});
16301630

16311631
it('adds a base tag with attributes', done => {
@@ -1716,7 +1716,7 @@ describe('HtmlWebpackPlugin', () => {
17161716
favicon: path.join(__dirname, 'fixtures/favicon.ico')
17171717
})
17181718
]
1719-
}, [/<link rel="shortcut icon" href="\/some\/+[^"]+\.ico">/], null, done);
1719+
}, [/<link rel="icon" href="\/some\/+[^"]+\.ico">/], null, done);
17201720
});
17211721

17221722
it('adds a favicon with publicPath set to /some', done => {
@@ -1733,7 +1733,7 @@ describe('HtmlWebpackPlugin', () => {
17331733
favicon: path.join(__dirname, 'fixtures/favicon.ico')
17341734
})
17351735
]
1736-
}, [/<link rel="shortcut icon" href="\/some\/+[^"]+\.ico">/], null, done);
1736+
}, [/<link rel="icon" href="\/some\/+[^"]+\.ico">/], null, done);
17371737
});
17381738

17391739
it('adds a favicon with publicPath set to some/', done => {
@@ -1750,7 +1750,7 @@ describe('HtmlWebpackPlugin', () => {
17501750
favicon: path.join(__dirname, 'fixtures/favicon.ico')
17511751
})
17521752
]
1753-
}, [/<link rel="shortcut icon" href="some\/+[^"]+\.ico">/], null, done);
1753+
}, [/<link rel="icon" href="some\/+[^"]+\.ico">/], null, done);
17541754
});
17551755

17561756
it('adds a favicon with publicPath undefined', done => {
@@ -1766,7 +1766,7 @@ describe('HtmlWebpackPlugin', () => {
17661766
favicon: path.join(__dirname, 'fixtures/favicon.ico')
17671767
})
17681768
]
1769-
}, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
1769+
}, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
17701770
});
17711771

17721772
it('adds a favicon with publicPath undefined', done => {
@@ -1783,7 +1783,7 @@ describe('HtmlWebpackPlugin', () => {
17831783
filename: path.resolve(OUTPUT_DIR, 'subfolder', 'test.html')
17841784
})
17851785
]
1786-
}, [/<link rel="shortcut icon" href="\.\.\/[^"]+\.ico">/], path.join('subfolder', 'test.html'), done);
1786+
}, [/<link rel="icon" href="\.\.\/[^"]+\.ico">/], path.join('subfolder', 'test.html'), done);
17871787
});
17881788

17891789
it('adds a favicon with a publichPath set to /[hash]/ and replaces the hash', done => {
@@ -1800,7 +1800,7 @@ describe('HtmlWebpackPlugin', () => {
18001800
favicon: path.join(__dirname, 'fixtures/favicon.ico')
18011801
})
18021802
]
1803-
}, [/<link rel="shortcut icon" href="\/[a-z0-9]{20}\/favicon\.ico">/], null, done);
1803+
}, [/<link rel="icon" href="\/[a-z0-9]{20}\/favicon\.ico">/], null, done);
18041804
});
18051805

18061806
it('adds a favicon with a publichPath set to [hash]/ and replaces the hash', done => {
@@ -1817,7 +1817,7 @@ describe('HtmlWebpackPlugin', () => {
18171817
favicon: path.join(__dirname, 'fixtures/favicon.ico')
18181818
})
18191819
]
1820-
}, [/<link rel="shortcut icon" href="[a-z0-9]{20}\/favicon\.ico">/], null, done);
1820+
}, [/<link rel="icon" href="[a-z0-9]{20}\/favicon\.ico">/], null, done);
18211821
});
18221822

18231823
it('adds a favicon with inject enabled', done => {
@@ -1834,7 +1834,7 @@ describe('HtmlWebpackPlugin', () => {
18341834
favicon: path.join(__dirname, 'fixtures/favicon.ico')
18351835
})
18361836
]
1837-
}, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
1837+
}, [/<link rel="icon" href="[^"]+\.ico">/], null, done);
18381838
});
18391839

18401840
it('adds a favicon with xhtml enabled', done => {
@@ -1855,7 +1855,7 @@ describe('HtmlWebpackPlugin', () => {
18551855
favicon: path.join(__dirname, 'fixtures/favicon.ico')
18561856
})
18571857
]
1858-
}, [/<link rel="shortcut icon" href="[^"]+\.ico"\/>/], null, done);
1858+
}, [/<link rel="icon" href="[^"]+\.ico"\/>/], null, done);
18591859
});
18601860

18611861
it('shows an error if the favicon could not be load', done => {

0 commit comments

Comments
 (0)