From bc378ebda45e282108dfea72ee82199fead3b175 Mon Sep 17 00:00:00 2001
From: Yuki Okada <y.okady.221@gmail.com>
Date: Sat, 17 Jan 2026 11:58:40 +0900
Subject: [PATCH 1/2] fix: remove node:module/require and update import
 statements to use node: prefix

---
 packages/rest-api-client/index.mjs            | 11 +----------
 packages/rest-api-client/src/platform/node.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/rest-api-client/index.mjs b/packages/rest-api-client/index.mjs
index adfb960763..f337d71353 100644
--- a/packages/rest-api-client/index.mjs
+++ b/packages/rest-api-client/index.mjs
@@ -1,10 +1 @@
-import module from "module";
-// eslint-disable-next-line node/no-unsupported-features/node-builtins
-const require = module.createRequire(import.meta.url);
-
-export const {
-  KintoneRestAPIClient,
-  KintoneAbortSearchError,
-  KintoneAllRecordsError,
-  KintoneRestAPIError,
-} = require(".");
+export * from "./esm/src/index.js";
diff --git a/packages/rest-api-client/src/platform/node.ts b/packages/rest-api-client/src/platform/node.ts
index f08ca4f9f6..37206699d2 100644
--- a/packages/rest-api-client/src/platform/node.ts
+++ b/packages/rest-api-client/src/platform/node.ts
@@ -1,10 +1,10 @@
-import fs from "fs";
-import { promisify } from "util";
-import { basename } from "path";
+import fs from "node:fs";
+import { promisify } from "node:util";
+import { basename } from "node:path";
 import { UnsupportedPlatformError } from "./UnsupportedPlatformError";
-import https from "https";
-import os from "os";
-const packageJson = require("../../package.json");
+import https from "node:https";
+import os from "node:os";
+import packageJson from "../../package.json";
 
 const readFile = promisify(fs.readFile);
 

From c0b29a3ec83fa8ea25f11c80c29401483341bc64 Mon Sep 17 00:00:00 2001
From: Yuki Okada <y.okady.221@gmail.com>
Date: Wed, 4 Mar 2026 09:19:30 +0900
Subject: [PATCH 2/2] fix: enhance compatibility for Node.js and non-Node
 runtimes by conditionally importing modules

---
 packages/rest-api-client/index.mjs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/rest-api-client/index.mjs b/packages/rest-api-client/index.mjs
index f337d71353..3b6166b22f 100644
--- a/packages/rest-api-client/index.mjs
+++ b/packages/rest-api-client/index.mjs
@@ -1 +1,16 @@
-export * from "./esm/src/index.js";
+let mod;
+try {
+  // Node.js: use the CommonJS entry via createRequire for compatibility
+  const { createRequire } = await import("node:module");
+  const require = createRequire(import.meta.url);
+  mod = require(".");
+} catch {
+  // Non-Node runtimes (e.g. Cloudflare Workers): fall back to the ESM entry
+  mod = await import("./esm/src/index.js");
+}
+export const {
+  KintoneRestAPIClient,
+  KintoneAbortSearchError,
+  KintoneAllRecordsError,
+  KintoneRestAPIError,
+} = mod;