From 4b3fd330ffe6bb11dd9c3677b12f87931207a348 Mon Sep 17 00:00:00 2001 From: tiye Date: Wed, 17 Jan 2024 15:47:30 +0800 Subject: [PATCH 1/3] fix image displaying in large monitor --- .DS_Store | Bin 0 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d1661fae0eb5befc972d9d8d23c74e701221db21 GIT binary patch literal 6148 zcmeHKziSjh6#nL1lhZ^@f`vtdt?U${jpZ8FLfg|$NIWkj%AFf>cZG$pwKjtPf*{dC zEK;OaD=icR8!=i~Dfln=y_xZRb9)<7iO9TT=9_&#=DqoLcjgv=Ssr$lfH?q7Ho@d5 zy9pw8X%%UB%_7mr9NqP$*3F`~S@DdD$UtP^Ut~bu-2`W`j$0T6@9)g}7uwb<^1R(G z+SE0_4fa0W*m-?1w0HKkZ*Hi);lx9RV)}PpY+#6XkR8d7s)w%O_`UC6KW@L28ph`7 z6@MzJ_X_H<`yYAekcIvj4~?B`%rUa*8m>P&b>Z{2=fTJ7?33(4-o_VBjl)>O9SpFA zyCDas^U$hu-+wY%zlzt{Cwm0>u`2neaGR?>gMxP z!eMM?&f_y1|Ak^~cIs2>4wE^IePkdq5HfJcUCzn*f2scaKMaajk%7p-f5m`F@>agg zCHb?pvN$+7NdBIJN^hichjxp)HjGG4ohDq=pjz2v{0o7a91g4EzEI CZ1q9_ literal 0 HcmV?d00001 From 4a4bb8d05737c44e8e4e73f7eb5606e822f1e04d Mon Sep 17 00:00:00 2001 From: tiye Date: Wed, 27 Nov 2024 14:00:03 +0800 Subject: [PATCH 2/3] upgrade deps; hide mudder --- calcit.cirru | 19 -------------- compact.cirru | 1 - package.cirru => deps.cirru | 3 ++- package.json | 10 +++---- yarn.lock | 52 ++++++++++++++++++------------------- 5 files changed, 33 insertions(+), 52 deletions(-) rename package.cirru => deps.cirru (76%) diff --git a/calcit.cirru b/calcit.cirru index 145370c..2e50864 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -723,25 +723,6 @@ :data $ {} |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:link) |j $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text "|\"https://repo.tiye.me/mvc-works/edn-formatter/") - |d $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |{}) - |j $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:name) - |j $ %{} :Leaf (:at 1668768486415) (:by |rJG4IHzWf) (:text "|\"Mudder") - |r $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:key) - |j $ %{} :Leaf (:at 1668768490603) (:by |rJG4IHzWf) (:text |:mudder) - |v $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:icon) - |j $ %{} :Leaf (:at 1668768515507) (:by |rJG4IHzWf) (:text |nil) - |x $ %{} :Expr (:at 1583948960708) (:by |rJG4IHzWf) - :data $ {} - |T $ %{} :Leaf (:at 1583948960708) (:by |rJG4IHzWf) (:text |:link) - |j $ %{} :Leaf (:at 1668768505217) (:by |rJG4IHzWf) (:text "|\"https://r.tiye.me/worktools/mudder/") |j $ %{} :Expr (:at 1536070994799) (:by |rJG4IHzWf) :data $ {} |T $ %{} :Leaf (:at 1536070995461) (:by |rJG4IHzWf) (:text |{}) diff --git a/compact.cirru b/compact.cirru index e606288..bb249b3 100644 --- a/compact.cirru +++ b/compact.cirru @@ -112,7 +112,6 @@ def quick-apps $ [] {} (:name "\"Tiye Index") (:key :edn-formatter) (:icon nil) (:link "\"https://fx.nioint.com/pages/tiye-index/") {} (:name "\"EDN Formatter") (:key :edn-formatter) (:icon "\"edn-formatter.png") (:link "\"https://repo.tiye.me/mvc-works/edn-formatter/") - {} (:name "\"Mudder") (:key :mudder) (:icon nil) (:link "\"https://r.tiye.me/worktools/mudder/") {} (:name "\"Copyboard") (:key :copyboard) (:icon "\"copyboard.png") (:link "\"http://cp.topix.im") {} (:name "\"Diff view") (:key :diffview) (:icon "\"diffview.png") (:link "\"http://r.tiye.me/Memkits/diffview/") {} (:name "\"Timegrass") (:key :timegrass) (:icon "\"timegrass.png") (:link "\"http://timegrass.topix.im/") diff --git a/package.cirru b/deps.cirru similarity index 76% rename from package.cirru rename to deps.cirru index 6647dde..9344ee9 100644 --- a/package.cirru +++ b/deps.cirru @@ -1,9 +1,10 @@ {} + :calcit-version |0.9.6 :dependencies $ {} |calcit-lang/lilac |main |calcit-lang/memof |main - |Respo/respo.calcit |0.16.3 + |Respo/respo.calcit |0.16.12 |Respo/reel.calcit |main |Respo/respo-markdown.calcit |main |Respo/respo-ui.calcit |main diff --git a/package.json b/package.json index 0f97dbc..fa396e3 100644 --- a/package.json +++ b/package.json @@ -4,14 +4,14 @@ "description": "ClojureScript workflow using Calcit Editor", "main": "index.js", "scripts": { - "watch-ssr": "cr --entry ssr --emit-path ssr-out/ --emit-js", - "compile-ssr": "cr --entry ssr --emit-path ssr-out/ --emit-js -1", + "watch-ssr": "cr --entry ssr --emit-path ssr-out/ js", + "compile-ssr": "cr --entry ssr --emit-path ssr-out/ js -1", "ssr": "yarn compile-ssr && node ssr.mjs", "get-fonts": "cd dist && wget --recursive http://cdn.tiye.me/favored-fonts/main-fonts.css -q --show-progress", "get-logos": "cd dist && wget --recursive wget -r http://cdn.tiye.me/logo/ --no-parent -q --show-progress", "get2": "yarn get-fonts && yarn get-logos", "cp": "cp entry/manifest.json dist && cp entry/neu.png dist", - "build": "cr --emit-js -1 && vite build --base=./", + "build": "cr js -1 && vite build --base=./", "crx": "yarn build && yarn cp-resources && zip -r neu-tab.zip dist/" }, "repository": { @@ -24,7 +24,7 @@ "vite": "^5.2.14" }, "dependencies": { - "@calcit/procs": "^0.8.16", - "dayjs": "^1.11.10" + "@calcit/procs": "^0.9.6", + "dayjs": "^1.11.13" } } diff --git a/yarn.lock b/yarn.lock index 5efa582..29afebd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,29 +2,29 @@ # yarn lockfile v1 -"@calcit/procs@^0.8.16": - version "0.8.16" - resolved "https://registry.npmmirror.com/@calcit/procs/-/procs-0.8.16.tgz#fe841ca14b110ff809e6856ef1c5d3800f002713" - integrity sha512-oSx2lWL/Jmo2JRHRln/WHiXI9MdZJhGbKKpBhPY8aBsiQ4DGZgYQnQK76upSEHBGjVifOiGMVHy3d0FviWWbHA== +"@calcit/procs@^0.9.6": + version "0.9.6" + resolved "https://registry.npmmirror.com/@calcit/procs/-/procs-0.9.6.tgz#fc03deb657bcb365b8db8ed4e7a765149726fc45" + integrity sha512-zHnyI6dkhNuNBQtA22QsnbQboYCBErtHZAY2WHlMOjC4KmT5SxkFYFYbSJpzm7IZs8TBE7dx1mQfXhrUwXYexA== dependencies: - "@calcit/ternary-tree" "0.0.23" + "@calcit/ternary-tree" "0.0.24" "@cirru/parser.ts" "^0.0.6" - "@cirru/writer.ts" "^0.1.4" + "@cirru/writer.ts" "^0.1.5" -"@calcit/ternary-tree@0.0.23": - version "0.0.23" - resolved "https://registry.npmmirror.com/@calcit/ternary-tree/-/ternary-tree-0.0.23.tgz#a299f7ffd614ac2dfe2cbcf78506934df4008c77" - integrity sha512-GKHfokm1YBUvPprV9p227fDpE+w4lVl4YKQpfKoNEqvprJnC4HRXaa+QSLwZkvZlXr09hAA0x4l4ZKUIcbYydg== +"@calcit/ternary-tree@0.0.24": + version "0.0.24" + resolved "https://registry.npmmirror.com/@calcit/ternary-tree/-/ternary-tree-0.0.24.tgz#9b58cf9f76c08c3995b98b59c71b85e1da32385c" + integrity sha512-IGs+VNYIrIF2bI3/cnQe2lFmZYaJe3+A0LArDloGbNaEzUTRoyba37FTZ8K9C+XRpUAO9K0q61sKY2vb4teWAA== "@cirru/parser.ts@^0.0.6": version "0.0.6" resolved "https://registry.npmmirror.com/@cirru/parser.ts/-/parser.ts-0.0.6.tgz#b95a84e02273fcbd71ff100925782b6f86410234" integrity sha512-qpDNPq+IuuwYjQFI+wzpd3ntbF7lwJs90v1XWyLQbL9Ru4ld4aHxVGwW/9F/QOu5mEGCMXtagCoYDf0HtOpDZg== -"@cirru/writer.ts@^0.1.4": - version "0.1.4" - resolved "https://registry.npmmirror.com/@cirru/writer.ts/-/writer.ts-0.1.4.tgz#4b5851d002ab7c4891457bf8c707f09620c8f122" - integrity sha512-Uy3Y7jjLdaxLW9ajZuIS9rp+dhaSVU95hRRwvnP6E16PwgPl+zGs6Xqn1L7Lqw07ypujrdBBdFQyRJOLc6IHQQ== +"@cirru/writer.ts@^0.1.5": + version "0.1.5" + resolved "https://registry.npmmirror.com/@cirru/writer.ts/-/writer.ts-0.1.5.tgz#890d96cd4a69609f1682932dad5d2d467abb327e" + integrity sha512-QQVFJAOIdUtVJZwT23THZOzumSDXCLMQ0yFz5DzIGlWGXPNBuB7BwUvGtRuiQrzM2XV7ALOWmNsVC7vEOjObQQ== "@esbuild/aix-ppc64@0.20.2": version "0.20.2" @@ -221,15 +221,15 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz#3dd5d53e900df2a40841882c02e56f866c04d202" integrity sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q== -"@types/estree@1.0.5": - version "1.0.5" - resolved "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" - integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/estree@1.0.6": + version "1.0.6" + resolved "https://registry.npmmirror.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" + integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== -dayjs@^1.11.10: - version "1.11.10" - resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" - integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== +dayjs@^1.11.13: + version "1.11.13" + resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c" + integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg== esbuild@^0.20.1: version "0.20.2" @@ -266,9 +266,9 @@ fsevents@~2.3.2, fsevents@~2.3.3: integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== nanoid@^3.3.7: - version "3.3.7" - resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" - integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== + version "3.3.8" + resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf" + integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w== picocolors@^1.1.0: version "1.1.0" @@ -311,7 +311,7 @@ rollup@^4.13.0: source-map-js@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== vite@^5.2.14: From da22d700c9538e59dd48cf648b8d51b4792356bd Mon Sep 17 00:00:00 2001 From: jiyinyiyong Date: Fri, 29 Nov 2024 01:26:44 +0800 Subject: [PATCH 3/3] update CI script --- .github/workflows/upload.yaml | 29 +++++++++-------------------- .gitignore | 2 ++ 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 98c7d01..86de332 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -1,4 +1,3 @@ - name: Upload Assets on: @@ -13,26 +12,16 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 20 - cache: 'yarn' - - - uses: supplypike/setup-bin@v3 - with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/cr' - name: 'cr' - version: '0.8.14' + cache: "yarn" - - uses: supplypike/setup-bin@v3 - with: - uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/caps' - name: 'caps' - version: '0.8.14' + - uses: calcit-lang/setup-cr@0.0.8 - name: "compiles to js" run: > - caps --ci && cr --emit-js --once + caps --ci && cr -1 js && yarn && yarn vite build --base=./ && yarn ssr - name: Deploy to server @@ -41,11 +30,11 @@ jobs: env: DEPLOY_KEY: ${{secrets.rsync_private_key}} with: - flags: '-avzr --progress' - options: '' - ssh_options: '' - src: 'dist/*' - dest: 'rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}' + flags: "-avzr --progress" + options: "" + ssh_options: "" + src: "dist/*" + dest: "rsync-user@tiye.me:/web-assets/repo/${{ github.repository }}" - name: Display status from deploy run: echo "${{ steps.deploy.outputs.status }}" diff --git a/.gitignore b/.gitignore index 2b2cae3..7327d20 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ ssr-out/ node_modules/ dist/ *.zip + +.DS_Store