[PR #2129] [CLOSED] Merge the web code for frps and frpc #4512

New issue

Closed

opened 2026-05-05 14:43:29 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:43:29 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/2129
Author: @hal-wang
Created: 12/4/2020
Status: ❌ Closed

Base: dev ← Head: dev

📝 Commits (10+)

c8fc59b dashboard upgrade vue4
61c3ea6 dashboard add eslint
0270903 refactor requests
14dda93 edit makefile
2f9f9bd edit README
a9d5918 Merge remote-tracking branch 'upstream/dev' into dev
3a1ee26 remove lock
54673e9 use vue-element-admin
519b62d edit fetch
5c48241 fix warning

📊 Changes

93 files changed (+2155 additions, -25903 deletions)

View changed files

📝 Makefile (+2 -2)
📝 web/.editorconfig (+0 -0)
➕ web/.env.dev-frpc (+2 -0)
➕ web/.env.dev-frps (+2 -0)
➕ web/.env.frpc (+2 -0)
➕ web/.env.frps (+2 -0)
📝 web/.eslintrc.js (+13 -1)
📝 web/.gitignore (+2 -1)
📝 web/.prettierrc (+0 -0)
📝 web/Makefile (+3 -2)
📝 web/README.md (+16 -5)
➕ web/babel.config.js (+20 -0)
➖ web/frpc/.babelrc (+0 -14)
➖ web/frpc/.gitignore (+0 -6)
➖ web/frpc/Makefile (+0 -6)
➖ web/frpc/package-lock.json (+0 -9334)
➖ web/frpc/package.json (+0 -46)
➖ web/frpc/postcss.config.js (+0 -5)
➖ web/frpc/src/App.vue (+0 -73)
➖ web/frpc/src/components/Configure.vue (+0 -93)

...and 73 more files

📄 Description

Merge the web code for frps and frpc
use the vue-element-admin

Compiles and hot-reloads for development

# frps
npm run serve:s

# frpc
npm run serve:c

Compiles and minifies for production

# frps
npm run build:s

# frpc
npm run build:c

The compiled files are in ./web/dist/frps and ./web/dist/frpc

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/2129 **Author:** [@hal-wang](https://github.com/hal-wang) **Created:** 12/4/2020 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`c8fc59b`](https://github.com/fatedier/frp/commit/c8fc59b999d4dc9c020f9c846ae6ea63ca2583f3) dashboard upgrade vue4 - [`61c3ea6`](https://github.com/fatedier/frp/commit/61c3ea69d32135e159586527ed0cad2c9346ba35) dashboard add eslint - [`0270903`](https://github.com/fatedier/frp/commit/0270903d6891a8181a2abbee17a3b9ba47c6648d) refactor requests - [`14dda93`](https://github.com/fatedier/frp/commit/14dda931e60e47bbd3c401e964a838e3c74bd35d) edit makefile - [`2f9f9bd`](https://github.com/fatedier/frp/commit/2f9f9bd8f9bae2cb344ab02475463f2c5bf9cf7c) edit README - [`a9d5918`](https://github.com/fatedier/frp/commit/a9d5918ffa49d81a6eb04645eee5074fb566ab32) Merge remote-tracking branch 'upstream/dev' into dev - [`3a1ee26`](https://github.com/fatedier/frp/commit/3a1ee26967a1a8dcd91cf0de0d53ff7ae1b718a6) remove lock - [`54673e9`](https://github.com/fatedier/frp/commit/54673e972b5491e699e6958bc5b551324b64adcc) use vue-element-admin - [`519b62d`](https://github.com/fatedier/frp/commit/519b62d43f70a1e21d2cda7f971b326e521cbd61) edit fetch - [`5c48241`](https://github.com/fatedier/frp/commit/5c48241bcbcf37da42e5aab32c333b0aff7e128f) fix warning ### 📊 Changes **93 files changed** (+2155 additions, -25903 deletions) <details> <summary>View changed files</summary> 📝 `Makefile` (+2 -2) 📝 `web/.editorconfig` (+0 -0) ➕ `web/.env.dev-frpc` (+2 -0) ➕ `web/.env.dev-frps` (+2 -0) ➕ `web/.env.frpc` (+2 -0) ➕ `web/.env.frps` (+2 -0) 📝 `web/.eslintrc.js` (+13 -1) 📝 `web/.gitignore` (+2 -1) 📝 `web/.prettierrc` (+0 -0) 📝 `web/Makefile` (+3 -2) 📝 `web/README.md` (+16 -5) ➕ `web/babel.config.js` (+20 -0) ➖ `web/frpc/.babelrc` (+0 -14) ➖ `web/frpc/.gitignore` (+0 -6) ➖ `web/frpc/Makefile` (+0 -6) ➖ `web/frpc/package-lock.json` (+0 -9334) ➖ `web/frpc/package.json` (+0 -46) ➖ `web/frpc/postcss.config.js` (+0 -5) ➖ `web/frpc/src/App.vue` (+0 -73) ➖ `web/frpc/src/components/Configure.vue` (+0 -93) _...and 73 more files_ </details> ### 📄 Description 1. Merge the web code for frps and frpc 2. use the vue-element-admin --- **Compiles and hot-reloads for development** ```shell # frps npm run serve:s # frpc npm run serve:c ``` **Compiles and minifies for production** ```shell # frps npm run build:s # frpc npm run build:c ``` --- The compiled files are in `./web/dist/frps` and `./web/dist/frpc` ![screenshot](https://user-images.githubusercontent.com/39717597/101131867-f7e94980-3640-11eb-867c-51ef49fef0fd.png) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>