update all gopkg imports (#330)

This commit is contained in:
Mike Sawka
2024-09-05 14:25:45 -07:00
committed by GitHub
parent a5f563b52d
commit 8ad84fd78a
73 changed files with 270 additions and 270 deletions
+9 -9
View File
@@ -9,11 +9,11 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/gogen" "github.com/wavetermdev/waveterm/pkg/gogen"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
const WshClientFileName = "pkg/wshrpc/wshclient/wshclient.go" const WshClientFileName = "pkg/wshrpc/wshclient/wshclient.go"
@@ -24,10 +24,10 @@ func GenerateWshClient() {
fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName) fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName)
var buf strings.Builder var buf strings.Builder
gogen.GenerateBoilerplate(&buf, "wshclient", []string{ gogen.GenerateBoilerplate(&buf, "wshclient", []string{
"github.com/wavetermdev/thenextwave/pkg/wshutil", "github.com/wavetermdev/waveterm/pkg/wshutil",
"github.com/wavetermdev/thenextwave/pkg/wshrpc", "github.com/wavetermdev/waveterm/pkg/wshrpc",
"github.com/wavetermdev/thenextwave/pkg/waveobj", "github.com/wavetermdev/waveterm/pkg/waveobj",
"github.com/wavetermdev/thenextwave/pkg/wconfig", "github.com/wavetermdev/waveterm/pkg/wconfig",
}) })
wshDeclMap := wshrpc.GenerateWshCommandDeclMap() wshDeclMap := wshrpc.GenerateWshCommandDeclMap()
for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) { for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) {
+4 -4
View File
@@ -10,10 +10,10 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/tsgen" "github.com/wavetermdev/waveterm/pkg/tsgen"
"github.com/wavetermdev/thenextwave/pkg/util/utilfn" "github.com/wavetermdev/waveterm/pkg/util/utilfn"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
func generateTypesFile(tsTypesMap map[reflect.Type]string) error { func generateTypesFile(tsTypesMap map[reflect.Type]string) error {
+18 -18
View File
@@ -17,24 +17,24 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/wavetermdev/thenextwave/pkg/authkey" "github.com/wavetermdev/waveterm/pkg/authkey"
"github.com/wavetermdev/thenextwave/pkg/blockcontroller" "github.com/wavetermdev/waveterm/pkg/blockcontroller"
"github.com/wavetermdev/thenextwave/pkg/filestore" "github.com/wavetermdev/waveterm/pkg/filestore"
"github.com/wavetermdev/thenextwave/pkg/service" "github.com/wavetermdev/waveterm/pkg/service"
"github.com/wavetermdev/thenextwave/pkg/telemetry" "github.com/wavetermdev/waveterm/pkg/telemetry"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wcloud" "github.com/wavetermdev/waveterm/pkg/wcloud"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wcore" "github.com/wavetermdev/waveterm/pkg/wcore"
"github.com/wavetermdev/thenextwave/pkg/web" "github.com/wavetermdev/waveterm/pkg/web"
"github.com/wavetermdev/thenextwave/pkg/wps" "github.com/wavetermdev/waveterm/pkg/wps"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshserver" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshserver"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
"github.com/wavetermdev/thenextwave/pkg/wstore" "github.com/wavetermdev/waveterm/pkg/wstore"
) )
// these are set at build time // these are set at build time
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/wavetermdev/thenextwave/pkg/vdom" "github.com/wavetermdev/waveterm/pkg/vdom"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func Page(ctx context.Context, props map[string]any) any { func Page(ctx context.Context, props map[string]any) any {
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/remote" "github.com/wavetermdev/waveterm/pkg/remote"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var connCmd = &cobra.Command{ var connCmd = &cobra.Command{
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"os" "os"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshremote" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshremote"
) )
var serverCmd = &cobra.Command{ var serverCmd = &cobra.Command{
+1 -1
View File
@@ -5,7 +5,7 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var deleteBlockCmd = &cobra.Command{ var deleteBlockCmd = &cobra.Command{
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var editMagnified bool var editMagnified bool
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"encoding/json" "encoding/json"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var getMetaCmd = &cobra.Command{ var getMetaCmd = &cobra.Command{
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
func init() { func init() {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
var WshBinDir = ".waveterm/bin" var WshBinDir = ".waveterm/bin"
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"encoding/base64" "encoding/base64"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var readFileCmd = &cobra.Command{ var readFileCmd = &cobra.Command{
+4 -4
View File
@@ -16,10 +16,10 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
"github.com/wavetermdev/thenextwave/pkg/wshutil" "github.com/wavetermdev/waveterm/pkg/wshutil"
) )
var ( var (
+3 -3
View File
@@ -5,9 +5,9 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wconfig" "github.com/wavetermdev/waveterm/pkg/wconfig"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var setConfigCmd = &cobra.Command{ var setConfigCmd = &cobra.Command{
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var setMetaCmd = &cobra.Command{ var setMetaCmd = &cobra.Command{
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/util/shellutil" "github.com/wavetermdev/waveterm/pkg/util/shellutil"
) )
func init() { func init() {
+3 -3
View File
@@ -5,9 +5,9 @@ package cmd
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var sshCmd = &cobra.Command{ var sshCmd = &cobra.Command{
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/thenextwave/pkg/wshrpc/wshclient" "github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
) )
var termMagnified bool var termMagnified bool
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/wavebase" "github.com/wavetermdev/waveterm/pkg/wavebase"
) )
func init() { func init() {
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/wavetermdev/thenextwave/pkg/waveobj" "github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/thenextwave/pkg/wshrpc" "github.com/wavetermdev/waveterm/pkg/wshrpc"
) )
var viewMagnified bool var viewMagnified bool

Some files were not shown because too many files have changed in this diff Show More