Merge pull request #15899 from tamird/favicons

ui: include favicons
cockroachdb · May 12, 2017 · 9785785 · 9785785
2 parents e074233 + 29d780c
commit 9785785
Show file tree

Hide file tree

Showing 3 changed files with 409 additions and 15 deletions.
diff --git a/pkg/ui/Makefile b/pkg/ui/Makefile
@@ -48,7 +48,7 @@ test-debug: $(YARN_INSTALLED_TARGET) | protos
 $(GOBINDATA_TARGET): $(YARN_INSTALLED_TARGET) $(shell git ls-files | grep -vF $(GOBINDATA_TARGET)) | protos
 	rm -rf dist
 	webpack -p
-	go-bindata -nometadata -pkg ui -o $@ -prefix dist dist
+	go-bindata -nometadata -pkg ui -o $@ -prefix dist dist/...
 	# Add comment recognized by reviewable.
 	echo '// GENERATED FILE DO NOT EDIT' >> $@
 	gofmt -s -w $@

diff --git a/pkg/ui/embedded.go b/pkg/ui/embedded.go
diff --git a/pkg/ui/webpack.config.js b/pkg/ui/webpack.config.js
@@ -60,8 +60,9 @@ module.exports = {
   plugins: [
     new FaviconsWebpackPlugin({
       logo: './logo.png',
-      title: title,
+      persistentCache: false,
       inject: true,
+      title: title,
       icons: {
         // Must explicitly override defaults. Sigh.
         android: false,