core/web: go:generate operator-ui assets (#11239)

smartcontractkit · Nov 22, 2023 · 543d946 · 543d946
1 parent 60cb43a
commit 543d946
Show file tree

Hide file tree

Showing 12 changed files with 192 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -55,9 +55,6 @@ golangci-lint-output.txt
 # can be left behind by tests
 core/cmd/vrfkey1
 
-# left behind by webpack - compiled frontend assets
-core/web/assets
-
 # Integration Tests
 integration-tests/**/logs/
 tests-*.xml

diff --git a/.goreleaser.develop.yaml b/.goreleaser.develop.yaml
@@ -10,8 +10,6 @@ env:
 
 before:
   hooks:
-    - go mod tidy
-    - make operator-ui
     - ./tools/bin/goreleaser_utils before_hook
 
 # See https://goreleaser.com/customization/build/

diff --git a/GNUmakefile b/GNUmakefile
@@ -79,7 +79,7 @@ docker-plugins:
 
 .PHONY: operator-ui
 operator-ui: ## Fetch the frontend
-	./operator_ui/install.sh
+	go generate ./core/web
 
 .PHONY: abigen
 abigen: ## Build & install abigen.

diff --git a/core/web/assets/9f6d832ef97e8493764e.svg b/core/web/assets/9f6d832ef97e8493764e.svg
diff --git a/core/web/assets/9f6d832ef97e8493764e.svg.gz b/core/web/assets/9f6d832ef97e8493764e.svg.gz
diff --git a/core/web/assets/ba8bbf16ebf8e1d05bef.svg b/core/web/assets/ba8bbf16ebf8e1d05bef.svg
diff --git a/core/web/assets/ba8bbf16ebf8e1d05bef.svg.gz b/core/web/assets/ba8bbf16ebf8e1d05bef.svg.gz
diff --git a/core/web/assets/index.html b/core/web/assets/index.html
@@ -0,0 +1 @@
+<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Operator UI</title><link rel="shortcut icon" href="https://smartcontract.imgix.net/chainlink.ico?auto=compress%2Cformat"/><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"/><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/><link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/><title>Chainlink</title><script defer="defer" src="/assets/main.b0b6f79f7f4a94560e37.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/core/web/assets/index.html.gz b/core/web/assets/index.html.gz
diff --git a/core/web/assets/main.b0b6f79f7f4a94560e37.js b/core/web/assets/main.b0b6f79f7f4a94560e37.js
diff --git a/core/web/assets/main.b0b6f79f7f4a94560e37.js.gz b/core/web/assets/main.b0b6f79f7f4a94560e37.js.gz
diff --git a/core/web/middleware.go b/core/web/middleware.go
@@ -21,6 +21,7 @@ import (
 // inside this module. To achieve this, we direct webpack to output all of the compiled assets
 // in this module's folder under the "assets" directory.
 
+//go:generate ../../operator_ui/install.sh
 //go:embed "assets"
 var uiEmbedFs embed.FS
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!doctype html><html><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>Operator UI</title><link rel="shortcut icon" href="https://smartcontract.imgix.net/chainlink.ico?auto=compress%2Cformat"/><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet"/><link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/><link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/><title>Chainlink</title><script defer="defer" src="/assets/main.b0b6f79f7f4a94560e37.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>