From 897b68ea6d6ace3f3308e43ae44211027fbd2af4 Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 01:45:07 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20GO=20=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8C=BA=20#868?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.work.sum | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 go.work.sum diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000000..f8148c881a --- /dev/null +++ b/go.work.sum @@ -0,0 +1,120 @@ +cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= +cloud.google.com/go/errorreporting v0.2.0/go.mod h1:QkYzg92wgpJ0ChLdcO5LhtCEyYwq0tIa+jLrj6Nh5ME= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4= +github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM= +github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/antonlindstrom/pgstore v0.0.0-20220421113606-e3a6e3fed12a/go.mod h1:Sdr/tmSOLEnncCuXS5TwZRxuk7deH1WXVY8cve3eVBM= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw= +github.com/bos-hieu/mongostore v0.0.3/go.mod h1:8AbbVmDEb0yqJsBrWxZIAZOxIfv/tsP8CDtdHduZHGg= +github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c= +github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= +github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= +github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= +github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gofiber/fiber/v2 v2.52.2/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-plugin v1.6.1/go.mod h1:XPHFku2tFo3o3QKFgSYo+cghcUhw1NA1hZyMK0PWAw0= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/iris-contrib/httpexpect/v2 v2.12.1/go.mod h1:7+RB6W5oNClX7PTwJgJnsQP3ZuUUYB3u61KCqeSgZ88= +github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I= +github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw= +github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y= +github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI= +github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= +github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= +github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw= +github.com/labstack/echo/v4 v4.10.0/go.mod h1:S/T/5fy/GigaXnHTkh0ZGe4LpkkQysvRjFMSUTkDRNQ= +github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc= +github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4= +github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= +github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= +github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= +github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= +github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= +github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= +github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk= +github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= +github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/wader/gormstore/v2 v2.0.3/go.mod h1:sr3N3a8F1+PBc3fHoKaphFqDXLRJ9Oe6Yow0HxKFbbg= +github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= +github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0= +github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +golang.org/x/exp/shiny v0.0.0-20230817173708-d852ddb80c63/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI= +gorm.io/gorm v1.25.8/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +moul.io/http2curl/v2 v2.3.0/go.mod h1:RW4hyBjTWSYDOxapodpNEtX0g5Eb16sxklBqmd2RHcE= From ad05385724785ea44393c478977193ddb9f1a5bc Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 01:52:13 +0800 Subject: [PATCH 2/9] #865 --- .github/workflows/cd.yml | 7 ++++--- pnpm-workspace.yaml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 8b416cc8e0..1d47d88eda 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -12,6 +12,7 @@ env: repo_name: "Sillot" repo_owner: "Hi-Windom" package_json: "app/package.json" + pnpm_ws: "pnpm-workspace.yaml" android_gradle_build_output: "build/outputs/apk/action" android_gradle_build_params: "assembleAction -profile --quiet --stacktrace" # android_gradle_build_params: "assembleOfficialAction -profile --quiet --stacktrace" # 多渠道时 @@ -57,11 +58,11 @@ jobs: with: cmd: "jq .sypv ${{ env.package_json }} -r" - - name: 💫 Extract electronVersion from package.json - uses: sergeysova/jq-action@v2 + - name: 💫 Extract electronVersion from pnpm-workspace.yaml + uses: mikefarah/yq@v4 id: electronVersion with: - cmd: "jq .devDependencies.electron ${{ env.package_json }} -r" + cmd: "yq .catalog.electron ${{ env.pnpm_ws }}" - name: 💫 Extract packageManager from package.json uses: sergeysova/jq-action@v2 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 902b98fc47..5ff67facae 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -19,7 +19,7 @@ catalog: typescript: ^5.5.2 react: 18.3.1 react-dom: 18.3.1 - electron: 31.1.0 + electron: 31.1.0 # 在 cd.yml 工作流中需要读取，因此不要用任何版本前缀 electron-builder: 24.9.1 date-fns: ^3.6.0 sofill: ^1.1.10 From 7a021672c12e08b510efeaaa42cf03711bbcb3c8 Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 01:52:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions/Sillot/package.json | 2 +- app/package.json | 2 +- docs/starlight/package.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json index 0d0a248672..024e03c263 100644 --- a/.vscode/extensions/Sillot/package.json +++ b/.vscode/extensions/Sillot/package.json @@ -2,7 +2,7 @@ "name": "sillot", "displayName": "汐洛 Sillot", "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。", - "version": "0.35.24070923-dev2", + "version": "0.35.24070923-dev3", "preview": true, "repository": "https://github.com/Hi-Windom/Sillot", "publisher": "Hi-Windom", diff --git a/app/package.json b/app/package.json index 81d8295807..987d02f8d3 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "sillot", - "version": "0.35.24070923-dev2", + "version": "0.35.24070923-dev3", "syv": "3.1.1", "sypv": "[3.0.16, 3.0.17, 3.1.0]", "description": "Build Your Eternal Digital Garden", diff --git a/docs/starlight/package.json b/docs/starlight/package.json index 80f4099a3c..e282bc6f71 100644 --- a/docs/starlight/package.json +++ b/docs/starlight/package.json @@ -1,7 +1,7 @@ { "name": "starlight", "type": "module", - "version": "0.35.24070923-dev2", + "version": "0.35.24070923-dev3", "scripts": { "test": "echo 'Test your sister day by day'", "dev": "astro dev", diff --git a/package.json b/package.json index f8334bf291..a555f4509e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Sillot-workspace", - "version": "0.35.24070923-dev2", + "version": "0.35.24070923-dev3", "description": "汐洛 pnpm 工作区", "packageManager": "pnpm@9.5.0", "scripts": { From c27ce3ae9351a03e283ea925495cfaa390ef913d Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 01:57:43 +0800 Subject: [PATCH 4/9] #865 --- .github/workflows/cd.yml | 2 +- .vscode/extensions/Sillot/package.json | 2 +- app/package.json | 2 +- docs/starlight/package.json | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 1d47d88eda..cd1bc27cdb 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -97,7 +97,7 @@ jobs: run: | echo "release_title=$(git show --format=%s --no-patch | head -1)" >> $GITHUB_OUTPUT echo "release_version=v${{ steps.version.outputs.value }}_$(TZ=Asia/Shanghai date +'%Y%m%d')_syv${{ steps.syv.outputs.value }}" >> $GITHUB_OUTPUT - changelog1=$(python scripts/parse-changelog-HEAD.py -t ${{ github.ref }} -b ${{ steps.thisLatestRelease.outputs.release }} -e ${{ steps.electronVersion.outputs.value }} ${{ env.repo_owner }}/${{ env.repo_name }}) + changelog1=$(python scripts/parse-changelog-HEAD.py -t ${{ github.ref }} -b ${{ steps.thisLatestRelease.outputs.release }} -e ${{ steps.electronVersion.outputs.result }} ${{ env.repo_owner }}/${{ env.repo_name }}) changelog2=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} ${{ env.repo_owner }}/${{ env.repo_name }}) changelog3=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} ${{ env.repo_owner }}/${{ env.repo_name_android }}) EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64) diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json index 024e03c263..9d51ad0347 100644 --- a/.vscode/extensions/Sillot/package.json +++ b/.vscode/extensions/Sillot/package.json @@ -2,7 +2,7 @@ "name": "sillot", "displayName": "汐洛 Sillot", "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。", - "version": "0.35.24070923-dev3", + "version": "0.35.24070923-dev4", "preview": true, "repository": "https://github.com/Hi-Windom/Sillot", "publisher": "Hi-Windom", diff --git a/app/package.json b/app/package.json index 987d02f8d3..c109094938 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "sillot", - "version": "0.35.24070923-dev3", + "version": "0.35.24070923-dev4", "syv": "3.1.1", "sypv": "[3.0.16, 3.0.17, 3.1.0]", "description": "Build Your Eternal Digital Garden", diff --git a/docs/starlight/package.json b/docs/starlight/package.json index e282bc6f71..06cfc7a202 100644 --- a/docs/starlight/package.json +++ b/docs/starlight/package.json @@ -1,7 +1,7 @@ { "name": "starlight", "type": "module", - "version": "0.35.24070923-dev3", + "version": "0.35.24070923-dev4", "scripts": { "test": "echo 'Test your sister day by day'", "dev": "astro dev", diff --git a/package.json b/package.json index a555f4509e..174f6d5086 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Sillot-workspace", - "version": "0.35.24070923-dev3", + "version": "0.35.24070923-dev4", "description": "汐洛 pnpm 工作区", "packageManager": "pnpm@9.5.0", "scripts": { From 896d5175f4dfca57454d81f88553e92f4315b177 Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 04:23:17 +0800 Subject: [PATCH 5/9] #870 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 174f6d5086..3f294b0e85 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "docs:dev": "pnpm -F ./docs/starlight run dev", "docs:build": "pnpm -F ./docs/starlight run build", "vsce:sillot": "pnpm -F ./.vscode/extensions/Sillot run vsce:package", - "git:proxy": "git config --global http.proxy http://127.0.0.1:7890 && git config --global https.proxy http://127.0.0.1:7890 && echo '7890是 clash for windows 默认端口'", + "git:proxy": "git config --global http.proxy http://127.0.0.1:7897 && git config --global https.proxy http://127.0.0.1:7897 && echo '7897是 Clash Verge 默认端口'", "test": "pnpm -r run test" }, "keywords": [], From 1c0a763cd7a85c15a5c1d38e06f697480c94dabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yingyi=20/=20=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Thu, 11 Jul 2024 09:05:35 +0800 Subject: [PATCH 6/9] :art: Fixed the issue of WebSocket asynchronous initialization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :bug: Fixed the issue where WebSocket broadcast was used before initialization was complete 修复 WebSocket 广播未初始化完成即使用的问题 * :art: Improved broadcast-related APIs 改进广播相关 API --- kernel/api/broadcast.go | 248 +++++++++++++++++++++++----------------- 1 file changed, 145 insertions(+), 103 deletions(-) diff --git a/kernel/api/broadcast.go b/kernel/api/broadcast.go index 3a9ddd147e..976a323ba7 100644 --- a/kernel/api/broadcast.go +++ b/kernel/api/broadcast.go @@ -17,9 +17,9 @@ package api import ( - "fmt" "net/http" "sync" + "time" "github.com/88250/gulu" "github.com/gin-gonic/gin" @@ -37,56 +37,88 @@ var ( BroadcastChannels = sync.Map{} ) -/* -broadcast create a broadcast channel WebSocket connection - -@param - - query.channel: channel name - -@example - - ws://localhost:6806/ws/broadcast?channel=test -*/ +// broadcast create a broadcast channel WebSocket connection +// +// @param +// +// { +// channel: string, // channel name +// } +// +// @example +// +// "ws://localhost:6806/ws/broadcast?channel=test" func broadcast(c *gin.Context) { var ( channel string = c.Query("channel") broadcastChannel *melody.Melody ) - if _broadcastChannel, exist := BroadcastChannels.Load(channel); exist { + _broadcastChannel, exist := BroadcastChannels.Load(channel) + if exist { // channel exists, use it broadcastChannel = _broadcastChannel.(*melody.Melody) - subscribe(c, broadcastChannel, channel) - } else { - // channel not found, create a new one - broadcastChannel := melody.New() - broadcastChannel.Config.MaxMessageSize = 1024 * 1024 * 128 // 128 MiB - BroadcastChannels.Store(channel, broadcastChannel) - subscribe(c, broadcastChannel, channel) - - // broadcast string message to other session - broadcastChannel.HandleMessage(func(s *melody.Session, msg []byte) { - broadcastChannel.BroadcastOthers(msg, s) - }) + if broadcastChannel.IsClosed() { + BroadcastChannels.Delete(channel) + } else { + subscribe(c, broadcastChannel, channel) + return + } + } + initialize(c, channel) +} - // broadcast binary message to other session - broadcastChannel.HandleMessageBinary(func(s *melody.Session, msg []byte) { - broadcastChannel.BroadcastBinaryOthers(msg, s) - }) +// initialize initializes an broadcast session set +func initialize(c *gin.Context, channel string) { + // channel not found, create a new one + broadcastChannel := melody.New() + broadcastChannel.Config.MaxMessageSize = 1024 * 1024 * 128 // 128 MiB - // recycling - broadcastChannel.HandleClose(func(s *melody.Session, status int, reason string) error { - channel := s.Keys["channel"].(string) - logging.LogInfof("close broadcast session in channel [%s] with status code %d: %s", channel, status, reason) + // broadcast string message to other session + broadcastChannel.HandleMessage(func(s *melody.Session, msg []byte) { + broadcastChannel.BroadcastOthers(msg, s) + }) + + // broadcast binary message to other session + broadcastChannel.HandleMessageBinary(func(s *melody.Session, msg []byte) { + broadcastChannel.BroadcastBinaryOthers(msg, s) + }) + + // recycling + broadcastChannel.HandleClose(func(s *melody.Session, status int, reason string) error { + channel := s.Keys["channel"].(string) + logging.LogInfof("close broadcast session in channel [%s] with status code %d: %s", channel, status, reason) + + count := broadcastChannel.Len() + if count == 0 { + BroadcastChannels.Delete(channel) + broadcastChannel.Close() + logging.LogInfof("dispose broadcast channel [%s]", channel) + } + return nil + }) - count := broadcastChannel.Len() - if count == 0 { - BroadcastChannels.Delete(channel) - logging.LogInfof("dispose broadcast channel [%s]", channel) + for { + // Melody Initialization is an asynchronous process, so we need to wait for it to complete + if broadcastChannel.IsClosed() { + time.Sleep(1 * time.Nanosecond) + } else { + _broadcastChannel, loaded := BroadcastChannels.LoadOrStore(channel, broadcastChannel) + __broadcastChannel := _broadcastChannel.(*melody.Melody) + if loaded { + // channel exists + if __broadcastChannel.IsClosed() { + // channel is closed, replace it + BroadcastChannels.Store(channel, broadcastChannel) + __broadcastChannel = broadcastChannel + } else { + // channel is open, close the new one + broadcastChannel.Close() + } } - return nil - }) + subscribe(c, __broadcastChannel, channel) + break + } } } @@ -104,19 +136,26 @@ func subscribe(c *gin.Context, broadcastChannel *melody.Melody, channel string) } } -/* -postMessage send string message to a broadcast channel - -@param - - body.channel: channel name - body.message: message payload - -@returns - - body.data.channel.name: channel name - body.data.channel.count: indicate how many websocket session received the message -*/ +// postMessage send string message to a broadcast channel +// @param +// +// { +// channel: string // channel name +// message: string // message payload +// } +// +// @returns +// +// { +// code: int, +// msg: string, +// data: { +// channel: { +// name: string, //channel name +// count: string, //listener count +// }, +// }, +// } func postMessage(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) @@ -126,16 +165,14 @@ func postMessage(c *gin.Context) { return } - channel := arg["channel"].(string) message := arg["message"].(string) + channel := &Channel{ + Name: arg["channel"].(string), + Count: 0, + } - if _broadcastChannel, ok := BroadcastChannels.Load(channel); !ok { - err := fmt.Errorf("broadcast channel [%s] not found", channel) - logging.LogWarnf(err.Error()) - - ret.Code = -1 - ret.Msg = err.Error() - return + if _broadcastChannel, ok := BroadcastChannels.Load(channel.Name); !ok { + channel.Count = 0 } else { var broadcastChannel = _broadcastChannel.(*melody.Melody) if err := broadcastChannel.Broadcast([]byte(message)); nil != err { @@ -146,27 +183,33 @@ func postMessage(c *gin.Context) { return } - count := broadcastChannel.Len() - ret.Data = map[string]interface{}{ - "channel": &Channel{ - Name: channel, - Count: count, - }, - } + channel.Count = broadcastChannel.Len() + } + ret.Data = map[string]interface{}{ + "channel": channel, } } -/* -getChannelInfo gets the information of a broadcast channel - -@param - - body.name: channel name - -@returns - - body.data.channel: the channel information -*/ +// getChannelInfo gets the information of a broadcast channel +// +// @param +// +// { +// name: string, // channel name +// } +// +// @returns +// +// { +// code: int, +// msg: string, +// data: { +// channel: { +// name: string, //channel name +// count: string, //listener count +// }, +// }, +// } func getChannelInfo(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) @@ -176,38 +219,37 @@ func getChannelInfo(c *gin.Context) { return } - name := arg["name"].(string) - - if _broadcastChannel, ok := BroadcastChannels.Load(name); !ok { - err := fmt.Errorf("broadcast channel [%s] not found", name) - logging.LogWarnf(err.Error()) + channel := &Channel{ + Name: arg["name"].(string), + Count: 0, + } - ret.Code = -1 - ret.Msg = err.Error() - return + if _broadcastChannel, ok := BroadcastChannels.Load(channel.Name); !ok { + channel.Count = 0 } else { var broadcastChannel = _broadcastChannel.(*melody.Melody) + channel.Count = broadcastChannel.Len() + } - count := broadcastChannel.Len() - ret.Data = map[string]interface{}{ - "channel": &Channel{ - Name: name, - Count: count, - }, - } + ret.Data = map[string]interface{}{ + "channel": channel, } } -/* -getChannels gets the channel name and lintener number of all broadcast chanel - -@returns - - body.data.channels: { - name: channel name - count: listener count - }[] -*/ +// getChannels gets the channel name and lintener number of all broadcast chanel +// +// @returns +// +// { +// code: int, +// msg: string, +// data: { +// channels: { +// name: string, //channel name +// count: string, //listener count +// }[], +// }, +// } func getChannels(c *gin.Context) { ret := gulu.Ret.NewResult() defer c.JSON(http.StatusOK, ret) From 546ecd87df21d050fed85963c7d4826342424f66 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 11 Jul 2024 09:48:36 +0800 Subject: [PATCH 7/9] :art: Improve database text field exporting https://github.com/siyuan-note/siyuan/issues/11945 --- kernel/model/export.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/kernel/model/export.go b/kernel/model/export.go index c70087b142..660e238739 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -21,7 +21,6 @@ import ( "encoding/csv" "errors" "fmt" - "github.com/88250/pdfcpu/pkg/font" "net/http" "net/url" "os" @@ -38,9 +37,11 @@ import ( "github.com/88250/lute/ast" "github.com/88250/lute/editor" "github.com/88250/lute/html" + "github.com/88250/lute/lex" "github.com/88250/lute/parse" "github.com/88250/lute/render" "github.com/88250/pdfcpu/pkg/api" + "github.com/88250/pdfcpu/pkg/font" "github.com/88250/pdfcpu/pkg/pdfcpu" "github.com/emirpasic/gods/sets/hashset" "github.com/emirpasic/gods/stacks/linkedliststack" @@ -2216,7 +2217,8 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold bool, mdTableHead.AppendChild(mdTableHeadRow) for _, col := range table.Columns { cell := &ast.Node{Type: ast.NodeTableCell} - cell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(col.Name)}) + name := string(lex.EscapeProtyleMarkers([]byte(col.Name))) + cell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(name)}) mdTableHeadRow.AppendChild(cell) } @@ -2229,7 +2231,19 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold bool, mdTableRow.AppendChild(mdTableCell) var val string if nil != cell.Value { - if av.KeyTypeDate == cell.Value.Type { + if av.KeyTypeText == cell.Value.Type { + if nil != cell.Value.Text { + // 文本字段需要替换换行符并转义标记符 https://github.com/siyuan-note/siyuan/issues/11945 + val = cell.Value.Text.Content + val = string(lex.EscapeProtyleMarkers([]byte(val))) + lines := strings.Split(val, "\n") + for _, line := range lines { + mdTableCell.AppendChild(&ast.Node{Type: ast.NodeText, Tokens: []byte(line)}) + mdTableCell.AppendChild(&ast.Node{Type: ast.NodeHardBreak}) + } + continue + } + } else if av.KeyTypeDate == cell.Value.Type { if nil != cell.Value.Date { cell.Value.Date = av.NewFormattedValueDate(cell.Value.Date.Content, cell.Value.Date.Content2, av.DateFormatNone, cell.Value.Date.IsNotTime, cell.Value.Date.HasEndDate) } From 00e255511f373866bd5a743b649697b60ac36015 Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 10:02:30 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B5=B7=E6=96=87?= =?UTF-8?q?=E4=B8=9C=20Github=20=E6=A0=87=E7=AD=BE=E6=96=B0=E6=A0=87?= =?UTF-8?q?=E5=87=86=20#869?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions/Sillot/package.json | 2 +- app/package.json | 2 +- docs/starlight/package.json | 2 +- package.json | 2 +- scripts/_pkg/Const.py | 19 ++++++++++--------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json index 9d51ad0347..a125f1946d 100644 --- a/.vscode/extensions/Sillot/package.json +++ b/.vscode/extensions/Sillot/package.json @@ -2,7 +2,7 @@ "name": "sillot", "displayName": "汐洛 Sillot", "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。", - "version": "0.35.24070923-dev4", + "version": "0.35.24070923-dev5", "preview": true, "repository": "https://github.com/Hi-Windom/Sillot", "publisher": "Hi-Windom", diff --git a/app/package.json b/app/package.json index c109094938..85689793d7 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "sillot", - "version": "0.35.24070923-dev4", + "version": "0.35.24070923-dev5", "syv": "3.1.1", "sypv": "[3.0.16, 3.0.17, 3.1.0]", "description": "Build Your Eternal Digital Garden", diff --git a/docs/starlight/package.json b/docs/starlight/package.json index 06cfc7a202..750714cb9c 100644 --- a/docs/starlight/package.json +++ b/docs/starlight/package.json @@ -1,7 +1,7 @@ { "name": "starlight", "type": "module", - "version": "0.35.24070923-dev4", + "version": "0.35.24070923-dev5", "scripts": { "test": "echo 'Test your sister day by day'", "dev": "astro dev", diff --git a/package.json b/package.json index 3f294b0e85..210dd7a671 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Sillot-workspace", - "version": "0.35.24070923-dev4", + "version": "0.35.24070923-dev5", "description": "汐洛 pnpm 工作区", "packageManager": "pnpm@9.5.0", "scripts": { diff --git a/scripts/_pkg/Const.py b/scripts/_pkg/Const.py index de7d73fbc1..2f2c2d6a2e 100644 --- a/scripts/_pkg/Const.py +++ b/scripts/_pkg/Const.py @@ -1,13 +1,14 @@ +# 海文东标准 docmap_sillot = { - "Feature": "引入特性 | Feature", - "Enhancement": "改进功能 | Enhancement", - "Bug": "修复错误 | Bugfix", - "Security": "安全相关 | Security", - "Document": "文档相关 | Document", - "Refactor": "开发重构 | Refactor", - "Abolishment": "移除废止 | Abolishment", - "Shinning": "闪亮之名 | Shinning", - "VSCE": "VSCode 扩展相关 | VSCE", + "- - - Abolishment ❌": "移除废止 ❌", + "- - - Assess 🛸": "评估调研 🛸", + "- - - Bug 🩸": "修复错误 🩸", + "- - - Enhancement 🎢": "改进优化 🎢", + "- - - Ext 🧩": "插件扩展 🧩", + "- - - Feature 🧮": "功能特性 🧮", + "- - - Refactor ♻️": "破坏重构 ♻️", + "- - - Security ☢️": "安全更新 ☢️", + "- - - Shinning 🍭": "闪亮之名 🍭", } # 仅关注核心部分 docmap_siyuan = { From 14837408b00877a60cc9950976f75d8b2db79574 Mon Sep 17 00:00:00 2001 From: Soltus Date: Thu, 11 Jul 2024 10:09:55 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions/Sillot/package.json | 2 +- app/package.json | 2 +- docs/starlight/package.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json index a125f1946d..2bad4181f9 100644 --- a/.vscode/extensions/Sillot/package.json +++ b/.vscode/extensions/Sillot/package.json @@ -2,7 +2,7 @@ "name": "sillot", "displayName": "汐洛 Sillot", "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。", - "version": "0.35.24070923-dev5", + "version": "0.35.24071110", "preview": true, "repository": "https://github.com/Hi-Windom/Sillot", "publisher": "Hi-Windom", diff --git a/app/package.json b/app/package.json index 85689793d7..59aaf11c7d 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "sillot", - "version": "0.35.24070923-dev5", + "version": "0.35.24071110", "syv": "3.1.1", "sypv": "[3.0.16, 3.0.17, 3.1.0]", "description": "Build Your Eternal Digital Garden", diff --git a/docs/starlight/package.json b/docs/starlight/package.json index 750714cb9c..a5a157461c 100644 --- a/docs/starlight/package.json +++ b/docs/starlight/package.json @@ -1,7 +1,7 @@ { "name": "starlight", "type": "module", - "version": "0.35.24070923-dev5", + "version": "0.35.24071110", "scripts": { "test": "echo 'Test your sister day by day'", "dev": "astro dev", diff --git a/package.json b/package.json index 210dd7a671..f3c44a1ae2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Sillot-workspace", - "version": "0.35.24070923-dev5", + "version": "0.35.24071110", "description": "汐洛 pnpm 工作区", "packageManager": "pnpm@9.5.0", "scripts": {