diff --git a/packages/cloudflare/eslint.config.mjs b/packages/cloudflare/eslint.config.mjs index ece14f8e..4ed975c6 100644 --- a/packages/cloudflare/eslint.config.mjs +++ b/packages/cloudflare/eslint.config.mjs @@ -36,4 +36,10 @@ export default [ "import/no-duplicates": "error", }, }, + { + files: ["src/**/*.ts"], + rules: { + "import/extensions": ["error", "always", { checkTypeImports: true }], + }, + }, ]; diff --git a/packages/cloudflare/src/api/config.ts b/packages/cloudflare/src/api/config.ts index 7469375c..d625f8bd 100644 --- a/packages/cloudflare/src/api/config.ts +++ b/packages/cloudflare/src/api/config.ts @@ -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"; diff --git a/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.spec.ts b/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.spec.ts index 3e343058..6c4023b2 100644 --- a/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.spec.ts +++ b/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.spec.ts @@ -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 { diff --git a/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.ts b/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.ts index a575dd63..88087280 100644 --- a/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.ts +++ b/packages/cloudflare/src/api/durable-objects/bucket-cache-purge.ts @@ -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 diff --git a/packages/cloudflare/src/api/durable-objects/queue.spec.ts b/packages/cloudflare/src/api/durable-objects/queue.spec.ts index 2cfcba6a..8869b164 100644 --- a/packages/cloudflare/src/api/durable-objects/queue.spec.ts +++ b/packages/cloudflare/src/api/durable-objects/queue.spec.ts @@ -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 { diff --git a/packages/cloudflare/src/api/durable-objects/queue.ts b/packages/cloudflare/src/api/durable-objects/queue.ts index 8fa5f294..4660304a 100644 --- a/packages/cloudflare/src/api/durable-objects/queue.ts +++ b/packages/cloudflare/src/api/durable-objects/queue.ts @@ -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, diff --git a/packages/cloudflare/src/api/durable-objects/sharded-tag-cache.spec.ts b/packages/cloudflare/src/api/durable-objects/sharded-tag-cache.spec.ts index b346d404..6dab98c9 100644 --- a/packages/cloudflare/src/api/durable-objects/sharded-tag-cache.spec.ts +++ b/packages/cloudflare/src/api/durable-objects/sharded-tag-cache.spec.ts @@ -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 { diff --git a/packages/cloudflare/src/api/overrides/asset-resolver/index.ts b/packages/cloudflare/src/api/overrides/asset-resolver/index.ts index 930446db..75c48c2c 100644 --- a/packages/cloudflare/src/api/overrides/asset-resolver/index.ts +++ b/packages/cloudflare/src/api/overrides/asset-resolver/index.ts @@ -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"; diff --git a/packages/cloudflare/src/api/overrides/cache-purge/index.ts b/packages/cloudflare/src/api/overrides/cache-purge/index.ts index 8c568d54..cf960122 100644 --- a/packages/cloudflare/src/api/overrides/cache-purge/index.ts +++ b/packages/cloudflare/src/api/overrides/cache-purge/index.ts @@ -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 { diff --git a/packages/cloudflare/src/api/overrides/queue/do-queue.ts b/packages/cloudflare/src/api/overrides/queue/do-queue.ts index c85a184e..ebb1a272 100644 --- a/packages/cloudflare/src/api/overrides/queue/do-queue.ts +++ b/packages/cloudflare/src/api/overrides/queue/do-queue.ts @@ -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", diff --git a/packages/cloudflare/src/api/overrides/queue/memory-queue.ts b/packages/cloudflare/src/api/overrides/queue/memory-queue.ts index 0e0d8524..943b677c 100644 --- a/packages/cloudflare/src/api/overrides/queue/memory-queue.ts +++ b/packages/cloudflare/src/api/overrides/queue/memory-queue.ts @@ -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; diff --git a/packages/cloudflare/src/api/overrides/queue/queue-cache.spec.ts b/packages/cloudflare/src/api/overrides/queue/queue-cache.spec.ts index 471bdc73..ce28a139 100644 --- a/packages/cloudflare/src/api/overrides/queue/queue-cache.spec.ts +++ b/packages/cloudflare/src/api/overrides/queue/queue-cache.spec.ts @@ -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", diff --git a/packages/cloudflare/src/api/overrides/queue/queue-cache.ts b/packages/cloudflare/src/api/overrides/queue/queue-cache.ts index e538687a..f084907e 100644 --- a/packages/cloudflare/src/api/overrides/queue/queue-cache.ts +++ b/packages/cloudflare/src/api/overrides/queue/queue-cache.ts @@ -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 { /** diff --git a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts index 4f52dd15..15ea2a49 100644 --- a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts +++ b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.spec.ts @@ -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(); diff --git a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts index 20d2dfcf..6b1db125 100644 --- a/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts +++ b/packages/cloudflare/src/api/overrides/tag-cache/do-sharded-tag-cache.ts @@ -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; diff --git a/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.spec.ts b/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.spec.ts index 012011ed..65f210af 100644 --- a/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.spec.ts +++ b/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.spec.ts @@ -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", diff --git a/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.ts b/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.ts index b6e5f128..c66f68e0 100644 --- a/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.ts +++ b/packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.ts @@ -1,4 +1,4 @@ -import { NextModeTagCache } from "@opennextjs/aws/types/overrides"; +import { NextModeTagCache } from "@opennextjs/aws/types/overrides.js"; interface WithFilterOptions { /** diff --git a/packages/cloudflare/src/cli/build/open-next/compile-skew-protection.ts b/packages/cloudflare/src/cli/build/open-next/compile-skew-protection.ts index 52ef805c..bd70f252 100644 --- a/packages/cloudflare/src/cli/build/open-next/compile-skew-protection.ts +++ b/packages/cloudflare/src/cli/build/open-next/compile-skew-protection.ts @@ -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))); diff --git a/packages/cloudflare/src/cli/build/patches/ast/patch-vercel-og-library.spec.ts b/packages/cloudflare/src/cli/build/patches/ast/patch-vercel-og-library.spec.ts index 255d4887..ec6e6492 100644 --- a/packages/cloudflare/src/cli/build/patches/ast/patch-vercel-og-library.spec.ts +++ b/packages/cloudflare/src/cli/build/patches/ast/patch-vercel-og-library.spec.ts @@ -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/next@14.2.11/node_modules/next/dist/compiled/@vercel/og"; const nextServerOgNftPath = "examples/api/.next/server/app/og/route.js.nft.json"; diff --git a/packages/cloudflare/src/cli/build/patches/ast/vercel-og.spec.ts b/packages/cloudflare/src/cli/build/patches/ast/vercel-og.spec.ts index 7f346ad5..e40dcb1d 100644 --- a/packages/cloudflare/src/cli/build/patches/ast/vercel-og.spec.ts +++ b/packages/cloudflare/src/cli/build/patches/ast/vercel-og.spec.ts @@ -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", () => { diff --git a/packages/cloudflare/src/cli/build/utils/needs-experimental-react.ts b/packages/cloudflare/src/cli/build/utils/needs-experimental-react.ts index a8f42cea..84406ed2 100644 --- a/packages/cloudflare/src/cli/build/utils/needs-experimental-react.ts +++ b/packages/cloudflare/src/cli/build/utils/needs-experimental-react.ts @@ -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 diff --git a/packages/cloudflare/src/cli/build/utils/workerd.spec.ts b/packages/cloudflare/src/cli/build/utils/workerd.spec.ts index 801bd573..94b0e1b6 100644 --- a/packages/cloudflare/src/cli/build/utils/workerd.spec.ts +++ b/packages/cloudflare/src/cli/build/utils/workerd.spec.ts @@ -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", () => { diff --git a/packages/cloudflare/src/cli/commands/populate-cache.spec.ts b/packages/cloudflare/src/cli/commands/populate-cache.spec.ts index 29ae7231..29fbcacd 100644 --- a/packages/cloudflare/src/cli/commands/populate-cache.spec.ts +++ b/packages/cloudflare/src/cli/commands/populate-cache.spec.ts @@ -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(() => { diff --git a/packages/cloudflare/src/cli/commands/skew-protection.spec.ts b/packages/cloudflare/src/cli/commands/skew-protection.spec.ts index 9c0ef558..acfc5eb5 100644 --- a/packages/cloudflare/src/cli/commands/skew-protection.spec.ts +++ b/packages/cloudflare/src/cli/commands/skew-protection.spec.ts @@ -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", () => { diff --git a/packages/cloudflare/src/cli/commands/skew-protection.ts b/packages/cloudflare/src/cli/commands/skew-protection.ts index acac2161..616cbe2e 100644 --- a/packages/cloudflare/src/cli/commands/skew-protection.ts +++ b/packages/cloudflare/src/cli/commands/skew-protection.ts @@ -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";