Skip to content

Commit c1c2562

Browse files
committed
merge main
2 parents bdff08f + 2783eeb commit c1c2562

110 files changed

Lines changed: 22717 additions & 523 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-helper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ jobs:
5959
run: gem install fpm
6060

6161
# General build dependencies
62-
- uses: actions/setup-go@v5
62+
- uses: actions/setup-go@v6
6363
with:
6464
go-version: ${{env.GO_VERSION}}
6565
cache-dependency-path: |
6666
go.sum
67-
- uses: actions/setup-node@v4
67+
- uses: actions/setup-node@v5
6868
with:
6969
node-version: ${{env.NODE_VERSION}}
7070
- name: Install Yarn

.github/workflows/bump-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
token: ${{ steps.app-token.outputs.token }}
4040

4141
# General build dependencies
42-
- uses: actions/setup-node@v4
42+
- uses: actions/setup-node@v5
4343
with:
4444
node-version: ${{env.NODE_VERSION}}
4545
- name: Install Yarn

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
version: 3.x
7272
repo-token: ${{ secrets.GITHUB_TOKEN }}
7373

74-
- uses: actions/setup-node@v4
74+
- uses: actions/setup-node@v5
7575
with:
7676
node-version: ${{env.NODE_VERSION}}
7777
- name: Install yarn
@@ -80,7 +80,7 @@ jobs:
8080
yarn install
8181
8282
- name: Setup Go
83-
uses: actions/setup-go@v5
83+
uses: actions/setup-go@v6
8484
with:
8585
go-version: ${{env.GO_VERSION}}
8686
cache-dependency-path: |

.github/workflows/deploy-docsite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/checkout@v5
3737
with:
3838
fetch-depth: 0
39-
- uses: actions/setup-node@v4
39+
- uses: actions/setup-node@v5
4040
with:
4141
node-version: ${{env.NODE_VERSION}}
4242
- name: Install Task

.github/workflows/testdriver-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
- uses: actions/checkout@v5
4545

4646
# General build dependencies
47-
- uses: actions/setup-go@v5
47+
- uses: actions/setup-go@v6
4848
with:
4949
go-version: ${{env.GO_VERSION}}
50-
- uses: actions/setup-node@v4
50+
- uses: actions/setup-node@v5
5151
with:
5252
node-version: ${{env.NODE_VERSION}}
5353
- name: Install Yarn

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"gopls": {
6060
"analyses": {
6161
"QF1003": false
62-
}
62+
},
63+
"directoryFilters": ["-tsunami/frontend/scaffold"]
6364
}
6465
}

Taskfile.yml

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,3 +438,90 @@ tasks:
438438
ignore_error: true
439439
- cmd: '{{.RMRF}} "dist"'
440440
ignore_error: true
441+
442+
tsunami:demo:todo:
443+
desc: Run the tsunami todo demo application
444+
cmd: go run demo/todo/*.go
445+
dir: tsunami
446+
env:
447+
TSUNAMI_LISTENADDR: "localhost:12026"
448+
449+
tsunami:frontend:dev:
450+
desc: Run the tsunami frontend vite dev server
451+
cmd: npm run dev
452+
dir: tsunami/frontend
453+
454+
tsunami:frontend:build:
455+
desc: Build the tsunami frontend
456+
cmd: yarn build
457+
dir: tsunami/frontend
458+
459+
tsunami:frontend:devbuild:
460+
desc: Build the tsunami frontend in development mode (with source maps and symbols)
461+
cmd: yarn build:dev
462+
dir: tsunami/frontend
463+
464+
tsunami:scaffold:
465+
desc: Build scaffold for tsunami frontend development
466+
deps:
467+
- tsunami:frontend:build
468+
cmds:
469+
- task: tsunami:scaffold:internal
470+
471+
tsunami:devscaffold:
472+
desc: Build scaffold for tsunami frontend development (with source maps and symbols)
473+
deps:
474+
- tsunami:frontend:devbuild
475+
cmds:
476+
- task: tsunami:scaffold:internal
477+
478+
tsunami:scaffold:internal:
479+
desc: Internal task to create scaffold directory structure
480+
dir: tsunami/frontend
481+
internal: true
482+
cmds:
483+
- cmd: "{{.RMRF}} scaffold"
484+
ignore_error: true
485+
- mkdir scaffold
486+
- cd scaffold && npm --no-workspaces init -y --init-license Apache-2.0
487+
- cd scaffold && npm pkg set name=tsunami-scaffold
488+
- cd scaffold && npm pkg delete author
489+
- cd scaffold && npm pkg set author.name="Command Line Inc"
490+
- cd scaffold && npm pkg set author.email="info@commandline.dev"
491+
- cd scaffold && npm --no-workspaces install tailwindcss @tailwindcss/cli
492+
- cp -r dist scaffold/
493+
- cp ../templates/app-main.go.tmpl scaffold/app-main.go
494+
- cp ../templates/tailwind.css scaffold/
495+
- cp ../templates/gitignore.tmpl scaffold/.gitignore
496+
497+
tsunami:build:
498+
desc: Build the tsunami binary.
499+
cmds:
500+
- cmd: "{{.RM}} bin/tsunami*"
501+
ignore_error: true
502+
- mkdir -p bin
503+
- cd tsunami && go build -ldflags "-X main.BuildTime=$({{.DATE}} +'%Y%m%d%H%M') -X main.TsunamiVersion={{.VERSION}}" -o ../bin/tsunami{{exeExt}} cmd/main-tsunami.go
504+
sources:
505+
- "tsunami/**/*.go"
506+
- "tsunami/go.mod"
507+
- "tsunami/go.sum"
508+
generates:
509+
- "bin/tsunami{{exeExt}}"
510+
511+
tsunami:clean:
512+
desc: Clean tsunami frontend build artifacts
513+
dir: tsunami/frontend
514+
cmds:
515+
- cmd: "{{.RMRF}} dist"
516+
ignore_error: true
517+
- cmd: "{{.RMRF}} scaffold"
518+
ignore_error: true
519+
520+
godoc:
521+
desc: Start the Go documentation server for the root module
522+
cmd: $(go env GOPATH)/bin/pkgsite -http=:6060
523+
524+
tsunami:godoc:
525+
desc: Start the Go documentation server for the tsunami module
526+
cmd: $(go env GOPATH)/bin/pkgsite -http=:6060
527+
dir: tsunami

docs/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,31 @@
3333
"rehype-highlight": "^7.0.2",
3434
"remark-gfm": "^4.0.1",
3535
"remark-typescript-code-import": "^1.0.1",
36-
"sass": "^1.91.0"
36+
"sass": "^1.92.0"
3737
},
3838
"devDependencies": {
3939
"@docusaurus/module-type-aliases": "3.7.0",
4040
"@docusaurus/tsconfig": "3.7.0",
4141
"@docusaurus/types": "3.7.0",
4242
"@eslint/js": "^8.57.0",
43-
"@mdx-js/typescript-plugin": "^0.0.8",
43+
"@mdx-js/typescript-plugin": "^0.1.2",
4444
"@types/eslint": "^9.6.1",
4545
"@types/eslint-config-prettier": "^6.11.3",
4646
"@types/react": "^18.3.0",
4747
"@types/react-dom": "^18.3.0",
4848
"eslint": "^8.57.0",
4949
"eslint-config-prettier": "^10.1.8",
50-
"eslint-plugin-mdx": "^3.1.5",
51-
"prettier": "^3.4.2",
50+
"eslint-plugin-mdx": "^3.6.2",
51+
"prettier": "^3.6.2",
5252
"prettier-plugin-jsdoc": "^1.3.2",
53-
"prettier-plugin-organize-imports": "^4.1.0",
53+
"prettier-plugin-organize-imports": "^4.2.0",
5454
"remark-cli": "^12.0.1",
5555
"remark-frontmatter": "^5.0.0",
5656
"remark-mdx": "^3.1.0",
5757
"remark-preset-lint-consistent": "^6.0.1",
5858
"remark-preset-lint-recommended": "^7.0.1",
5959
"typescript": "^5.9.2",
60-
"typescript-eslint": "^8.39.1"
60+
"typescript-eslint": "^8.43.0"
6161
},
6262
"resolutions": {
6363
"path-to-regexp@npm:2.2.1": "^3",

frontend/app/element/collapsiblemenu.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
}
1010

1111
.collapsible-menu-item {
12-
padding: 10px;
1312
cursor: pointer;
1413
user-select: none;
1514
padding: 0;

frontend/app/element/flyoutmenu.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
.menu-item {
2424
display: flex;
2525
align-items: center;
26+
justify-content: space-between;
2627
padding: 4px 6px;
2728
cursor: pointer;
2829
color: var(--main-text-color);
@@ -33,9 +34,6 @@
3334
letter-spacing: -0.12px;
3435
width: 100%;
3536
border-radius: 2px;
36-
display: flex;
37-
align-items: center;
38-
justify-content: space-between;
3937

4038
.label {
4139
@include mixins.ellipsis();

0 commit comments

Comments
 (0)