From c31bd4a94d000504e36fe7c21ee605c203108499 Mon Sep 17 00:00:00 2001 From: sawka Date: Thu, 19 Sep 2024 14:04:47 -0700 Subject: [PATCH] thenextwave cleanups --- RELEASES.md | 6 +++--- Taskfile.yml | 2 +- emain/platform.ts | 2 +- frontend/app/view/term/termsticker.tsx | 24 ----------------------- package.json | 8 ++++---- pkg/wshrpc/wshserver/wshserver.go | 27 -------------------------- tsconfig.json | 4 +--- 7 files changed, 10 insertions(+), 63 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 1c32cc6cb..49f990be1 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -2,7 +2,7 @@ ## Step-by-step guide -1. Go to the [Actions tab](https://github.com/wavetermdev/thenextwave/actions) and select "Bump Version" from the left sidebar. +1. Go to the [Actions tab](https://github.com/wavetermdev/waveterm/actions) and select "Bump Version" from the left sidebar. 2. Click on "Run workflow". - You will see two options: - "SemVer Bump": This defaults to `none`. Adjust this if you want to increment the version number according to semantic versioning rules (`patch`, `minor`, `major`). @@ -22,7 +22,7 @@ All releases start by first bumping the package version and creating a new Git tag. We have a workflow set up to automate this. -To run it, trigger a new run of the [Bump Version workflow](https://github.com/wavetermdev/thenextwave/actions/workflows/bump-version.yml). When triggering the run, you will be prompted to select a version bump type, either `none`, `patch`, `minor`, or `major`, and whether the version is prerelease or not. This determines how much the version number is incremented. +To run it, trigger a new run of the [Bump Version workflow](https://github.com/wavetermdev/waveterm/actions/workflows/bump-version.yml). When triggering the run, you will be prompted to select a version bump type, either `none`, `patch`, `minor`, or `major`, and whether the version is prerelease or not. This determines how much the version number is incremented. See [`version.cjs`](../../version.cjs) for more details on how this works. @@ -30,7 +30,7 @@ Once the tag has been created, a new [Build Helper](#build-helper-workflow) run ### Build Helper workflow -Our release builds are managed by the [Build Helper workflow](https://github.com/wavetermdev/thenextwave/actions/workflows/build-helper.yml). +Our release builds are managed by the [Build Helper workflow](https://github.com/wavetermdev/waveterm/actions/workflows/build-helper.yml). Under the hood, this will call the `package` task in [`Taskfile.yml`](../../Taskfile.yml), which will build the `wavesrv` and `wsh` binaries, then the frontend and Electron codebases using Vite, then it will call `electron-builder` to generate the distributable app packages. The configuration for `electron-builder` is defined in [`electron-builder.config.cjs`](../../electron-builder.config.cjs). diff --git a/Taskfile.yml b/Taskfile.yml index 280d632f7..c7572e626 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,7 +4,7 @@ version: "3" vars: - APP_NAME: "TheNextWave" + APP_NAME: "Wave" BIN_DIR: "bin" VERSION: sh: node version.cjs diff --git a/emain/platform.ts b/emain/platform.ts index 209ea1b59..75c875946 100644 --- a/emain/platform.ts +++ b/emain/platform.ts @@ -16,7 +16,7 @@ if (isDevVite) { process.env[WaveDevViteVarName] = "1"; } -app.setName(isDev ? "TheNextWave (Dev)" : "TheNextWave"); +app.setName(isDev ? "Wave (Dev)" : "Wave"); const unamePlatform = process.platform; const unameArch: string = process.arch; keyutil.setKeyUtilPlatform(unamePlatform); diff --git a/frontend/app/view/term/termsticker.tsx b/frontend/app/view/term/termsticker.tsx index 2d4a4d0b6..b0126174e 100644 --- a/frontend/app/view/term/termsticker.tsx +++ b/frontend/app/view/term/termsticker.tsx @@ -163,30 +163,6 @@ export function TermStickers({ config }: { config: StickerTermConfig }) { pointerevents: true, clickcmd: "git status\n", }); - stickers.push({ - position: "absolute", - top: 10, - right: 5, - stickertype: "icon", - icon: "paw", - color: "#cc4040aa", - fontsize: 30, - transform: "rotate(-15deg)", - pointerevents: true, - clickcmd: "cd ~/work/wails/thenextwave\n", - }); - stickers.push({ - position: "absolute", - top: 18, - right: 8, - stickertype: "image", - width: 12, - height: 6, - imgsrc: "~/Downloads/natureicon.png", - opacity: 0.8, - pointerevents: true, - clickblockdef: { meta: { file: "~/", view: "preview" } }, - }); stickers.push({ position: "absolute", top: 2, diff --git a/package.json b/package.json index 370c71d41..ded9149fe 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { - "name": "thenextwave", + "name": "waveterm", "author": { "name": "Command Line Inc", "email": "info@commandline.dev" }, - "productName": "TheNextWave", - "description": "Level Up Your Terminal With Graphical Widgets", + "productName": "Wave", + "description": "Open-Source AI-Native Terminal Built for Seamless Workflows", "license": "Apache-2.0", "version": "0.1.14-beta.3", "homepage": "https://waveterm.dev", "build": { - "appId": "dev.commandline.thenextwave" + "appId": "dev.commandline.waveterm" }, "private": true, "main": "./dist/main/index.js", diff --git a/pkg/wshrpc/wshserver/wshserver.go b/pkg/wshrpc/wshserver/wshserver.go index 890c81726..c599a36b7 100644 --- a/pkg/wshrpc/wshserver/wshserver.go +++ b/pkg/wshrpc/wshserver/wshserver.go @@ -28,7 +28,6 @@ import ( "github.com/wavetermdev/waveterm/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wshrpc" - "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wstore" ) @@ -51,32 +50,6 @@ func (ws *WshServer) TestCommand(ctx context.Context, data string) error { }() rpcSource := wshutil.GetRpcSourceFromContext(ctx) log.Printf("TEST src:%s | %s\n", rpcSource, data) - if rpcSource == "" { - return nil - } - go func() { - mainClient := GetMainRpcClient() - wshclient.MessageCommand(mainClient, wshrpc.CommandMessageData{Message: "test message"}, &wshrpc.RpcOpts{NoResponse: true, Route: rpcSource}) - resp, err := wshclient.RemoteFileInfoCommand(mainClient, "~/work/wails/thenextwave/README.md", &wshrpc.RpcOpts{Route: rpcSource}) - if err != nil { - log.Printf("error getting remote file info: %v", err) - return - } - log.Printf("remote file info: %#v\n", resp) - rch := wshclient.RemoteStreamFileCommand(mainClient, wshrpc.CommandRemoteStreamFileData{Path: "~/work/wails/thenextwave/README.md"}, &wshrpc.RpcOpts{Route: rpcSource}) - for msg := range rch { - if msg.Error != nil { - log.Printf("error in stream: %v", msg.Error) - break - } - if msg.Response.FileInfo != nil { - log.Printf("stream resp (fileinfo): %v\n", msg.Response.FileInfo) - } - if msg.Response.Data64 != "" { - log.Printf("stream resp (data): %v\n", len(msg.Response.Data64)) - } - } - }() return nil } diff --git a/tsconfig.json b/tsconfig.json index d782c63c1..513998081 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,9 +20,7 @@ "@/layout/*": ["frontend/layout/*"], "@/store/*": ["frontend/app/store/*"], "@/view/*": ["frontend/app/view/*"], - "@/element/*": ["frontend/app/element/*"], - "@/bindings/*": ["frontend/bindings/github.com/wavetermdev/thenextwave/pkg/service/*"], - "@/gopkg/*": ["frontend/bindings/github.com/wavetermdev/thenextwave/pkg/*"] + "@/element/*": ["frontend/app/element/*"] }, "types": ["vite/client", "vite-plugin-svgr/client"] }