[gold] Move favicon.ico out of //golden/frontend/res/img.
This will allow us to remove the //golden/frontend directory, which contains the legacy Polymer code.
The favicon now lives in //golden/static, and is copied into //golden/dist as part of the Webpack build.
Bug: skia:9525
Change-Id: I5e932706c92f5557dd7d3e4ab0a0473433134ed5
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/326980
Commit-Queue: Leandro Lovisolo <lovisolo@google.com>
Reviewed-by: Kevin Lubick <kjlubick@google.com>
diff --git a/golden/pages/by_test_list.html b/golden/pages/by_test_list.html
index 34c2c75..ebce86b 100644
--- a/golden/pages/by_test_list.html
+++ b/golden/pages/by_test_list.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Images By Test</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/byblame.html b/golden/pages/byblame.html
index b6ac7a7..ed4ab5b 100644
--- a/golden/pages/byblame.html
+++ b/golden/pages/byblame.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Untriaged Digests</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/changelists.html b/golden/pages/changelists.html
index bb154b0..10de173 100644
--- a/golden/pages/changelists.html
+++ b/golden/pages/changelists.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} ChangeLists</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/cluster.html b/golden/pages/cluster.html
index e23b8bd..1c91a78 100644
--- a/golden/pages/cluster.html
+++ b/golden/pages/cluster.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Cluster Page</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/details.html b/golden/pages/details.html
index 1f58d23..f655ec6 100644
--- a/golden/pages/details.html
+++ b/golden/pages/details.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Details Page</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/diff.html b/golden/pages/diff.html
index d01c02a..4a1ac8e 100644
--- a/golden/pages/diff.html
+++ b/golden/pages/diff.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Diff Page</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/help.html b/golden/pages/help.html
index 8d7369a..512ef13 100644
--- a/golden/pages/help.html
+++ b/golden/pages/help.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>Gold Help</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
</head>
<body>
<gold-scaffold-sk>
diff --git a/golden/pages/ignorelist.html b/golden/pages/ignorelist.html
index 8082cd0..44c6296 100644
--- a/golden/pages/ignorelist.html
+++ b/golden/pages/ignorelist.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Ignore Rules</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/search.html b/golden/pages/search.html
index 51b6e34..8e88db7 100644
--- a/golden/pages/search.html
+++ b/golden/pages/search.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Digest Search</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/pages/triagelog.html b/golden/pages/triagelog.html
index 4cfaf10..e958e1f 100644
--- a/golden/pages/triagelog.html
+++ b/golden/pages/triagelog.html
@@ -2,7 +2,7 @@
<html>
<head>
<title>{{.Title}} Triage Log</title>
- <link rel="shortcut icon" href="/res/img/favicon.ico">
+ <link rel="shortcut icon" href="/dist/favicon.ico">
<script>
window.GoldSettings = {
title: "{{.Title}}",
diff --git a/golden/static/favicon.ico b/golden/static/favicon.ico
new file mode 100644
index 0000000..3a5ca18
--- /dev/null
+++ b/golden/static/favicon.ico
Binary files differ
diff --git a/golden/webpack.config.ts b/golden/webpack.config.ts
index d645c79..3c7ecd1 100644
--- a/golden/webpack.config.ts
+++ b/golden/webpack.config.ts
@@ -10,15 +10,14 @@
// https://github.com/webpack/node-libs-browser/issues/26#issuecomment-267954095
config.resolve.modules = [resolve(__dirname, 'node_modules'), 'node_modules'];
+ // Copy static assets into the //golden/dist directory.
+ const copyPatterns: any[] = [{
+ from: resolve(__dirname, 'static/favicon.ico'), to: 'favicon.ico',
+ }];
if (args.mode !== 'production') {
- config.plugins!.push(
- new CopyWebpackPlugin([
- {
- from: resolve(__dirname, 'demo-page-assets'),
- },
- ]),
- );
+ copyPatterns.push({from: resolve(__dirname, 'demo-page-assets')});
}
+ config.plugins!.push(new CopyWebpackPlugin(copyPatterns));
return config;
};
