feat: change text editor

Author: slowrookie

desktop/app.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	jsoniter "github.com/json-iterator/go"
 	"io/ioutil"
 
 	"github.com/slowrookie/redis-web-manager/api"
@@ -86,12 +87,21 @@ func (a *App) NewConnection(con api.Connection) error {
 	return con.New()
 }
 
-func (a *App) CommandConnection(cmd api.Command) ([]interface{}, error) {
+func (a *App) CommandConnection(cmd api.Command) (interface{}, error) {
 	connection, err := api.GetConnection(cmd.ID)
 	if err != nil {
 		return nil, err
 	}
-	return connection.Command(cmd.Commands)
+	ret, err := connection.Command(cmd.Commands)
+	if err != nil {
+		return nil, err
+	}
+	var json = jsoniter.ConfigCompatibleWithStandardLibrary
+	retJson, err := json.Marshal(ret)
+	if err != nil {
+		return nil, err
+	}
+	return string(retJson), nil
 }
 
 func (a *App) ExecutionScript(lua *api.Lua) (*api.Lua, error) {

desktop/go.mod

@@ -3,6 +3,7 @@ module github.com/slowrookie/redis-web-manager
 go 1.18
 
 require (
+	github.com/json-iterator/go v1.1.12
 	github.com/slowrookie/redis-web-manager/api v0.0.0-20220525113429-86ac49708877
 	github.com/stretchr/testify v1.7.1
 	github.com/wailsapp/wails/v2 v2.0.0-beta.37
@@ -26,15 +27,19 @@ require (
 	github.com/leaanthony/slicer v1.6.0 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
+	github.com/samber/lo v1.21.0 // indirect
 	github.com/tkrajina/go-reflector v0.5.6 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
 	github.com/wailsapp/mimetype v1.4.1 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
+	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
 	golang.org/x/net v0.0.0-20220526153639-5463443f8c37 // indirect
 	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 	golang.org/x/text v0.3.7 // indirect

web/craco.config.js

@@ -1,7 +1,14 @@
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+
 module.exports = {
   devServer: {
     devMiddleware: {
-      writeToDisk: true,
+      writeToDisk: false,
     },
   },
+  webpack: {
+    plugins: {
+      add: [new MonacoWebpackPlugin({languages: ['json', 'lua']})]
+    }
+  }
 };

web/package.json

@@ -9,10 +9,6 @@
     "@fluentui/react-icons-mdl2": "^1.2.8",
     "@fluentui/theme-samples": "^8.4.6",
     "@monaco-editor/react": "^4.4.5",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.170",
     "@types/node": "^16.7.13",
     "@types/react": "^17.0.20",
@@ -30,6 +26,13 @@
     "typescript": "^4.4.2",
     "web-vitals": "^2.1.0"
   },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^5.11.4",
+    "@testing-library/react": "^11.1.0",
+    "@testing-library/user-event": "^12.1.10",
+    "@types/jest": "^27.0.1",
+    "monaco-editor-webpack-plugin": "^7.0.1"
+  },
   "scripts": {
     "start": "craco start",
     "build": "craco build && cp -r ./build/** ../desktop/web/build",