@opennextjs/cloudflare 0.0.0-e62af72 → 0.0.3

package/dist/cli/templates/shims/node-fs.ts

@@ -17,7 +17,7 @@ function existsSync(path: string) {
   return FILES.has(path);
 }
 
-async function readFile(path: string, options: unknown): Promise<any> {
+async function readFile(path: string, options: unknown): Promise<unknown> {
   console.log(
     "readFile",
     { path, options }

package/dist/cli/templates/worker.ts

@@ -1,17 +1,19 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-import Stream from "node:stream";
-import type { NextConfig } from "next";
+import type { ExportedHandler, Fetcher } from "@cloudflare/workers-types";
 import { NodeNextRequest, NodeNextResponse } from "next/dist/server/base-http/node";
-import { MockedResponse } from "next/dist/server/lib/mock-request";
-import NextNodeServer, { NodeRequestHandler } from "next/dist/server/next-server";
+import { AsyncLocalStorage } from "node:async_hooks";
+import type { CloudflareContext } from "../../api";
 import type { IncomingMessage } from "node:http";
-import { type CloudflareContext } from "../../api";
+import { MockedResponse } from "next/dist/server/lib/mock-request";
+import type { NextConfig } from "next";
+import type { NodeRequestHandler } from "next/dist/server/next-server";
+import Stream from "node:stream";
 
 const NON_BODY_RESPONSES = new Set([101, 204, 205, 304]);
 
 const cloudflareContextALS = new AsyncLocalStorage<CloudflareContext>();
 
 // Note: this symbol needs to be kept in sync with the one defined in `src/api/get-cloudflare-context.ts`
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 (globalThis as any)[Symbol.for("__cloudflare-context__")] = new Proxy(
   {},
   {
@@ -29,12 +31,18 @@ const nextConfig: NextConfig = JSON.parse(process.env.__NEXT_PRIVATE_STANDALONE_
 let requestHandler: NodeRequestHandler | null = null;
 
 export default {
-  async fetch(request: Request & { cf: IncomingRequestCfProperties }, env: any, ctx: any) {
+  async fetch(request, env, ctx) {
     return cloudflareContextALS.run({ env, ctx, cf: request.cf }, async () => {
       if (requestHandler == null) {
         globalThis.process.env = { ...globalThis.process.env, ...env };
+        // Note: "next/dist/server/next-server" is a cjs module so we have to `require` it not to confuse esbuild
+        //       (since esbuild can run in projects with different module resolutions)
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        const NextNodeServer = require("next/dist/server/next-server")
+          .default as typeof import("next/dist/server/next-server").default;
+
         requestHandler = new NextNodeServer({
-          conf: { ...nextConfig, env },
+          conf: nextConfig,
           customServer: false,
           dev: false,
           dir: "",
@@ -45,29 +53,29 @@ export default {
       const url = new URL(request.url);
 
       if (url.pathname === "/_next/image") {
-        let imageUrl =
+        const imageUrl =
           url.searchParams.get("url") ?? "https://developers.cloudflare.com/_astro/logo.BU9hiExz.svg";
         if (imageUrl.startsWith("/")) {
           return env.ASSETS.fetch(new URL(imageUrl, request.url));
         }
-        return fetch(imageUrl, { cf: { cacheEverything: true } } as any);
+        return fetch(imageUrl, { cf: { cacheEverything: true } });
       }
 
       const { req, res, webResponse } = getWrappedStreams(request, ctx);
 
-      ctx.waitUntil(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res)));
+      ctx.waitUntil(Promise.resolve(requestHandler(new NodeNextRequest(req), new NodeNextResponse(res))));
 
       return await webResponse();
     });
   },
-};
+} as ExportedHandler<{ ASSETS: Fetcher }>;
 
-function getWrappedStreams(request: Request, ctx: any) {
+function getWrappedStreams(request: Request, ctx: ExecutionContext) {
   const url = new URL(request.url);
 
-  const req = (
-    request.body ? Stream.Readable.fromWeb(request.body as any) : Stream.Readable.from([])
-  ) as IncomingMessage;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const reqBody = request.body && Stream.Readable.fromWeb(request.body as any);
+  const req = (reqBody ?? Stream.Readable.from([])) as IncomingMessage;
   req.httpVersion = "1.0";
   req.httpVersionMajor = 1;
   req.httpVersionMinor = 0;
@@ -94,7 +102,7 @@ function getWrappedStreams(request: Request, ctx: any) {
 
   const res = new MockedResponse({
     resWriter: (chunk) => {
-      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err: any) => {
+      resBodyWriter.write(typeof chunk === "string" ? Buffer.from(chunk) : chunk).catch((err) => {
         if (
           err.message.includes("WritableStream has been closed") ||
           err.message.includes("Network connection lost")
@@ -110,6 +118,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // It's implemented as a no-op, but really it should mark the headers as done
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   res.flushHeaders = () => (res as any).headPromiseResolve();
 
   // Only allow statusCode to be modified if not sent
@@ -127,6 +136,7 @@ function getWrappedStreams(request: Request, ctx: any) {
   });
 
   // Make sure the writer is eventually closed
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ctx.waitUntil((res as any).hasStreamed.finally(() => resBodyWriter.close().catch(() => {})));
 
   return {
@@ -138,6 +148,7 @@ function getWrappedStreams(request: Request, ctx: any) {
       res.setHeader("content-encoding", "identity");
       return new Response(NON_BODY_RESPONSES.has(res.statusCode) ? null : readable, {
         status: res.statusCode,
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         headers: (res as any).headers,
       });
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.0.0-e62af72",
+  "version": "0.0.3",
   "bin": "dist/cli/index.mjs",
   "main": "./dist/api/index.mjs",
   "types": "./dist/api/index.d.mts",
@@ -31,24 +31,34 @@
   },
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240919.0",
+    "@cloudflare/workers-types": "^4.20240925.0",
+    "@eslint/js": "^9.11.1",
+    "@tsconfig/strictest": "^2.0.5",
     "@types/node": "^22.2.0",
     "esbuild": "^0.23.0",
+    "eslint": "^9.11.1",
+    "eslint-plugin-unicorn": "^55.0.0",
     "glob": "^11.0.0",
+    "globals": "^15.9.0",
     "next": "14.2.11",
+    "package-manager-detector": "^0.2.0",
     "tsup": "^8.2.4",
     "typescript": "^5.5.4",
+    "typescript-eslint": "^8.7.0",
     "vitest": "^2.1.1"
   },
   "dependencies": {
     "ts-morph": "^23.0.0"
   },
   "peerDependencies": {
-    "wrangler": "^3.78.6"
+    "wrangler": "^3.78.10"
   },
   "scripts": {
     "build": "tsup",
     "build:watch": "tsup --watch src",
+    "lint:check": "eslint",
+    "lint:fix": "eslint --fix",
+    "ts:check": "tsc --noEmit",
     "test": "vitest --run",
     "test:watch": "vitest"
   }

package/dist/cli/cache-handler.mjs

@@ -1,48 +0,0 @@
-import "./chunk-UJCSKKID.mjs";
-
-// src/cli/cache-handler.ts
-var CfWorkersKvCacheHandler = class _CfWorkersKvCacheHandler {
-  constructor(ctx) {
-    this.ctx = ctx;
-  }
-  static maybeKVNamespace = void 0;
-  async get(key) {
-    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
-      return null;
-    }
-    console.log(`[Cf] Getting cache[${key}]`);
-    try {
-      return await _CfWorkersKvCacheHandler.maybeKVNamespace.get(key, "json") ?? null;
-    } catch (e) {
-      console.error(`Failed to get value for key = ${key}: ${e}`);
-      return null;
-    }
-  }
-  async set(key, entry, ctx) {
-    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
-      return;
-    }
-    console.log(`[Cf] Setting cache[${key}]`);
-    try {
-      const data = {
-        lastModified: Date.now(),
-        value: entry
-      };
-      await _CfWorkersKvCacheHandler.maybeKVNamespace.put(key, JSON.stringify(data));
-    } catch (e) {
-      console.error(`Failed to set value for key = ${key}: ${e}`);
-    }
-  }
-  async revalidateTag(tags) {
-    if (_CfWorkersKvCacheHandler.maybeKVNamespace === void 0) {
-      return;
-    }
-    tags = [tags].flat();
-    console.log(`[Cf] revalidateTag ${JSON.stringify(tags)}}`);
-  }
-  resetRequestCache() {
-  }
-};
-export {
-  CfWorkersKvCacheHandler as default
-};

package/dist/cli/chunk-UJCSKKID.mjs

@@ -1,30 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-export {
-  __commonJS,
-  __toESM
-};