add web dist files to make go install work

lqqyt2423 · Jun 28, 2024 · 40c3298 · 40c3298
1 parent 3075a64
commit 40c3298
Show file tree

Hide file tree

Showing 19 changed files with 121 additions and 34 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,14 +14,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - run: yarn install
-        working-directory: web/client
-      - run: yarn build
-        working-directory: web/client
-
       - name: Set up Go
         uses: actions/setup-go@v4
         with:

diff --git a/web/client/build/asset-manifest.json b/web/client/build/asset-manifest.json
@@ -0,0 +1,16 @@
+{
+  "files": {
+    "main.css": "/static/css/main.15b22d69.css",
+    "main.js": "/static/js/main.66901bf9.js",
+    "static/js/496.aae294ae.chunk.js": "/static/js/496.aae294ae.chunk.js",
+    "static/media/github-mark.svg": "/static/media/github-mark.6fa18895f6e6c7772cab7049f7e05f59.svg",
+    "index.html": "/index.html",
+    "main.15b22d69.css.map": "/static/css/main.15b22d69.css.map",
+    "main.66901bf9.js.map": "/static/js/main.66901bf9.js.map",
+    "496.aae294ae.chunk.js.map": "/static/js/496.aae294ae.chunk.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.15b22d69.css",
+    "static/js/main.66901bf9.js"
+  ]
+}
diff --git a/web/client/build/favicon.ico b/web/client/build/favicon.ico
diff --git a/web/client/build/index.html b/web/client/build/index.html
@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>go-mitmproxy</title><script defer="defer" src="/static/js/main.66901bf9.js"></script><link href="/static/css/main.15b22d69.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/web/client/build/logo192.png b/web/client/build/logo192.png
diff --git a/web/client/build/logo512.png b/web/client/build/logo512.png
diff --git a/web/client/build/manifest.json b/web/client/build/manifest.json
@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/web/client/build/readme.txt b/web/client/build/readme.txt
diff --git a/web/client/build/robots.txt b/web/client/build/robots.txt
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
diff --git a/web/client/build/static/css/main.15b22d69.css b/web/client/build/static/css/main.15b22d69.css
diff --git a/web/client/build/static/css/main.15b22d69.css.map b/web/client/build/static/css/main.15b22d69.css.map
diff --git a/web/client/build/static/js/496.aae294ae.chunk.js b/web/client/build/static/js/496.aae294ae.chunk.js
diff --git a/web/client/build/static/js/496.aae294ae.chunk.js.map b/web/client/build/static/js/496.aae294ae.chunk.js.map
diff --git a/web/client/build/static/js/main.66901bf9.js b/web/client/build/static/js/main.66901bf9.js
diff --git a/web/client/build/static/js/main.66901bf9.js.LICENSE.txt b/web/client/build/static/js/main.66901bf9.js.LICENSE.txt
@@ -0,0 +1,45 @@
+/*!
+	Copyright (c) 2018 Jed Watson.
+	Licensed under the MIT License (MIT), see
+	http://jedwatson.github.io/classnames
+*/
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/web/client/build/static/js/main.66901bf9.js.map b/web/client/build/static/js/main.66901bf9.js.map
diff --git a/web/client/build/static/media/github-mark.6fa18895f6e6c7772cab7049f7e05f59.svg b/web/client/build/static/media/github-mark.6fa18895f6e6c7772cab7049f7e05f59.svg
diff --git a/web/client/package.json b/web/client/package.json
@@ -23,7 +23,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "build": "BUILD_PATH=build/dist react-scripts build",
+    "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

diff --git a/web/web.go b/web/web.go
@@ -33,31 +33,23 @@ func NewWebAddon(addr string) *WebAddon {
 		flowMessageState: make(map[*proxy.Flow]messageType),
 	}
 
-	_, err := assets.ReadDir("client/build/dist")
-	if err != nil {
-		web.server = &http.Server{
-			Addr: addr,
-			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				w.WriteHeader(http.StatusNotFound)
-				fmt.Fprintf(w, `Please build frontend: "cd web/client; yarn build"`)
-			}),
-		}
-	} else {
-		web.upgrader = &websocket.Upgrader{
-			CheckOrigin: func(r *http.Request) bool {
-				return true
-			},
-		}
-
-		serverMux := new(http.ServeMux)
-		serverMux.HandleFunc("/echo", web.echo)
+	web.upgrader = &websocket.Upgrader{
+		CheckOrigin: func(r *http.Request) bool {
+			return true
+		},
+	}
 
-		fsys, _ := fs.Sub(assets, "client/build/dist")
-		serverMux.Handle("/", http.FileServer(http.FS(fsys)))
+	serverMux := new(http.ServeMux)
+	serverMux.HandleFunc("/echo", web.echo)
 
-		web.server = &http.Server{Addr: addr, Handler: serverMux}
-		web.conns = make([]*concurrentConn, 0)
+	fsys, err := fs.Sub(assets, "client/build")
+	if err != nil {
+		panic(err)
 	}
+	serverMux.Handle("/", http.FileServer(http.FS(fsys)))
+
+	web.server = &http.Server{Addr: addr, Handler: serverMux}
+	web.conns = make([]*concurrentConn, 0)
 
 	go func() {
 		log.Infof("web interface start listen at %v\n", addr)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>go-mitmproxy</title><script defer="defer" src="/static/js/main.66901bf9.js"></script><link href="/static/css/main.15b22d69.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>