From 605b9ea048c9a37631f1fca812306bed958e41d5 Mon Sep 17 00:00:00 2001 From: sawka Date: Wed, 12 Jun 2024 11:58:17 -0700 Subject: [PATCH] remove wails deps --- build/Info.dev.plist | 32 -------------------------------- build/Info.plist | 27 --------------------------- build/appimage/build.sh | 26 -------------------------- build/devmode.config.yaml | 28 ---------------------------- build/info.json | 15 --------------- frontend/app/store/wos.ts | 1 - go.mod | 2 -- package.json | 1 - public/index.html | 4 ++-- yarn.lock | 19 ------------------- 10 files changed, 2 insertions(+), 153 deletions(-) delete mode 100644 build/Info.dev.plist delete mode 100644 build/Info.plist delete mode 100644 build/appimage/build.sh delete mode 100644 build/devmode.config.yaml delete mode 100644 build/info.json diff --git a/build/Info.dev.plist b/build/Info.dev.plist deleted file mode 100644 index 90dd9e923..000000000 --- a/build/Info.dev.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - CFBundlePackageType - APPL - CFBundleName - Wave Terminal - CFBundleExecutable - NextWave - CFBundleIdentifier - dev.waveterm.thenextwave - CFBundleVersion - 0.1.0 - CFBundleGetInfoString - Next Wave Terminal - CFBundleShortVersionString - 0.1.0 - CFBundleIconFile - icons.icns - LSMinimumSystemVersion - 10.13.0 - NSHighResolutionCapable - true - NSHumanReadableCopyright - Copyright 2024, Command Line Inc - NSAppTransportSecurity - - NSAllowsLocalNetworking - - - - \ No newline at end of file diff --git a/build/Info.plist b/build/Info.plist deleted file mode 100644 index 6d579826f..000000000 --- a/build/Info.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - CFBundlePackageType - APPL - CFBundleName - NextWave - CFBundleExecutable - NextWave - CFBundleIdentifier - dev.waveterm.thenextwave - CFBundleVersion - 0.1.0 - CFBundleGetInfoString - Wave Terminal - CFBundleShortVersionString - 0.1.0 - CFBundleIconFile - icons.icns - LSMinimumSystemVersion - 10.13.0 - NSHighResolutionCapable - true - NSHumanReadableCopyright - Copyright 2024, Command Line Inc - - \ No newline at end of file diff --git a/build/appimage/build.sh b/build/appimage/build.sh deleted file mode 100644 index fcba535e5..000000000 --- a/build/appimage/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2018-Present Lea Anthony -# SPDX-License-Identifier: MIT - -# Fail script on any error -set -euxo pipefail - -# Define variables -APP_DIR="${APP_NAME}.AppDir" - -# Create AppDir structure -mkdir -p "${APP_DIR}/usr/bin" -cp -r "${APP_BINARY}" "${APP_DIR}/usr/bin/" -cp "${ICON_PATH}" "${APP_DIR}/" -cp "${DESKTOP_FILE}" "${APP_DIR}/" - -# Download linuxdeploy and make it executable -wget -q -4 -N https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage -chmod +x linuxdeploy-x86_64.AppImage - -# Run linuxdeploy to bundle the application -./linuxdeploy-x86_64.AppImage --appdir "${APP_DIR}" --output appimage - -# Rename the generated AppImage -mv "${APP_NAME}*.AppImage" "${APP_NAME}.AppImage" - diff --git a/build/devmode.config.yaml b/build/devmode.config.yaml deleted file mode 100644 index 1a441f248..000000000 --- a/build/devmode.config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -config: - root_path: . - log_level: warn - debounce: 1000 - ignore: - dir: - - .git - - node_modules - - frontend - - bin - file: - - .DS_Store - - .gitignore - - .gitkeep - watched_extension: - - "*.go" - git_ignore: true - executes: - - cmd: wails3 task install:frontend:deps - type: once - - cmd: wails3 task dev:frontend - type: background - - cmd: go mod tidy - type: blocking - - cmd: wails3 task build - type: blocking - - cmd: wails3 task run - type: primary diff --git a/build/info.json b/build/info.json deleted file mode 100644 index 985908c88..000000000 --- a/build/info.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "fixed": { - "file_version": "0.1.0" - }, - "info": { - "0000": { - "ProductVersion": "0.1.0", - "CompanyName": "Command Line Inc", - "FileDescription": "Wave Terminal", - "LegalCopyright": "Copyright 2024, Command Line Inc", - "ProductName": "Wave Terminal", - "Comments": "Wave Terminal Application" - } - } -} \ No newline at end of file diff --git a/frontend/app/store/wos.ts b/frontend/app/store/wos.ts index 2f22a6bab..f4f7fee04 100644 --- a/frontend/app/store/wos.ts +++ b/frontend/app/store/wos.ts @@ -3,7 +3,6 @@ // WaveObjectStore -// import { Call as $Call, Events } from "@wailsio/runtime"; import * as jotai from "jotai"; import * as React from "react"; import { atoms, getBackendHostPort, globalStore } from "./global"; diff --git a/go.mod b/go.mod index c9a2267bb..99e317c26 100644 --- a/go.mod +++ b/go.mod @@ -24,5 +24,3 @@ require ( github.com/stretchr/testify v1.8.4 // indirect go.uber.org/atomic v1.7.0 // indirect ) - -replace github.com/wailsapp/wails/v3 => ../wails/v3 diff --git a/package.json b/package.json index 7c9be8eb1..e7dffd9e3 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "@types/uuid": "^9.0.8", "@vitejs/plugin-react": "^4.3.0", "@vitest/coverage-istanbul": "^1.6.0", - "@wailsio/runtime": "^3.0.0-alpha.24", "babel-loader": "^9.1.3", "babel-plugin-jsx-control-statements": "^4.1.2", "copy-webpack-plugin": "^12.0.2", diff --git a/public/index.html b/public/index.html index 5a61918a1..cbba2d098 100644 --- a/public/index.html +++ b/public/index.html @@ -4,14 +4,14 @@ - Wails App + NextWave - +
diff --git a/yarn.lock b/yarn.lock index 3d848c925..b61f6b297 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5629,15 +5629,6 @@ __metadata: languageName: node linkType: hard -"@wailsio/runtime@npm:^3.0.0-alpha.24": - version: 3.0.0-alpha.24 - resolution: "@wailsio/runtime@npm:3.0.0-alpha.24" - dependencies: - nanoid: "npm:^5.0.7" - checksum: 10c0/e43a5dd176d918ff3742cb1ef1bdd7f54eadf392ba02042bb7e9cc0c5482b54c9415ca427887687cff24cf3cdcae7a180df350d2d6883976178e0e101f7e60be - languageName: node - linkType: hard - "@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1": version: 1.12.1 resolution: "@webassemblyjs/ast@npm:1.12.1" @@ -11417,15 +11408,6 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^5.0.7": - version: 5.0.7 - resolution: "nanoid@npm:5.0.7" - bin: - nanoid: bin/nanoid.js - checksum: 10c0/a3fb1c157e3e35378f44e5a7130c70f80c9037f66c9a37285e5e3d8298e8405fcb2399baaa420980b0fe5fd9c2e4186a6a31c3526f21de03cf34c1b459871401 - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -13905,7 +13887,6 @@ __metadata: "@types/uuid": "npm:^9.0.8" "@vitejs/plugin-react": "npm:^4.3.0" "@vitest/coverage-istanbul": "npm:^1.6.0" - "@wailsio/runtime": "npm:^3.0.0-alpha.24" "@xterm/addon-fit": "npm:^0.10.0" "@xterm/xterm": "npm:^5.5.0" babel-loader: "npm:^9.1.3"