attempt to fix the dockerfile for macos

Co-authored-by: Evan Simkowitz <esimkowitz@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -0,0 +1,16 @@
+{
+    "name": "Wave Terminal Dev Container",
+    "dockerComposeFile": "../docker-compose.yml",
+    "service": "wave",
+    "workspaceFolder": "/app/waveterm",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash",
+                "extensions": ["golang.go", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode"]
+            }
+        }
+    },
+    "runServices": ["dbus"],
+    "postAttachCommand": "scripthaus run webpack-watch"
+}

.dockerignore

@@ -0,0 +1,21 @@
+# Ignore node_modules and other dependencies
+node_modules
+.yarn
+
+# Ignore build directories
+build
+dist
+
+# Ignore logs and temporary files
+logs
+*.log
+*.tmp
+
+# Ignore test and coverage files
+coverage
+test-results
+
+# Ignore OS-specific files
+.DS_Store
+Thumbs.db
+

.github/workflows/build-helper.yml

@@ -71,7 +71,7 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_PWD }}
                   APPLE_TEAM_ID: ${{ matrix.platform == 'darwin' && secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
             - name: Upload to S3 staging
-              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging-legacy/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
+              run: aws s3 cp make/ s3://waveterm-github-artifacts/staging/${{ steps.set-version.outputs.WAVETERM_VERSION }}/ --recursive --exclude "*/*" --exclude "builder-*.yml"
               env:
                   AWS_ACCESS_KEY_ID: "${{ secrets.S3_USERID }}"
                   AWS_SECRET_ACCESS_KEY: "${{ secrets.S3_SECRETKEY }}"

.github/workflows/regression.yml

@@ -23,9 +23,8 @@ jobs:
       - uses: dashcamio/testdriver@main
         id: testdriver
         with:
-          version: v3.9.0
+          version: v3.6.5
           key: ${{secrets.DASHCAM_API}}
-          os: mac
           prerun: |
             cd ~/actions-runner/_work/testdriver/testdriver/
             brew install go

.testdriver/wave1.yml

@@ -1,37 +1,29 @@
-version: 3.8.0
-    steps:
-      - prompt: "Focus electron"
-        commands:
-        - command: focus-application
-          name: Electron
-        - command: hover-text
-          description: Get started CTA
-          text: Get Started
-          action: click
-        - command: hover-text
-          description: Settings button
-          text: Settings
-          action: click
-        - command: hover-text
-          description: font size 13
-          text: 13px
-          action: click
-        - command: hover-text
-          description: font size 12
-          text: 12px
-          action: click
-        - command: hover-text
-          description: theme selector
-          text: Dark
-          action: click
-        - command: hover-text
-          description: theme color white
-          text: Light
-          action: click
-        - command: hover-text
-          description: workspace
-          text: workspace-1
-          action: click
-        - command: assert
-          expect: the terminal is white
+steps:
+  - step:
+      - command: focus-application
+        name: Electron
+      - command: hover-text
+        text: Get Started
+        action: click
+      - command: hover-text
+        text: Settings
+        action: click
+      - command: hover-text
+        text: 13px
+        action: click
+      - command: hover-text
+        text: 12px
+        action: click
+      - command: hover-text
+        text: Dark
+        action: click
+      - command: hover-text
+        text: Light
+        action: click
+      - command: hover-text
+        text: workspace-1
+        action: click
+  - step:
+      - command: assert
+        expect: the terminal is white
 

Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:latest
+WORKDIR /app
+
+RUN apt update && \
+    apt install -y golang-go nodejs npm libgtk2.0-0t64 libgtk-3-0t64 libgbm-dev libnotify-dev libnss3 libxss1 libasound2t64 libxtst6 xauth xvfb && \
+    npm install -g corepack
+
+RUN corepack enable && \
+    yarn install
+
+RUN git clone https://github.com/scripthaus-dev/scripthaus.git
+WORKDIR /app/scripthaus
+
+RUN CGO_ENABLED=1 go build -o scripthaus cmd/main.go && \
+    cp scripthaus /usr/local/bin
+
+WORKDIR /app
+RUN mkdir waveterm
+
+WORKDIR /app/waveterm
+COPY . .
+ENV GOFLAGS="-buildvcs=false"
+ENV DISPLAY=":0"
+
+RUN useradd -ms /bin/bash wave

README.md

@@ -7,10 +7,6 @@
   <br/>
 </p>
 
-# Wave Legacy
-
-This branch is for the legacy v0.7.7 version of Wave.  For the new Wave v8+ code, please use the main branch.
-
 # Wave Terminal
 
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fwavetermdev%2Fwaveterm?ref=badge_shield)

buildres/README.md

@@ -13,7 +13,7 @@ is [`electron-builder.config.js`](../electron-builder.config.js).
 
 This will also sign and notarize the macOS app package.
 
-Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging-legacy/<version>`.
+Once a build is complete, it will be placed in `s3://waveterm-github-artifacts/staging/<version>`.
 It can be downloaded for testing using the [`download-staged-artifact.sh`](./download-staged-artifact.sh)
 script. When you are ready to publish the artifacts to the public release feed, use the
 [`publish-from-staging.sh`](./publish-from-staging.sh) script to directly copy the artifacts from

buildres/deprecated/upload-release.sh

@@ -7,7 +7,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 BUILDS_DIR=$SCRIPT_DIR/builds
 TEMP2_DIR=$SCRIPT_DIR/temp2
 
-AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases-legacy"
+AUTOUPDATE_RELEASE_PATH="dl.waveterm.dev/releases"
 
 # Copy the builds to the temp2 directory
 echo "Copying builds to temp2"

buildres/download-staged-artifact.sh

@@ -13,4 +13,4 @@ fi
 DOWNLOAD_DIR=$VERSION-staged
 rm -rf $DOWNLOAD_DIR
 mkdir -p $DOWNLOAD_DIR
-aws s3 cp s3://waveterm-github-artifacts/staging-legacy/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE
+aws s3 cp s3://waveterm-github-artifacts/staging/$VERSION/ $DOWNLOAD_DIR/ --recursive --profile $AWS_PROFILE

buildres/publish-from-staging.sh

@@ -9,8 +9,8 @@ if [ -z "$VERSION" ]; then
     exit
 fi
 
-ORIGIN="waveterm-github-artifacts/staging-legacy/$VERSION/"
-DESTINATION="dl.waveterm.dev/releases-legacy/"
+ORIGIN="waveterm-github-artifacts/staging/$VERSION/"
+DESTINATION="dl.waveterm.dev/releases/"
 
 OUTPUT=$(aws s3 cp s3://$ORIGIN s3://$DESTINATION --recursive --profile $AWS_PROFILE)
 

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  wave:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: waveterminal
+    environment:
+      - DISPLAY=${DISPLAY}
+      - NODE_ENV=development
+    volumes:
+      - /tmp/.X11-unix:/tmp/.X11-unix
+      - .:/app/waveterm
+    stdin_open: true
+    tty: true
+    ports:
+      - "3000:3000"

electron-builder.config.js

@@ -88,7 +88,7 @@ const config = {
     },
     publish: {
         provider: "generic",
-        url: "https://dl.waveterm.dev/releases-legacy",
+        url: "https://dl.waveterm.dev/releases",
     },
 };
 

go.work.sum

@@ -134,28 +134,14 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
 golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=

package.json

@@ -1,21 +1,21 @@
 {
-    "name": "wavelegacy",
+    "name": "waveterm",
     "author": {
         "name": "Command Line Inc",
         "email": "info@commandline.dev"
     },
-    "productName": "WaveLegacy",
+    "productName": "Wave",
     "description": "An Open-Source, AI-Native, Terminal Built for Seamless Workflows",
-    "version": "0.7.7",
+    "version": "0.7.6",
     "main": "dist/emain.js",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
         "url": "https://github.com/wavetermdev/waveterm"
     },
-    "homepage": "https://www.waveterm.dev",
+    "homepage": "https://waveterm.dev",
     "build": {
-        "appId": "dev.commandline.wavelegacy"
+        "appId": "dev.commandline.waveterm"
     },
     "dependencies": {
         "@lexical/react": "^0.17.0",
@@ -101,7 +101,7 @@
         "react-split-it": "^2.0.0",
         "style-loader": "4.0.0",
         "typescript": "^5.5.4",
-        "webpack": "^5.94.0",
+        "webpack": "^5.93.0",
         "webpack-bundle-analyzer": "^4.10.2",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^5.0.4",

scripthaus.md

@@ -76,7 +76,7 @@ function buildWaveShell {
 }
 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,netcgo,sqlite_omit_load_extension" -ldflags "-linkmode 'external' -extldflags=-static $GO_LDFLAGS -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv.$1 ./cmd)
+    (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
@@ -90,7 +90,7 @@ yarn run electron-builder -c electron-builder.config.js -l -p never
 # @scripthaus command build-wavesrv
 WAVESRV_VERSION=$(node -e 'console.log(require("./version.js"))')
 cd wavesrv
-CGO_ENABLED=1 go build -tags "osusergo,netcgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv ./cmd
+CGO_ENABLED=1 go build -tags "osusergo,netgo,sqlite_omit_load_extension" -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M') -X main.WaveVersion=$WAVESRV_VERSION" -o ../bin/wavesrv ./cmd
 ```
 
 ```bash

src/app/common/modals/about.tsx

@@ -68,7 +68,7 @@ class AboutModal extends React.Component<{}, {}> {
                             <img src={logo} alt="logo" />
                         </div>
                         <div className="text-wrapper">
-                            <div>Wave Terminal (Legacy)</div>
+                            <div>Wave Terminal</div>
                             <div className="text-standard">
                                 Open-Source AI-Native Terminal
                                 <br />

src/app/common/modals/editremoteconn.tsx

@@ -269,7 +269,7 @@ class EditRemoteConnModal extends React.Component<{}, {}> {
                             Most options for connections imported from an ssh config file cannot be edited. For these
                             changes, you must edit the config file and import it again. The shell preference can be
                             edited, but will return to the default if you import again. It will stay changed if you
-                            follow <a href="https://legacydocs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
+                            follow <a href="https://docs.waveterm.dev/features/sshconfig-imports">this procedure</a>.
                         </span>
                     }
                     icon={<i className="fa-sharp fa-regular fa-fw fa-triangle-exclamation" />}

src/app/common/modals/tos.tsx

@@ -98,7 +98,7 @@ class TosModal extends React.Component<{}, {}> {
                                         We collect minimal anonymous
                                         <a
                                             target="_blank"
-                                            href={util.makeExternLink("https://legacydocs.waveterm.dev/reference/telemetry")}
+                                            href={util.makeExternLink("https://docs.waveterm.dev/reference/telemetry")}
                                             rel={"noopener"}
                                         >
                                             &nbsp;telemetry data&nbsp;