diff --git a/.gitattributes b/.gitattributes index f865be5..5f75ec4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ -calcit.cirru -diff linguist-generated yarn.lock -diff linguist-generated diff --git a/.github/workflows/npm-publish.yaml b/.github/workflows/npm-publish.yaml index dc8ef00..134a9f4 100644 --- a/.github/workflows/npm-publish.yaml +++ b/.github/workflows/npm-publish.yaml @@ -9,51 +9,51 @@ jobs: publish-npm: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v6 - - - uses: actions/setup-node@v6 - with: - node-version: 24 - registry-url: https://registry.npmjs.org/ - cache: yarn - - - uses: calcit-lang/setup-cr@0.0.9 - - - run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page - - # - run: mkdir -p dist-server && mv js-out/bundle.js dist-server - # name: Copy server scripts - - - name: Upload web assets - id: deploy - uses: Pendect/action-rsyncer@v2.0.0 - 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 }}' - - - name: Display status from deploy - run: echo "${{ steps.deploy.outputs.status }}" - - # - name: Upload server script - # id: deploy-server - # uses: Pendect/action-rsyncer@v1.1.0 - # env: - # DEPLOY_KEY: ${{secrets.rsync_private_key}} - # with: - # flags: '-avzr --progress' - # options: '' - # ssh_options: '' - # src: 'dist-server/*' - # dest: 'rsync-user@tiye.me:/servers/rebase-hell/' - - # - name: Display status from deploy - # run: echo "${{ steps.deploy-server.outputs.status }}" - - - run: npm publish - env: - NODE_AUTH_TOKEN: ${{secrets.npm_token}} + - uses: actions/checkout@v6 + + - uses: actions/setup-node@v6 + with: + node-version: 24 + registry-url: https://registry.npmjs.org/ + cache: yarn + + - uses: calcit-lang/setup-calcit@6a2e53ae41e4f0d5856a424b9ed4470d90ea6876 + + - run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page + + # - run: mkdir -p dist-server && mv js-out/bundle.js dist-server + # name: Copy server scripts + + - name: Upload web assets + id: deploy + uses: Pendect/action-rsyncer@v2.0.0 + 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 }}' + + - name: Display status from deploy + run: echo "${{ steps.deploy.outputs.status }}" + + # - name: Upload server script + # id: deploy-server + # uses: Pendect/action-rsyncer@v1.1.0 + # env: + # DEPLOY_KEY: ${{secrets.rsync_private_key}} + # with: + # flags: '-avzr --progress' + # options: '' + # ssh_options: '' + # src: 'dist-server/*' + # dest: 'rsync-user@tiye.me:/servers/rebase-hell/' + + # - name: Display status from deploy + # run: echo "${{ steps.deploy-server.outputs.status }}" + + - run: npm publish + env: + NODE_AUTH_TOKEN: ${{secrets.npm_token}} diff --git a/.github/workflows/upload.yaml b/.github/workflows/upload.yaml index 7b6d34d..0ea0274 100644 --- a/.github/workflows/upload.yaml +++ b/.github/workflows/upload.yaml @@ -20,7 +20,7 @@ jobs: node-version: 24 cache: 'yarn' - - uses: calcit-lang/setup-cr@0.0.9 + - uses: calcit-lang/setup-calcit@6a2e53ae41e4f0d5856a424b9ed4470d90ea6876 - run: caps --ci && yarn install --immutable && yarn compile-server && yarn compile-page && yarn release-page diff --git a/calcit.cirru b/calcit.cirru index 8207c95..2b68cb8 100644 --- a/calcit.cirru +++ b/calcit.cirru @@ -1,5 +1,5 @@ -{} (:about "|Machine-generated snapshot. Do not edit directly — changes will be overwritten. Use `cr query` to inspect and `cr edit`/`cr tree` to modify. Run `cr docs agents --full` first. Manual edits must follow format and schema conventions, then run `cr edit format`.") (:package |app) +{} (:about "|Machine-generated snapshot. Do not edit directly — changes will be overwritten. Use `calcit query` to inspect and `calcit edit`/`calcit tree` to modify. Run `calcit docs agents --full` first. Manual edits must follow format and schema conventions, then run `calcit edit format`.") (:package |app) :entries $ {} :default $ {} (:description |) (:init-fn 'app.server/main!) (:mode :native) (:reload-fn 'app.server/reload!) :feature-policy $ {} diff --git a/deps.cirru b/deps.cirru index 9838dc2..ed50923 100644 --- a/deps.cirru +++ b/deps.cirru @@ -1,5 +1,5 @@ -{} (:calcit-version |0.13.27) +{} (:calcit-version |0.13.29) :version |0.1.19 :dependencies $ {} (|Cumulo/cumulo-reel.calcit |0.0.24) |Cumulo/cumulo-util.calcit |0.0.13 diff --git a/history/2026082222-upgrade-calcit-01329.md b/history/2026082222-upgrade-calcit-01329.md new file mode 100644 index 0000000..892f0f4 --- /dev/null +++ b/history/2026082222-upgrade-calcit-01329.md @@ -0,0 +1,5 @@ +# 2026082222 Upgrade Calcit and expose source + +- Updated Calcit and @calcit/procs to 0.13.29. +- Replaced setup-cr workflow references with setup-calcit and updated package commands. +- Removed the linguist-generated rule hiding calcit.cirru. diff --git a/package.json b/package.json index e65355e..f2f2c36 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "main": "./server.mjs", "bin": "./server.mjs", "scripts": { - "watch-server": "cr js", - "compile-server": "cr js", - "compile-page": "cr --entry page --emit-path out-page js", + "watch-server": "calcit calcit.cirru js", + "compile-server": "calcit calcit.cirru js", + "compile-page": "calcit calcit.cirru --entry page --emit-path out-page js", "release-page": "vite build --base=./", - "watch-page": "cr --entry page --emit-path out-page/ js" + "watch-page": "calcit calcit.cirru --entry page --emit-path out-page/ js" }, "repository": { "type": "git", @@ -19,7 +19,7 @@ "author": "jiyinyiyong", "license": "MIT", "dependencies": { - "@calcit/procs": "^0.13.27", + "@calcit/procs": "^0.13.29", "chalk": "^5.3.0", "dayjs": "^1.11.11", "latest-version": "^9.0.0", diff --git a/yarn.lock b/yarn.lock index cca238d..11a84f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,14 +5,14 @@ __metadata: version: 8 cacheKey: 10c0 -"@calcit/procs@npm:^0.13.27": - version: 0.13.27 - resolution: "@calcit/procs@npm:0.13.27" +"@calcit/procs@npm:^0.13.29": + version: 0.13.29 + resolution: "@calcit/procs@npm:0.13.29" dependencies: "@calcit/ternary-tree": "npm:0.0.26" "@cirru/parser.ts": "npm:^0.0.9" "@cirru/writer.ts": "npm:^0.1.9" - checksum: 10c0/f3f2d1a3dd94797f99bec39cbf722b7d98d0308d0643f861997b1accc44fe68f5922149b268881aae1df4a3524968e3f10c58870358952bd959ff4dddcfd326a + checksum: 10c0/d8db7c62054dda827557f1bd8c8d7a777c17b40bd43f51fb3b39c57386d1c1a41dad449b641201daa05ad14c38a423601c803b5d9eb3557ae0173ae1a03f570a languageName: node linkType: hard @@ -1032,7 +1032,7 @@ __metadata: version: 0.0.0-use.local resolution: "termina@workspace:." dependencies: - "@calcit/procs": "npm:^0.13.27" + "@calcit/procs": "npm:^0.13.29" bottom-tip: "npm:^0.1.5" chalk: "npm:^5.3.0" dayjs: "npm:^1.11.11"