Sync versions

Author: dahlia

.github/workflows/build.yaml

@@ -153,6 +153,12 @@ jobs:
           '.version = .version + "-dev." + $build + "+" + $commit' \
           deno.json > deno.json.tmp
         mv deno.json.tmp deno.json
+        jq \
+          --arg build "$GITHUB_RUN_NUMBER" \
+          --arg commit "${GITHUB_SHA::8}" \
+          '.version = .version + "-dev." + $build + "+" + $commit' \
+          package.json > package.json.tmp
+        mv package.json.tmp package.json
       working-directory: ${{ github.workspace }}/fedify/
     - if: github.ref_type == 'tag'
       run: |

CHANGES.md

@@ -3,10 +3,10 @@
 Fedify changelog
 ================
 
-Version 1.6.0
+Version 1.6.1
 -------------
 
-To be released.
+To be released.  Note that 1.6.0 was skipped due to a mistake in the versioning.
 
  -  Added `Context.lookupWebFinger()` method to make WebFinger lookups
     accessible from the context.  [[#227]]

cli/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/cli",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "license": "MIT",
   "exports": "./mod.ts",
   "imports": {
@@ -20,7 +20,6 @@
     "hono": "jsr:@hono/hono@^4.5.9",
     "icojs": "npm:icojs@^0.19.4",
     "jimp": "npm:jimp@^1.6.0",
-    "json-preserve-indent": "npm:json-preserve-indent@^1.1.3",
     "ora": "npm:ora@^8.0.1",
     "shiki": "npm:shiki@^1.6.4"
   },

deno.json

@@ -10,6 +10,7 @@
     "@logtape/logtape": "jsr:@logtape/logtape@^0.10.0",
     "@std/fs": "jsr:@std/fs@^1.0.3",
     "@std/path": "jsr:@std/path@^1.0.6",
+    "json-preserve-indent": "npm:json-preserve-indent@^1.1.3",
     "preact": "npm:preact@10.19.6"
   },
   "unstable": [
@@ -20,7 +21,13 @@
   ],
   "tasks": {
     "codegen": "deno task -f @fedify/cli codegen",
-    "check": "deno task -f @fedify/fedify check && deno task -f @fedify/cli check && deno task -f @fedify/blog check && deno task -f @fedify/hono-sample check",
+    "check": {
+      "command": "deno task -f @fedify/fedify check && deno task -f @fedify/cli check && deno task -f @fedify/blog check && deno task -f @fedify/hono-sample check",
+      "dependencies": [
+        "check-version"
+      ]
+    },
+    "check-version": "deno task -f @fedify/fedify check-version",
     "test-all": "deno task -f @fedify/fedify test-all && deno task -f @fedify/cli check && deno task -f @fedify/blog check && deno task -f @fedify/hono-sample check",
     "publish": "deno task -f @fedify/fedify publish && deno task -f @fedify/cli publish",
     "cli": "deno task -f @fedify/cli run",

fedify/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "license": "MIT",
   "exports": {
     ".": "./mod.ts",
@@ -57,6 +57,7 @@
   "tasks": {
     "codegen": "deno run --allow-read --allow-write --check codegen/main.ts vocab/ ../runtime/ > vocab/vocab.ts && deno fmt vocab/vocab.ts && deno cache vocab/vocab.ts && deno check vocab/vocab.ts",
     "check-version": "deno run --allow-read=package.json scripts/check_version.ts && deno run ../cli/scripts/check_version.ts",
+    "sync-version": "deno run --allow-read=package.json --allow-write=package.json scripts/sync_version.ts && deno run --allow-read=../cli/deno.json --allow-write=../cli/deno.json ../cli/scripts/sync_version.ts",
     "cache": {
       "command": "deno cache mod.ts",
       "dependencies": [
@@ -92,6 +93,7 @@
     "publish": {
       "command": "deno publish",
       "dependencies": [
+        "check-version",
         "codegen"
       ]
     },
@@ -106,6 +108,7 @@
     "npm": {
       "command": "pnpm pack",
       "dependencies": [
+        "sync-version",
         "pnpm:install"
       ]
     },

fedify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -111,8 +111,8 @@
   },
   "scripts": {
     "build": "deno task codegen && tsdown",
-    "prepack": "deno task codegen && tsdown",
-    "prepublish": "deno task codegen && tsdown",
+    "prepack": "deno task codegen && tsdown && deno task check-version",
+    "prepublish": "deno task codegen && tsdown && deno task check-version",
     "test": "deno task codegen && tsdown && cd dist/ && node --test",
     "test:bun": "deno task codegen && tsdown && cd dist/ && bun test --timeout 60000"
   }

fedify/scripts/sync_version.ts

@@ -0,0 +1,8 @@
+import jsonPreserveIndent from "json-preserve-indent";
+import metadata from "../deno.json" with { type: "json" };
+
+const packageJsonPath = `${import.meta.dirname}/../package.json`;
+const packageJson = await Deno.readTextFile(packageJsonPath);
+const data = jsonPreserveIndent(packageJson);
+data.set("version", metadata.version);
+await Deno.writeTextFile(packageJsonPath, data.format());