Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/cloudflare/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@ export default [
"import/no-duplicates": "error",
},
},
{
files: ["src/**/*.ts"],
rules: {
"import/extensions": ["error", "always", { checkTypeImports: true }],
},
},
];
6 changes: 3 additions & 3 deletions packages/cloudflare/src/api/config.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import type { BuildOptions } from "@opennextjs/aws/build/helper";
import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
import {
BaseOverride,
LazyLoadedOverride,
OpenNextConfig as AwsOpenNextConfig,
type RoutePreloadingBehavior,
} from "@opennextjs/aws/types/open-next";
} from "@opennextjs/aws/types/open-next.js";
import type {
CDNInvalidationHandler,
IncrementalCache,
Queue,
TagCache,
} from "@opennextjs/aws/types/overrides";
} from "@opennextjs/aws/types/overrides.js";

import assetResolver from "./overrides/asset-resolver/index.js";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, expect, it, vi } from "vitest";

import * as internal from "../overrides/internal";
import { BucketCachePurge } from "./bucket-cache-purge";
import * as internal from "../overrides/internal.js";
import { BucketCachePurge } from "./bucket-cache-purge.js";

vi.mock("cloudflare:workers", () => ({
DurableObject: class {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { DurableObject } from "cloudflare:workers";

import { internalPurgeCacheByTags } from "../overrides/internal";
import { internalPurgeCacheByTags } from "../overrides/internal.js";

const DEFAULT_BUFFER_TIME_IN_SECONDS = 5;
// https://developers.cloudflare.com/cache/how-to/purge-cache/#hostname-tag-prefix-url-and-purge-everything-limits
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/api/durable-objects/queue.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from "vitest";

import { DOQueueHandler } from "./queue";
import { DOQueueHandler } from "./queue.js";

vi.mock("cloudflare:workers", () => ({
DurableObject: class {
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/api/durable-objects/queue.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { debug, error, warn } from "@opennextjs/aws/adapters/logger.js";
import type { QueueMessage } from "@opennextjs/aws/types/overrides";
import type { QueueMessage } from "@opennextjs/aws/types/overrides.js";
import {
FatalError,
IgnorableError,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from "vitest";

import { DOShardedTagCache } from "./sharded-tag-cache";
import { DOShardedTagCache } from "./sharded-tag-cache.js";

vi.mock("cloudflare:workers", () => ({
DurableObject: class {
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/api/overrides/asset-resolver/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { InternalEvent, InternalResult } from "@opennextjs/aws/types/open-next";
import type { AssetResolver } from "@opennextjs/aws/types/overrides";
import type { InternalEvent, InternalResult } from "@opennextjs/aws/types/open-next.js";
import type { AssetResolver } from "@opennextjs/aws/types/overrides.js";

import { getCloudflareContext } from "../../cloudflare-context.js";

Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/api/overrides/cache-purge/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { CDNInvalidationHandler } from "@opennextjs/aws/types/overrides";
import type { CDNInvalidationHandler } from "@opennextjs/aws/types/overrides.js";

import { getCloudflareContext } from "../../cloudflare-context";
import { getCloudflareContext } from "../../cloudflare-context.js";
import { debugCache, internalPurgeCacheByTags } from "../internal.js";

interface PurgeOptions {
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/api/overrides/queue/do-queue.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides";
import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides.js";
import { IgnorableError } from "@opennextjs/aws/utils/error.js";

import { getCloudflareContext } from "../../cloudflare-context";
import { getCloudflareContext } from "../../cloudflare-context.js";

export default {
name: "durable-queue",
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/api/overrides/queue/memory-queue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { error } from "@opennextjs/aws/adapters/logger.js";
import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides.js";
import { IgnorableError } from "@opennextjs/aws/utils/error.js";

import { getCloudflareContext } from "../../cloudflare-context";
import { debugCache } from "../internal";
import { getCloudflareContext } from "../../cloudflare-context.js";
import { debugCache } from "../internal.js";

export const DEFAULT_REVALIDATION_TIMEOUT_MS = 10_000;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Queue } from "@opennextjs/aws/types/overrides";
import type { Queue } from "@opennextjs/aws/types/overrides.js";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";

import queueCache from "./queue-cache";
import queueCache from "./queue-cache.js";

const mockedQueue = {
name: "mocked-queue",
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/api/overrides/queue/queue-cache.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { error } from "@opennextjs/aws/adapters/logger.js";
import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides";
import type { Queue, QueueMessage } from "@opennextjs/aws/types/overrides.js";

interface QueueCachingOptions {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";

import shardedDOTagCache, { AVAILABLE_REGIONS, DOId } from "./do-sharded-tag-cache";
import shardedDOTagCache, { AVAILABLE_REGIONS, DOId } from "./do-sharded-tag-cache.js";

const hasBeenRevalidatedMock = vi.fn();
const writeTagsMock = vi.fn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";
import { IgnorableError } from "@opennextjs/aws/utils/error.js";

import type { OpenNextConfig } from "../../../api/config.js";
import { getCloudflareContext } from "../../cloudflare-context";
import { getCloudflareContext } from "../../cloudflare-context.js";
import { DOShardedTagCache } from "../../durable-objects/sharded-tag-cache.js";
import { debugCache, purgeCacheByTags } from "../internal";
import { debugCache, purgeCacheByTags } from "../internal.js";

export const DEFAULT_WRITE_RETRIES = 3;
export const DEFAULT_NUM_SHARDS = 4;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NextModeTagCache } from "@opennextjs/aws/types/overrides";
import { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";
import { beforeEach, describe, expect, it, vi } from "vitest";

import { softTagFilter, withFilter } from "./tag-cache-filter";
import { softTagFilter, withFilter } from "./tag-cache-filter.js";

const mockedTagCache = {
name: "mocked",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NextModeTagCache } from "@opennextjs/aws/types/overrides";
import { NextModeTagCache } from "@opennextjs/aws/types/overrides.js";

interface WithFilterOptions {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
import { build } from "esbuild";

import type { OpenNextConfig } from "../../../api";
import type { OpenNextConfig } from "../../../api/index.js";

export async function compileSkewProtection(options: BuildOptions, config: OpenNextConfig) {
const currentDir = path.join(path.dirname(fileURLToPath(import.meta.url)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { BuildOptions } from "@opennextjs/aws/build/helper.js";
import mockFs from "mock-fs";
import { afterAll, beforeAll, describe, expect, it } from "vitest";

import { patchVercelOgLibrary } from "./patch-vercel-og-library";
import { patchVercelOgLibrary } from "./patch-vercel-og-library.js";

const nodeModulesVercelOgDir = "node_modules/.pnpm/[email protected]/node_modules/next/dist/compiled/@vercel/og";
const nextServerOgNftPath = "examples/api/.next/server/app/og/route.js.nft.json";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
import { describe, expect, it } from "vitest";

import { vercelOgFallbackFontRule, vercelOgImportRule } from "./vercel-og";
import { vercelOgFallbackFontRule, vercelOgImportRule } from "./vercel-og.js";

describe("vercelOgImportRule", () => {
it("should rewrite a node import to an edge import", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextConfig } from "@opennextjs/aws/types/next-types";
import type { NextConfig } from "@opennextjs/aws/types/next-types.js";

// Not sure if this should be upstreamed to aws
// Adding more stuff there make typing incorrect actually, these properties are never undefined as long as it is the right version of next
Expand Down
2 changes: 1 addition & 1 deletion packages/cloudflare/src/cli/build/utils/workerd.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, test } from "vitest";

import { transformBuildCondition, transformPackageJson } from "./workerd";
import { transformBuildCondition, transformPackageJson } from "./workerd.js";

describe("transformBuildCondition", () => {
test("top level", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/cli/commands/populate-cache.spec.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { mkdirSync, writeFileSync } from "node:fs";
import path from "node:path";

import type { BuildOptions } from "@opennextjs/aws/build/helper";
import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
import mockFs from "mock-fs";
import { afterAll, beforeAll, describe, expect, test } from "vitest";

import { getCacheAssets } from "./populate-cache";
import { getCacheAssets } from "./populate-cache.js";

describe("getCacheAssets", () => {
beforeAll(() => {
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/cli/commands/skew-protection.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, expect, test, vi } from "vitest";

import { CURRENT_VERSION_ID } from "../templates/skew-protection";
import { listWorkerVersions, updateDeploymentMapping } from "./skew-protection";
import { CURRENT_VERSION_ID } from "../templates/skew-protection.js";
import { listWorkerVersions, updateDeploymentMapping } from "./skew-protection.js";

describe("skew protection", () => {
describe("listWorkerVersions", () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/cloudflare/src/cli/commands/skew-protection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import { loadConfig } from "@opennextjs/aws/adapters/config/util.js";
import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
import logger from "@opennextjs/aws/logger.js";
import { Cloudflare, NotFoundError } from "cloudflare";
import type { VersionGetResponse } from "cloudflare/resources/workers/scripts/versions";
import type { VersionGetResponse } from "cloudflare/resources/workers/scripts/versions.js";

import type { OpenNextConfig } from "../../api";
import type { OpenNextConfig } from "../../api/index.js";
import { CURRENT_VERSION_ID, DEPLOYMENT_MAPPING_ENV_NAME } from "../templates/skew-protection.js";
import type { WorkerEnvVar } from "./helpers.js";

Expand Down