more work on tsunami builder (#2534)

Author: sawka

.vscode/settings.json

@@ -60,7 +60,7 @@
         "analyses": {
             "QF1003": false
         },
-        "directoryFilters": ["-tsunami/frontend/scaffold"]
+        "directoryFilters": ["-tsunami/frontend/scaffold", "-dist"]
     },
     "tailwindCSS.lint.suggestCanonicalClasses": "ignore"
 }

Taskfile.yml

@@ -24,6 +24,7 @@ tasks:
         deps:
             - npm:install
             - build:backend
+            - build:tsunamiscaffold
         env:
             WAVETERM_ENVFILE: "{{.ROOT_DIR}}/.env"
             WCLOUD_ENDPOINT: "https://api-dev.waveterm.dev/central"
@@ -115,6 +116,7 @@ tasks:
             - clean
             - npm:install
             - build:backend
+            - build:tsunamiscaffold
 
     build:frontend:dev:
         desc: Build the frontend in development mode.
@@ -299,6 +301,20 @@ tasks:
         cmd: (CGO_ENABLED=0 GOOS={{.GOOS}} GOARCH={{.GOARCH}} go build -ldflags="-s -w -X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.WaveVersion={{.VERSION}}" -o dist/bin/wsh-{{.VERSION}}-{{.GOOS}}.{{.NORMALIZEDARCH}}{{.EXT}} cmd/wsh/main-wsh.go)
         internal: true
 
+    build:tsunamiscaffold:
+        desc: Build and copy tsunami scaffold to dist directory.
+        cmds:
+            - cmd: "{{.RMRF}} dist/tsunamiscaffold"
+              ignore_error: true
+            - task: copyfiles:'tsunami/frontend/scaffold':'dist/tsunamiscaffold'
+        deps:
+            - tsunami:scaffold
+        sources:
+            - "tsunami/frontend/dist/**/*"
+            - "tsunami/templates/**/*"
+        generates:
+            - "dist/tsunamiscaffold/**/*"
+
     generate:
         desc: Generate Typescript bindings for the Go backend.
         cmds:
@@ -513,9 +529,13 @@ tasks:
             - cp ../templates/package.json.tmpl scaffold/package.json
             - cd scaffold && npm install
             - cp -r dist scaffold/
+            - mkdir scaffold/dist/tw
             - cp ../templates/app-main.go.tmpl scaffold/app-main.go
             - cp ../templates/tailwind.css scaffold/
             - cp ../templates/gitignore.tmpl scaffold/.gitignore
+            - cp src/element/*.tsx scaffold/dist/tw/
+            - cp ../ui/*.go scaffold/dist/tw/
+            - cp ../engine/errcomponent.go scaffold/dist/tw/
 
     tsunami:build:
         desc: Build the tsunami binary.

electron-builder.config.cjs

@@ -37,6 +37,7 @@ const config = {
     asarUnpack: [
         "dist/bin/**/*", // wavesrv and wsh binaries
         "dist/schema/**/*", // schema files for Monaco editor
+        "dist/tsunamiscaffold/**/*", // tsunami scaffold files
     ],
     mac: {
         target: [