Trying to add react-dev-tools

.github/workflows/build-helper.yml

@@ -11,15 +11,15 @@ jobs:
             matrix:
                 include:
                     - platform: "darwin"
-                      arch: "universal"
+                      arch: "x64"
+                      runner: "macos-latest"
+                      scripthaus: "build-package"
+                    - platform: "darwin"
+                      arch: "arm64"
                       runner: "macos-latest-xlarge"
                       scripthaus: "build-package"
                     - platform: "linux"
-                      arch: "arm64"
-                      runner: "ubuntu-latest"
-                      scripthaus: "build-package-linux"
-                    - platform: "linux"
-                      arch: "amd64"
+                      arch: "x64"
                       runner: "ubuntu-latest"
                       scripthaus: "build-package-linux"
         runs-on: ${{ matrix.runner }}
@@ -29,11 +29,6 @@ jobs:
               with:
                   repository: scripthaus-dev/scripthaus
                   path: scripthaus
-            - name: Install Linux Build Dependencies
-              if: matrix.platform == 'linux'
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install rpm flatpak flatpak-builder snapcraft
             - uses: actions/setup-go@v5
               with:
                   go-version: ${{env.GO_VERSION}}
@@ -41,8 +36,7 @@ jobs:
                       wavesrv/go.sum
                       waveshell/go.sum
                       scripthaus/go.sum
-            - name: Install Scripthaus
-              run: |
+            - run: |
                   go work use ./scripthaus;
                   cd scripthaus;
                   go get ./...;
@@ -51,96 +45,30 @@ jobs:
               with:
                   node-version: ${{env.NODE_VERSION}}
                   cache: "yarn"
-            - name: Set Version
-              id: set-version
+            - id: set-version
               run: |
                   VERSION=$(node -e 'console.log(require("./version.js"))')
                   echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
-            - name: Install Yarn Dependencies
-              run: yarn --frozen-lockfile
-            - name: Build ${{ matrix.platform }}/${{ matrix.arch }}
-              run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
-              env:
-                  GOARCH: ${{ matrix.arch }}
+            - run: yarn --frozen-lockfile
+            - run: ./scripthaus/scripthaus run ${{ matrix.scripthaus }}
             - uses: actions/upload-artifact@v4
               with:
-                  name: waveterm-build-${{ matrix.platform }}
-                  path: out/make/*
+                  name: waveterm-build-${{ matrix.platform }}-${{ matrix.arch }}
+                  path: out/make/zip/${{ matrix.platform }}/${{ matrix.arch }}/*.zip
                   retention-days: 2
-    runbuild-linux-arm:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v4
-            - uses: actions/checkout@v4
-              with:
-                  repository: scripthaus-dev/scripthaus
-                  path: scripthaus
-            - name: Install Linux Build Dependencies
-              run: |
-                  sudo apt-get update
-                  sudo apt-get install rpm flatpak flatpak-builder snapcraft
-            - uses: actions/setup-go@v5
-              with:
-                  go-version: ${{env.GO_VERSION}}
-                  cache-dependency-path: |
-                      wavesrv/go.sum
-                      waveshell/go.sum
-                      scripthaus/go.sum
-            - name: Install Scripthaus
-              run: |
-                  go work use ./scripthaus;
-                  cd scripthaus;
-                  go get ./...;
-                  CGO_ENABLED=1 go build -o scripthaus cmd/main.go
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: ${{env.NODE_VERSION}}
-                  cache: "yarn"
-            - name: Set Version
-              id: set-version
-              run: |
-                  VERSION=$(node -e 'console.log(require("./version.js"))')
-                  echo "WAVETERM_VERSION=${VERSION}" >> "$GITHUB_OUTPUT"
-            - name: Install Yarn Dependencies
-              run: yarn --frozen-lockfile
-            - name: Build linux/arm64
-              uses: pguyot/arm-runner-action@v2
-              with:
-                  image_additional_mb: 2000
-                  base_image: dietpi:rpi_armv8_bullseye
-                  bind_mount_repository: true
-                  commands: |
-                      sudo apt-get update && sudo apt-get install -y snapd git
-                      sudo snap install --classic go
-                      git clone
-
-            - uses: actions/upload-artifact@v4
-              with:
-                  name: waveterm-build-linux-arm
-                  path: out/make/*
-                  retention-days: 2
-
     upload:
         name: "Upload Builds"
         runs-on: ubuntu-latest
-        needs: [runbuild, runbuild-linux-arm]
+        needs: [runbuild]
         steps:
             - uses: actions/download-artifact@v4
               with:
                   merge-multiple: true
-                  path: download
-            - name: Move builds into buildtemp
-              run: |
-                  mkdir buildtemp
-                  # Will only move over the files, flattening the directory structure
-                  find download -mindepth 2 -type f -exec mv -t buildtemp -i '{}' +
-            - name: Set `version.txt`
-              run: |
+                  path: buildtemp
+            - run: |
                   echo "${{ needs.runbuild.outputs.WAVETERM_VERSION }}" > buildtemp/version.txt
-            - name: Zip Builds
-              run: (cd buildtemp; zip ../waveterm-builds.zip *)
-            - name: Upload to S3
-              run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
+            - run: (cd buildtemp; zip ../waveterm-builds.zip *)
+            - run: aws s3 cp waveterm-builds.zip s3://waveterm-github-artifacts/
               env:
                   AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                   AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"

.github/workflows/regression.yml

@@ -1,26 +0,0 @@
-name: TestDriver.ai Regression Testing
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-  schedule:
-    - cron: "0 21 * * *" # every day at 9pm
-  workflow_dispatch:
-
-jobs:
-  test:
-    name: "TestDriver"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dashcamio/testdriver@main
-        id: testdriver
-        # note that .testdriver/prerun.sh runs before this, so the app has launched already
-        with:
-          prompt: |
-            2. click "Continue"
-            2. focus the Wave input with the keyboard shorcut Command + I
-            3. type 'ls' into the input
-            4. press return
-            5. validate Wave shows the result of 'ls'

.testdriver/prerun.sh

@@ -1,20 +0,0 @@
-rm ~/Desktop/WITH-LOVE-FROM-AMERICA.txt
-brew install go
-brew tap scripthaus-dev/scripthaus
-brew install scripthaus
-npm install -g yarn
-mkdir ~/build
-cd ~/build
-git clone https://github.com/wavetermdev/waveterm.git
-cd waveterm
-scripthaus run build-backend
-echo "Yarn"
-yarn
-echo "Rebuild"
-scripthaus run electron-rebuild
-echo "Webpack"
-scripthaus run webpack-build
-echo "Starting Electron"
-scripthaus run electron 1>/dev/null 2>&1 &
-echo "Electron Done"
-exit

README.md

@@ -9,7 +9,7 @@
 
 # Wave Terminal
 
-An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.
+A open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.
 
 Wave isn't just another terminal emulator; it's a rethink on how terminals are built. Wave combines command line with the power of the open web to help veteran CLI users and new developers alike.
 

buildres/build-linux-arm.sh

@@ -1,24 +0,0 @@
-sudo apt-get update && sudo apt-get install -y snapd git
-sudo snap install --classic go && sudo snap install --classic yarn
-
-rm -rf dist/
-rm -rf bin/
-rm -rf build/
-node_modules/.bin/webpack --env prod
-WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
-WAVESHELL_VERSION=v0.4
-GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-function buildWaveShell {
-    (cd waveshell; CGO_ENABLED=0 GOOS=$1 GOARCH=$2 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-$WAVESHELL_VERSION-$1.$2 main-waveshell.go)
-}
-function buildWaveSrv {
-    # adds -extldflags=-static, *only* on linux (macos does not support fully static binaries) to avoid a glibc dependency
-    (cd wavesrv; CGO_ENABLED=1 GOARCH=$1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv.$1 ./cmd)
-}
-buildWaveShell darwin amd64
-buildWaveShell darwin arm64
-buildWaveShell linux amd64
-buildWaveShell linux arm64
-buildWaveSrv $GOARCH
-yarn run electron-builder -c electron-builder.config.js -l
-                      

buildres/upload-release.sh

@@ -1,86 +0,0 @@
-#!/bin/bash
-# This script is used to upload signed and notarized releases to S3 and update the Electron auto-update release feeds.
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-BUILDS_DIR=$SCRIPT_DIR/builds
-TEMP2_DIR=$SCRIPT_DIR/temp2
-
-MAIN_RELEASE_PATH="dl.waveterm.dev/build"
-AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/autoupdate"
-
-# Copy the builds to the temp2 directory
-echo "Copying builds to temp2"
-rm -rf $TEMP2_DIR
-mkdir -p $TEMP2_DIR
-cp -r $BUILDS_DIR/* $TEMP2_DIR
-
-UVERSION=$(cat $TEMP2_DIR/version.txt)
-
-if [ -z "$UVERSION" ]; then
-    echo "version.txt is empty"
-    exit 1
-fi
-
-# Find the DMG file
-echo "Finding DMG"
-DMG=$(find $TEMP2_DIR -type f -iname "*.dmg")
-# Ensure there is only one
-NUM_DMGS=$(echo $DMG | wc -l)
-if [ "0" -eq "$NUM_DMGS" ]; then
-    echo "no DMG found in $TEMP2_DIR"
-    exit 1
-elif [ "1" -lt "$NUM_DMGS" ]; then
-    echo "multiple DMGs found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Find the Mac zip
-echo "Finding Mac zip"
-MAC_ZIP=$(find $TEMP2_DIR -type f -iname "*mac*.zip")
-# Ensure there is only one
-NUM_MAC_ZIPS=$(echo $MAC_ZIP | wc -l)
-if [ "0" -eq "$NUM_MAC_ZIPS" ]; then
-    echo "no Mac zip found in $TEMP2_DIR"
-    exit 1
-elif [ "1" -lt "$NUM_MAC_ZIPS" ]; then
-    echo "multiple Mac zips found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Find the Linux zips
-echo "Finding Linux zips"
-LINUX_ZIPS=$(find $TEMP2_DIR -type f -iname "*linux*.zip")
-# Ensure there is at least one
-NUM_LINUX_ZIPS=$(echo $LINUX_ZIPS | wc -l)
-if [ "0" -eq "$NUM_LINUX_ZIPS" ]; then
-    echo "no Linux zips found in $TEMP2_DIR"
-    exit 1
-fi
-
-# Upload the DMG
-echo "Uploading DMG"
-DMG_NAME=$(basename $DMG)
-aws s3 cp $DMG s3:/$MAIN_RELEASE_PATH/$DMG_NAME
-
-# Upload the Linux zips
-echo "Uploading Linux zips"
-for LINUX_ZIP in $LINUX_ZIPS; do
-    LINUX_ZIP_NAME=$(basename $LINUX_ZIP)
-    aws s3 cp $LINUX_ZIP s3://$MAIN_RELEASE_PATH/$LINUX_ZIP_NAME
-done
-
-# Upload the autoupdate Mac zip
-echo "Uploading Mac zip"
-MAC_ZIP_NAME=$(basename $MAC_ZIP)
-aws s3 cp $MAC_ZIP s3://$AUTOUPDATE_RELEASE_PATH/$MAC_ZIP_NAME
-
-# Update the autoupdate feeds
-echo "Updating autoupdate feeds"
-RELEASES_CONTENTS="{\"name\":\"$UVERSION\",\"notes\":\"\",\"url\":\"https://$AUTOUPDATE_RELEASE_PATH/$MAC_ZIP_NAME\"}"
-aws s3 cp - s3://$AUTOUPDATE_RELEASE_PATH/darwin/arm64/RELEASES.json <<< $RELEASES_CONTENTS
-aws s3 cp - s3://$AUTOUPDATE_RELEASE_PATH/darwin/x64/RELEASES.json <<< $RELEASES_CONTENTS
-
-# Clean up
-echo "Cleaning up"
-rm -rf $TEMP2_DIR

electron-builder.config.js

@@ -1,71 +0,0 @@
-const pkg = require("./package.json");
-
-/**
- * @type {import('electron-builder').Configuration}
- * @see https://www.electron.build/configuration/configuration
- */
-const config = {
-    artifactName: "${productName}-${version}-${arch}.${ext}",
-    npmRebuild: false,
-    nodeGypRebuild: false,
-    electronCompile: false,
-    publish: null,
-    files: [
-        {
-            from: "./dist",
-            to: "./dist",
-            filter: ["**/*"],
-        },
-        {
-            from: "./public",
-            to: "./public",
-            filter: ["**/*"],
-        },
-        {
-            from: "./bin",
-            to: "./bin",
-            filter: ["**/*"],
-        },
-        {
-            from: ".",
-            to: ".",
-            filter: ["package.json"],
-        },
-        "!**/node_modules/**${/*}", // Ignore node_modules by default
-        {
-            from: "./node_modules",
-            to: "./node_modules",
-            filter: ["monaco-editor/min/**/*"], // This is the only module we want to include
-        },
-    ],
-    directories: {
-        output: "make",
-    },
-    appId: pkg.build.appId,
-    productName: pkg.productName,
-    mac: {
-        target: {
-            target: "zip",
-            arch: "universal",
-        },
-        icon: "public/waveterm.icns",
-        category: "public.app-category.developer-tools",
-        minimumSystemVersion: "10.15.0",
-        asarUnpack: ["bin/**/*"],
-    },
-    linux: {
-        executableName: pkg.productName,
-        category: "TerminalEmulator",
-        icon: "public/waveterm.icns",
-        target: ["zip", "deb"],
-        asar: false,
-        desktop: {
-            Name: pkg.productName,
-            Comment: pkg.description,
-            Keywords: "developer;terminal;emulator;",
-            category: "Development;Utility;",
-        },
-    },
-};
-
-module.exports = config;

forge.config.js

@@ -1,5 +1,4 @@
-const pkg = require("./package.json");
-let AllowedFirstParts = {
+var AllowedFirstParts = {
     "package.json": true,
     dist: true,
     public: true,
@@ -7,11 +6,11 @@ let AllowedFirstParts = {
     bin: true,
 };
 
-let AllowedNodeModules = {
+var AllowedNodeModules = {
     "monaco-editor": true,
 };
 
-let modCache = {};
+var modCache = {};
 
 function ignoreFn(path) {
     let parts = path.split("/");
@@ -48,7 +47,11 @@ function ignoreFn(path) {
 module.exports = {
     packagerConfig: {
         ignore: ignoreFn,
-        files: ["package.json", "dist/*", "public/*", "bin/*"],
+        files: [
+            "package.json",
+            "dist/*",
+            "public/*",
+        ],
         icon: "public/waveterm.icns",
     },
     rebuildConfig: {},
@@ -57,59 +60,5 @@ module.exports = {
             name: "@electron-forge/maker-zip",
             platforms: ["darwin", "linux"],
         },
-        {
-            name: "@electron-forge/maker-deb",
-            config: {
-                options: {
-                    bin: pkg.productName,
-                    name: pkg.name,
-                    genericName: "Terminal Emulator",
-                    productName: pkg.productName,
-                    productDescription: pkg.description,
-                    icon: "public/waveterm.icns",
-                    categories: ["Utility", "Development"],
-                    maintainer: pkg.author,
-                    homepage: pkg.homepage,
-                    license: pkg.license,
-                    version: pkg.version,
-                },
-            },
-        },
-        {
-            name: "@electron-forge/maker-rpm",
-            config: {
-                options: {
-                    bin: pkg.productName,
-                    name: pkg.name,
-                    genericName: "Terminal Emulator",
-                    productName: pkg.productName,
-                    description: pkg.description,
-                    productDescription: pkg.description,
-                    icon: "public/waveterm.icns",
-                    categories: ["Utility", "Development"],
-                    license: pkg.license,
-                    version: pkg.version,
-                },
-            },
-        },
-        // {
-        //     name: "@electron-forge/maker-flatpak",
-        //     config: {
-        //         options: {
-        //             bin: pkg.productName,
-        //             mimeType: ["text/plain"],
-        //         },
-        //     },
-        // },
-        // {
-        //     name: "@electron-forge/maker-snap",
-        //     config: {
-        //         features: {
-        //             audio: true,
-        //             mpris: "com.commandline.waveterm",
-        //             webgl: true,
-        //         },
-        //     },
-        // },
     ],
 };

package.json

@@ -1,22 +1,10 @@
 {
     "name": "waveterm",
-    "author": {
-        "name": "Command Line Inc",
-        "email": "info@commandline.dev"
-    },
+    "author": "Command Line Inc",
     "productName": "Wave",
-    "description": "An open-source, cross-platform, AI-integrated, modern terminal for seamless workflows.",
-    "version": "0.6.1",
+    "version": "v0.6.1",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/wavetermdev/waveterm"
-    },
-    "homepage": "https://waveterm.dev",
-    "build": {
-        "appId": "dev.commandline.waveterm"
-    },
     "dependencies": {
         "@monaco-editor/react": "^4.5.1",
         "@table-nav/core": "^0.0.7",
@@ -63,12 +51,12 @@
         "@babel/preset-react": "^7.23.3",
         "@babel/preset-typescript": "^7.17.12",
         "@electron-forge/cli": "^7.2.0",
-        "@electron-forge/maker-deb": "^7.3.0",
-        "@electron-forge/maker-flatpak": "^7.3.0",
-        "@electron-forge/maker-rpm": "^7.3.0",
+        "@electron-forge/maker-deb": "^7.2.0",
+        "@electron-forge/maker-rpm": "^7.2.0",
         "@electron-forge/maker-snap": "^7.2.0",
         "@electron-forge/maker-squirrel": "^7.2.0",
-        "@electron-forge/maker-zip": "^7.3.0",
+        "@electron-forge/maker-zip": "^7.2.0",
+        "@electron/rebuild": "^3.4.0",
         "@svgr/webpack": "^8.1.0",
         "@types/classnames": "^2.3.1",
         "@types/electron": "^1.6.10",
@@ -83,8 +71,8 @@
         "babel-plugin-jsx-control-statements": "^4.1.2",
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^6.7.1",
-        "electron": "29.0.1",
-        "electron-builder": "^24.12.0",
+        "electron": "28.1.3",
+        "electron-devtools-installer": "^3.2.0",
         "file-loader": "^6.2.0",
         "http-server": "^14.1.1",
         "less": "^4.1.2",
@@ -102,7 +90,5 @@
         "webpack-dev-server": "^4.9.1",
         "webpack-merge": "^5.8.0"
     },
-    "scripts": {
-        "postinstall": "electron-builder install-app-deps"
-    }
-}
+    "scripts": {}
+}

public/fontawesome/css/sharp-regular.min.css

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Pro 6.5.1 by @fontawesome - https://fontawesome.com
+ * Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license (Commercial License)
  * Copyright 2023 Fonticons, Inc.
  */

public/fontawesome/css/sharp-solid.min.css

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Pro 6.5.1 by @fontawesome - https://fontawesome.com
+ * Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license (Commercial License)
  * Copyright 2023 Fonticons, Inc.
  */

public/fontawesome/css/solid.min.css

@@ -1,5 +1,5 @@
 /*!
- * Font Awesome Pro 6.5.1 by @fontawesome - https://fontawesome.com
+ * Font Awesome Pro 6.3.0 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license (Commercial License)
  * Copyright 2023 Fonticons, Inc.
  */