Skip to content

Commit

Permalink
Merge pull request #867 from Hi-Windom/v0.35
Browse files Browse the repository at this point in the history
V0.35
  • Loading branch information
Soltus authored Jul 10, 2024
2 parents 29b7f12 + 3f3e768 commit 3911ae3
Show file tree
Hide file tree
Showing 20 changed files with 290 additions and 471 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,19 @@ jobs:

- name: 🔨 Install Node pnpm
run: npm install -g ${{ needs.create_release.outputs.packageManager }}
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}/app
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}

- name: ✍️ Change NPMRC File
run: pnpm config set registry https://registry.npmjs.org/ --location project
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}/app
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}

- name: 🚀 Install Node Dependencies
run: ${{ needs.create_release.outputs.actionInstallCommand }}
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}/app
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}

- name: 🔥 Building UI
run: pnpm run build
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}/app
run: pnpm run app:build
working-directory: ${{ github.workspace }}/${{ env.repo_owner }}/${{ env.repo_name }}

- name: 🗑️ Remove Build Directory
uses: K-Sillot/rm@master
Expand Down
4 changes: 4 additions & 0 deletions .vscode/Sillot.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@
}
],
"settings": {
// 非工作区设置,需要在用户设置中修改 ::开始
"workbench.experimental.enableNewProfilesUI": true, // since vscode 1.91.0
"rust-analyzer.cargo.features": ["__runtime_js_sources"], // https://docs.deno.com/runtime/manual/references/contributing/
// 非工作区设置,需要在用户设置中修改 ::结束
"files.associations": {
// "*.sy": "json",
"*.tmTheme": "xml",
Expand Down Expand Up @@ -94,6 +97,7 @@
"**/.history": true
},
// 实验性设置
"scm.experimental.showHistoryGraph": true, // since vscode 1.91.0
"notebook.experimental.remoteSave": true,
"markdown.experimental.updateLinksOnPaste": true,
// CodeGeeX 智能编程助手设置
Expand Down
18 changes: 9 additions & 9 deletions .vscode/extensions/Sillot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "sillot",
"displayName": "汐洛 Sillot",
"description": "汐洛彖夲肜矩阵(Sillot T☳Converbenk Matrix)为智慧新彖务服务。此插件为汐洛官方插件,提供多功能一体化集成。",
"version": "0.35.24070922",
"version": "0.35.24070923-dev2",
"preview": true,
"repository": "https://github.com/Hi-Windom/Sillot",
"publisher": "Hi-Windom",
Expand Down Expand Up @@ -436,9 +436,9 @@
"b:check": "biome check ./src --config-path ../../ --diagnostic-level error --apply && echo 'ref https://biomejs.dev/reference/cli/#biome-check'"
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"@types/fs-extra": "catalog:",
"@types/mocha": "^10.0.6",
"@types/node": "~20.14.8",
"@types/node": "catalog:",
"@types/vscode": "^1.90.0",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
Expand All @@ -450,17 +450,17 @@
"jsonc-parser": "^3.2.1",
"mkdirp": "^3.0.1",
"rimraf": "^5.0.7",
"sofill": "^1.1.10",
"sofill": "catalog:",
"ts-loader": "^9.5.1",
"typescript": "^5.5.2",
"webpack": "^5.91.0",
"webpack-cli": "^5.1.4"
"typescript": "catalog:",
"webpack": "catalog:",
"webpack-cli": "catalog:"
},
"dependencies": {
"@octokit/rest": "^20.1.1",
"@vscode/webview-ui-toolkit": "^1.4.0",
"fs-extra": "^11.2.0",
"fs-extra": "catalog:",
"json5": "^2.2.3"
},
"packageManager": "pnpm@9.4.0"
"packageManager": "pnpm@9.5.0"
}
43 changes: 21 additions & 22 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "sillot",
"version": "0.35.24070922",
"syv": "3.1.0",
"sypv": "[3.0.16, 3.0.17]",
"version": "0.35.24070923-dev2",
"syv": "3.1.1",
"sypv": "[3.0.16, 3.0.17, 3.1.0]",
"description": "Build Your Eternal Digital Garden",
"homepage": "https://sillot.db.sc.cn",
"repository": "https://github.com/Hi-Windom/Sillot",
Expand All @@ -11,7 +11,7 @@
"node": ">=20.11.1",
"pnpm": ">=9.1.0"
},
"packageManager": "pnpm@9.4.0",
"packageManager": "pnpm@9.5.0",
"actionInstallCommand": "pnpm install --no-frozen-lockfile",
"scripts": {
"test": "echo 'Test your sister day by day'",
Expand Down Expand Up @@ -87,9 +87,9 @@
"@electron-forge/cli": "^7.4.0",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.20",
"@mui/joy": "5.0.0-beta.36",
"@mui/material": "^5.15.20",
"@mui/icons-material": "catalog:",
"@mui/joy": "catalog:",
"@mui/material": "catalog:",
"@rollup/plugin-babel": "^6.0.4",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-json": "^6.1.0",
Expand All @@ -99,9 +99,9 @@
"@simonwep/pickr": "^1.9.0",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.0",
"@types/node": "^20.14.8",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/node": "catalog:",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@wixc3/react-board": "^2.5.0",
"babel-loader": "^9.1.3",
"brace": "^0.11.1",
Expand All @@ -110,16 +110,16 @@
"concurrently": "^8.2.2",
"css-loader": "^7.1.1",
"csstype": "^3.1.3",
"date-fns": "^3.6.0",
"date-fns": "catalog:",
"ejs": "^3.1.10",
"electron": "31.1.0",
"electron-builder": "24.9.1",
"electron": "catalog:",
"electron-builder": "catalog:",
"electron-reloader": "^1.2.3",
"encoding": "^0.1.13",
"esbuild": "^0.21.5",
"esbuild-loader": "^4.2.0",
"file-loader": "^6.2.0",
"fs-extra": "^11.2.0",
"fs-extra": "catalog:",
"html-loader": "^5.0.0",
"html-webpack-plugin": "^5.6.0",
"ifdef-loader": "^2.3.2",
Expand All @@ -129,33 +129,32 @@
"monaco-editor-webpack-plugin": "^7.1.0",
"path-browserify": "^1.0.1",
"postcss": "^8.4.38",
"react": "18.3.1",
"react-dom": "18.3.1",
"react": "catalog:",
"react-dom": "catalog:",
"react-hot-toast": "^2.4.1",
"react-jinke-music-player": "^4.24.2",
"react-spinners": "^0.13.8",
"react-toastify": "^10.0.5",
"rollup": "^4.18.0",
"rollup": "catalog:",
"rollup-plugin-import-css": "^3.5.0",
"rollup-plugin-postcss": "^4.0.2",
"rxjs": "^7.8.1",
"safer-buffer": "^2.1.2",
"sass": "^1.77.6",
"sass-loader": "^14.1.1",
"socket.io": "^4.7.5",
"sofill": "^1.1.10",
"sout": "^1.1.0",
"sofill": "catalog:",
"style-loader": "^4.0.0",
"sweetalert2": "^11.12.0",
"terser-webpack-plugin": "^5.3.10",
"ts-jest": "^29.1.2",
"ts-loader": "^9.5.1",
"tslib": "^2.6.2",
"typescript": "^5.5.2",
"typescript": "catalog:",
"vconsole": "^3.15.1",
"webpack": "^5.92.1",
"webpack": "catalog:",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4"
"webpack-cli": "catalog:"
},
"dependencies": {
"@electron/remote": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion app/stage/protyle/js/lute/lute.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions docs/starlight/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "starlight",
"type": "module",
"version": "0.35.24070922",
"version": "0.35.24070923-dev2",
"scripts": {
"test": "echo 'Test your sister day by day'",
"dev": "astro dev",
Expand All @@ -19,12 +19,12 @@
"@astrojs/check": "^0.7.0",
"@astrojs/starlight": "0.24.4",
"@lorenzo_lewis/starlight-utils": "^0.1.1",
"@types/node": "^20.14.8",
"@types/node": "catalog:",
"@vercel/speed-insights": "^1.0.12",
"astro": "^4.11.0",
"sass": "^1.77.6",
"starlight-links-validator": "^0.9.0",
"typescript": "^5.5.2"
"typescript": "catalog:"
},
"packageManager": "pnpm@9.4.0"
"packageManager": "pnpm@9.5.0"
}
5 changes: 5 additions & 0 deletions go.work
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
go 1.22.2

use (
./kernel
)
33 changes: 15 additions & 18 deletions kernel/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02
github.com/88250/lute v1.7.7-0.20240702084201-ee02f916d4a8
github.com/88250/lute v1.7.7-0.20240710135739-2bd32b79b676
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
Expand All @@ -37,7 +37,7 @@ require (
github.com/gin-gonic/gin v1.10.0
github.com/go-ole/go-ole v1.3.0
github.com/goccy/go-json v0.10.3
github.com/gofrs/flock v0.10.0
github.com/gofrs/flock v0.12.0
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/gorilla/css v1.0.1
github.com/gorilla/websocket v1.5.3
Expand All @@ -55,9 +55,9 @@ require (
github.com/radovskyb/watcher v1.0.7
github.com/rqlite/sql v0.0.0-20240312185922-ffac88a740bd
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
github.com/sashabaranov/go-openai v1.26.1
github.com/sashabaranov/go-openai v1.26.2
github.com/shirou/gopsutil/v3 v3.24.5
github.com/siyuan-note/dejavu v0.0.0-20240626145351-e4f9b0821aaf
github.com/siyuan-note/dejavu v0.0.0-20240710114654-4025d0084e9d
github.com/siyuan-note/eventbus v0.0.0-20240627125516-396fdb0f0f97
github.com/siyuan-note/filelock v0.0.0-20240629145917-7545564cf0a4
github.com/siyuan-note/httpclient v0.0.0-20240626145026-29585d45a51c
Expand All @@ -72,31 +72,29 @@ require (
github.com/xuri/excelize/v2 v2.8.1
golang.org/x/image v0.18.0
golang.org/x/mobile v0.0.0-20240520174638-fa72addaaa1b
golang.org/x/mod v0.18.0
golang.org/x/mod v0.19.0
golang.org/x/text v0.16.0
golang.org/x/time v0.5.0
)

require (
dmitri.shuralyov.com/font/woff2 v0.0.0-20180220214647-957792cbbdab // indirect
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/JalfResi/justext v0.0.0-20221106200834-be571e3e3052 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/advancedlogic/GoOse v0.0.0-20231203033844-ae6b36caf275 // indirect
github.com/alecthomas/chroma v0.10.0 // indirect
github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect
github.com/aws/aws-sdk-go v1.54.11 // indirect
github.com/aws/aws-sdk-go v1.54.17 // indirect
github.com/bytedance/sonic v1.11.9 // indirect
github.com/bytedance/sonic/loader v0.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cloudflare/circl v1.3.9 // indirect
github.com/cloudwego/base64x v0.1.4 // indirect
github.com/cloudwego/iasm v0.2.0 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/dlclark/regexp2 v1.11.1 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/set v0.2.1 // indirect
Expand All @@ -108,7 +106,7 @@ require (
github.com/go-resty/resty/v2 v2.13.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/golang/glog v1.2.1 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/google/pprof v0.0.0-20240625030939-27f56978b8b0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gopherjs/gopherjs v1.17.2 // indirect
Expand All @@ -130,7 +128,6 @@ require (
github.com/leodido/go-urn v1.4.0 // indirect
github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5 // indirect
github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -144,10 +141,10 @@ require (
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/qiniu/go-sdk/v7 v7.21.1 // indirect
github.com/qiniu/go-sdk/v7 v7.20.2 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.45.1 // indirect
github.com/refraction-networking/utls v1.6.6 // indirect
github.com/refraction-networking/utls v1.6.7 // indirect
github.com/restic/chunker v0.4.0 // indirect
github.com/richardlehane/mscfb v1.0.4 // indirect
github.com/richardlehane/msoleps v1.0.3 // indirect
Expand All @@ -167,12 +164,12 @@ require (
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/arch v0.8.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 3911ae3

Please sign in to comment.