thenextwave cleanups

This commit is contained in:
sawka 2024-09-19 14:04:47 -07:00
parent 064fe2eff4
commit c31bd4a94d
7 changed files with 10 additions and 63 deletions

View File

@ -2,7 +2,7 @@
## Step-by-step guide ## 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". 2. Click on "Run workflow".
- You will see two options: - 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`). - "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. 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. 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 ### 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). 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).

View File

@ -4,7 +4,7 @@
version: "3" version: "3"
vars: vars:
APP_NAME: "TheNextWave" APP_NAME: "Wave"
BIN_DIR: "bin" BIN_DIR: "bin"
VERSION: VERSION:
sh: node version.cjs sh: node version.cjs

View File

@ -16,7 +16,7 @@ if (isDevVite) {
process.env[WaveDevViteVarName] = "1"; process.env[WaveDevViteVarName] = "1";
} }
app.setName(isDev ? "TheNextWave (Dev)" : "TheNextWave"); app.setName(isDev ? "Wave (Dev)" : "Wave");
const unamePlatform = process.platform; const unamePlatform = process.platform;
const unameArch: string = process.arch; const unameArch: string = process.arch;
keyutil.setKeyUtilPlatform(unamePlatform); keyutil.setKeyUtilPlatform(unamePlatform);

View File

@ -163,30 +163,6 @@ export function TermStickers({ config }: { config: StickerTermConfig }) {
pointerevents: true, pointerevents: true,
clickcmd: "git status\n", 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({ stickers.push({
position: "absolute", position: "absolute",
top: 2, top: 2,

View File

@ -1,16 +1,16 @@
{ {
"name": "thenextwave", "name": "waveterm",
"author": { "author": {
"name": "Command Line Inc", "name": "Command Line Inc",
"email": "info@commandline.dev" "email": "info@commandline.dev"
}, },
"productName": "TheNextWave", "productName": "Wave",
"description": "Level Up Your Terminal With Graphical Widgets", "description": "Open-Source AI-Native Terminal Built for Seamless Workflows",
"license": "Apache-2.0", "license": "Apache-2.0",
"version": "0.1.14-beta.3", "version": "0.1.14-beta.3",
"homepage": "https://waveterm.dev", "homepage": "https://waveterm.dev",
"build": { "build": {
"appId": "dev.commandline.thenextwave" "appId": "dev.commandline.waveterm"
}, },
"private": true, "private": true,
"main": "./dist/main/index.js", "main": "./dist/main/index.js",

View File

@ -28,7 +28,6 @@ import (
"github.com/wavetermdev/waveterm/pkg/wlayout" "github.com/wavetermdev/waveterm/pkg/wlayout"
"github.com/wavetermdev/waveterm/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/waveterm/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/waveterm/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/waveterm/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
@ -51,32 +50,6 @@ func (ws *WshServer) TestCommand(ctx context.Context, data string) error {
}() }()
rpcSource := wshutil.GetRpcSourceFromContext(ctx) rpcSource := wshutil.GetRpcSourceFromContext(ctx)
log.Printf("TEST src:%s | %s\n", rpcSource, data) 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 return nil
} }

View File

@ -20,9 +20,7 @@
"@/layout/*": ["frontend/layout/*"], "@/layout/*": ["frontend/layout/*"],
"@/store/*": ["frontend/app/store/*"], "@/store/*": ["frontend/app/store/*"],
"@/view/*": ["frontend/app/view/*"], "@/view/*": ["frontend/app/view/*"],
"@/element/*": ["frontend/app/element/*"], "@/element/*": ["frontend/app/element/*"]
"@/bindings/*": ["frontend/bindings/github.com/wavetermdev/thenextwave/pkg/service/*"],
"@/gopkg/*": ["frontend/bindings/github.com/wavetermdev/thenextwave/pkg/*"]
}, },
"types": ["vite/client", "vite-plugin-svgr/client"] "types": ["vite/client", "vite-plugin-svgr/client"]
} }