Merge tag '1.9.7' into 1.10-maintenance

dahlia · dahlia · commit 6e0d0444b9e7 · 2026-03-29T00:44:23.000+09:00
Fedify 1.9.7
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,16 @@ Version 1.10.6
 
 To be released.
 
+### @fedify/fedify
+
+ -  Fixed CommonJS builds of `@fedify/fedify/vocab` missing the `Object`
+    export from the entry point.  Older `tsdown` output generated an invalid
+    CommonJS re-export, causing `require("@fedify/fedify/vocab").Object` to be
+    `undefined`.  Updated the bundler toolchain and added a regression test for
+    the built CommonJs entry point.  [[#651]]
+
+[#651]: https://github.com/fedify-dev/fedify/issues/651
+
 
 Version 1.10.5
 --------------
@@ -180,6 +190,20 @@ Released on December 24, 2025.
  -  Implemented `list()` method in `WorkersKvStore`.  [[#498], [#500]]
 
 
+Version 1.9.7
+-------------
+
+Released on March 29, 2026.
+
+### @fedify/fedify
+
+ -  Fixed CommonJS builds of `@fedify/fedify/vocab` missing the `Object`
+    export from the entry point.  Older `tsdown` output generated an invalid
+    CommonJS re-export, causing `require("@fedify/fedify/vocab").Object` to be
+    `undefined`.  Updated the bundler toolchain and added a regression test for
+    the built CommonJs entry point.  [[#651]]
+
+
 Version 1.9.6
 -------------
 
diff --git a/deno.json b/deno.json
@@ -38,7 +38,7 @@
     "json-preserve-indent": "npm:json-preserve-indent@^1.1.3",
     "postgres": "npm:postgres@^3.4.7",
     "preact": "npm:preact@10.19.6",
-    "tsdown": "npm:tsdown@^0.12.9"
+    "tsdown": "npm:tsdown@^0.21.6"
   },
   "unstable": [
     "fs",
diff --git a/deno.lock b/deno.lock
diff --git a/packages/amqp/tsdown.config.ts b/packages/amqp/tsdown.config.ts
@@ -6,4 +6,10 @@ export default defineConfig({
   unbundle: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/cfworkers/src/mod.ts b/packages/cfworkers/src/mod.ts
@@ -51,13 +51,18 @@ export class WorkersKvStore implements KvStore {
 
   async get<T = unknown>(key: KvKey): Promise<T | undefined> {
     const encodedKey = this.#encodeKey(key);
-    const { value, metadata } = await this.#namespace.getWithMetadata(
+    const { value, metadata } = await this.#namespace.getWithMetadata<
+      T,
+      KvMetadata
+    >(
       encodedKey,
       "json",
     );
-    return metadata == null || metadata.expires < Date.now()
-      ? undefined
-      : value as T;
+    if (value == null) return undefined;
+    if (metadata?.expires != null && metadata.expires < Date.now()) {
+      return undefined;
+    }
+    return value;
   }
 
   async set(
diff --git a/packages/cfworkers/tsdown.config.ts b/packages/cfworkers/tsdown.config.ts
@@ -4,4 +4,7 @@ export default defineConfig({
   entry: ["src/mod.ts"],
   dts: true,
   platform: "node",
+  outExtensions() {
+    return { js: ".js", dts: ".d.ts" };
+  },
 });
diff --git a/packages/elysia/tsdown.config.ts b/packages/elysia/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/express/tsdown.config.ts b/packages/express/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/fastify/tsdown.config.ts b/packages/fastify/tsdown.config.ts
@@ -5,6 +5,12 @@ export default defineConfig({
   dts: true,
   platform: "node",
   format: ["esm", "cjs"],
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
   outputOptions: {
     exports: "named",
   },
diff --git a/packages/fedify/src/vocab/cjs.test.ts b/packages/fedify/src/vocab/cjs.test.ts
@@ -0,0 +1,12 @@
+import { strictEqual } from "node:assert";
+import { createRequire } from "node:module";
+import { test } from "../testing/mod.ts";
+
+test("CommonJS vocab entry exports Object", {
+  ignore: "Deno" in globalThis,
+}, () => {
+  const require = createRequire(import.meta.url);
+  const vocab = require("./mod.cjs");
+  strictEqual(typeof vocab.Object, "function");
+  strictEqual(typeof vocab.Update, "function");
+});
diff --git a/packages/fedify/src/x/cfworkers.ts b/packages/fedify/src/x/cfworkers.ts
@@ -12,11 +12,6 @@
  * @module
  * @since 1.6.0
  */
-import type {
-  KVNamespace,
-  MessageSendRequest,
-  Queue,
-} from "@cloudflare/workers-types/experimental";
 import { getLogger } from "@logtape/logtape";
 import type { KvKey, KvStore, KvStoreSetOptions } from "../federation/kv.ts";
 import type {
@@ -25,6 +20,49 @@ import type {
   MessageQueueListenOptions,
 } from "../federation/mq.ts";
 
+type WorkersQueueContentType = "bytes" | "json" | "text" | "v8";
+
+interface WorkersKvGetWithMetadataResult<Value, Metadata> {
+  value: Value | null;
+  metadata: Metadata | null;
+}
+
+interface WorkersKvPutOptions {
+  expirationTtl?: number;
+  metadata?: unknown;
+}
+
+interface WorkersKvNamespace<Key extends string = string> {
+  getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+    key: Key,
+    type: "json",
+  ): Promise<WorkersKvGetWithMetadataResult<ExpectedValue, Metadata>>;
+  put(key: Key, value: string, options?: WorkersKvPutOptions): Promise<void>;
+  delete(key: Key): Promise<void>;
+}
+
+interface WorkersQueueSendOptions {
+  contentType?: WorkersQueueContentType;
+  delaySeconds?: number;
+}
+
+interface WorkersQueueSendBatchOptions {
+  delaySeconds?: number;
+}
+
+interface WorkersMessageSendRequest<Body = unknown> {
+  body: Body;
+  contentType?: WorkersQueueContentType;
+}
+
+interface WorkersQueue<Body = unknown> {
+  send(body: Body, options?: WorkersQueueSendOptions): Promise<void>;
+  sendBatch(
+    requests: WorkersMessageSendRequest<Body>[],
+    options?: WorkersQueueSendBatchOptions,
+  ): Promise<void>;
+}
+
 interface KvMetadata {
   expires?: number;
 }
@@ -45,9 +83,9 @@ interface KvMetadata {
  * @since 1.6.0
  */
 export class WorkersKvStore implements KvStore {
-  #namespace: KVNamespace<string>;
+  #namespace: WorkersKvNamespace<string>;
 
-  constructor(namespace: KVNamespace<string>) {
+  constructor(namespace: WorkersKvNamespace<string>) {
     const logger = getLogger(["fedify", "cfworkers"]);
     logger.warn(
       "The `@fedify/fedify/x/cfworkers` module is deprecated; use " +
@@ -62,13 +100,18 @@ export class WorkersKvStore implements KvStore {
 
   async get<T = unknown>(key: KvKey): Promise<T | undefined> {
     const encodedKey = this.#encodeKey(key);
-    const { value, metadata } = await this.#namespace.getWithMetadata(
+    const { value, metadata } = await this.#namespace.getWithMetadata<
+      T,
+      KvMetadata
+    >(
       encodedKey,
       "json",
     );
-    return metadata == null || metadata.expires < Date.now()
-      ? undefined
-      : value as T;
+    if (value == null) return undefined;
+    if (metadata?.expires != null && metadata.expires < Date.now()) {
+      return undefined;
+    }
+    return value;
   }
 
   async set(
@@ -114,7 +157,7 @@ export class WorkersKvStore implements KvStore {
  * @since 1.6.0
  */
 export class WorkersMessageQueue implements MessageQueue {
-  #queue: Queue;
+  #queue: WorkersQueue;
 
   /**
    * Cloudflare Queues provide automatic retry with exponential backoff
@@ -123,7 +166,7 @@ export class WorkersMessageQueue implements MessageQueue {
    */
   readonly nativeRetrial = true;
 
-  constructor(queue: Queue) {
+  constructor(queue: WorkersQueue) {
     const logger = getLogger(["fedify", "cfworkers"]);
     logger.warn(
       "The `@fedify/fedify/x/cfworkers` module is deprecated; use " +
@@ -145,7 +188,7 @@ export class WorkersMessageQueue implements MessageQueue {
     messages: any[],
     options?: MessageQueueEnqueueOptions,
   ): Promise<void> {
-    const requests: MessageSendRequest[] = messages.map((msg) => ({
+    const requests: WorkersMessageSendRequest[] = messages.map((msg) => ({
       body: msg,
       contentType: "json",
     }));
diff --git a/packages/fedify/tsdown.config.ts b/packages/fedify/tsdown.config.ts
@@ -21,7 +21,9 @@ export default [
     dts: true,
     format: ["esm", "cjs"],
     platform: "neutral",
-    external: [/^node:/],
+    deps: {
+      neverBundle: [/^node:/],
+    },
     outputOptions(outputOptions, format) {
       if (format === "cjs") {
         outputOptions.intro = `
@@ -48,7 +50,9 @@ export default [
         .map((f) => f.replace(sep, "/")),
     ],
     dts: true,
-    external: [/^node:/],
+    deps: {
+      neverBundle: [/^node:/],
+    },
     inputOptions: {
       onwarn(warning, defaultHandler) {
         if (
diff --git a/packages/h3/tsdown.config.ts b/packages/h3/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "neutral",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/hono/tsdown.config.ts b/packages/hono/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/koa/tsdown.config.ts b/packages/koa/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/next/tsdown.config.ts b/packages/next/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   platform: "node",
   format: ["esm", "cjs"],
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/postgres/tsdown.config.ts b/packages/postgres/tsdown.config.ts
@@ -6,6 +6,12 @@ export default defineConfig({
   unbundle: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
   outputOptions(outputOptions, format) {
     if (format === "cjs") {
       outputOptions.intro = `
diff --git a/packages/redis/tsdown.config.ts b/packages/redis/tsdown.config.ts
@@ -6,6 +6,12 @@ export default defineConfig({
   unbundle: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
   outputOptions(outputOptions, format) {
     if (format === "cjs") {
       outputOptions.intro = `
diff --git a/packages/sqlite/tsdown.config.ts b/packages/sqlite/tsdown.config.ts
@@ -6,6 +6,12 @@ export default defineConfig({
   unbundle: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
   inputOptions: {
     onwarn(warning, defaultHandler) {
       if (
diff --git a/packages/sveltekit/tsdown.config.ts b/packages/sveltekit/tsdown.config.ts
@@ -5,4 +5,10 @@ export default defineConfig({
   dts: true,
   format: ["esm", "cjs"],
   platform: "node",
+  outExtensions({ format }) {
+    return {
+      js: format === "cjs" ? ".cjs" : ".js",
+      dts: format === "cjs" ? ".d.cts" : ".d.ts",
+    };
+  },
 });
diff --git a/packages/testing/tsdown.config.ts b/packages/testing/tsdown.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
