From be0967e7058f49bdea09e6944276e26fdaa96980 Mon Sep 17 00:00:00 2001 From: Bastian Kistner Date: Sun, 20 Jul 2025 14:53:37 +0200 Subject: [PATCH 1/2] fix: cloudflare workers-types usage Use devDependencies for types and optionally peerDependencies Otherwise, this will mess up any app or library that uses cloudflare's auto-generated workers types --- packages/edge/package.json | 9 +++++++-- packages/edge/src/edge.test.ts | 4 ++-- packages/edge/src/edge.ts | 2 +- packages/edge/src/edgeWithExecutionContext.ts | 2 +- yarn.lock | 6 +++--- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/edge/package.json b/packages/edge/package.json index 4053075..b64e923 100644 --- a/packages/edge/package.json +++ b/packages/edge/package.json @@ -1,6 +1,6 @@ { "name": "@logtail/edge", - "version": "0.5.5", + "version": "0.5.6", "description": "Better Stack Edge runtime logger (formerly Logtail)", "keywords": [ "Better Stack", @@ -40,7 +40,6 @@ "url": "https://github.com/logtail/logtail-js/issues" }, "dependencies": { - "@cloudflare/workers-types": "^4.20230904.0", "@logtail/core": "^0.5.4", "@logtail/types": "^0.5.3", "@msgpack/msgpack": "^2.5.1", @@ -48,5 +47,11 @@ "minimatch": "^9.0.5", "stack-trace": "0.0.10" }, + "devDependencies": { + "@cloudflare/workers-types": "^4.20230904.0" + }, + "peerDependencies": { + "@cloudflare/workers-types": "^4.20230904.0" + }, "gitHead": "0f816cacc21b352576a5707741f9151aa1481041" } diff --git a/packages/edge/src/edge.test.ts b/packages/edge/src/edge.test.ts index 1104128..daaebc8 100644 --- a/packages/edge/src/edge.test.ts +++ b/packages/edge/src/edge.test.ts @@ -3,7 +3,7 @@ import { ILogtailLog, LogLevel } from "@logtail/types"; import { Edge } from "./edge"; import { Mock } from "jest-mock"; -import { ExecutionContext } from "@cloudflare/workers-types"; +import type { ExecutionContext } from "@cloudflare/workers-types"; addEventListener("fetch", (event) => { console.log(event); @@ -117,7 +117,7 @@ describe("edge tests", () => { const edgeWithCtx = edge.withExecutionContext({ waitUntil() {}, passThroughOnException() {}, - } as ExecutionContext); + } as unknown as ExecutionContext); edgeWithCtx.log(message); edgeWithCtx.info(message); diff --git a/packages/edge/src/edge.ts b/packages/edge/src/edge.ts index d3e6d65..9b45a83 100644 --- a/packages/edge/src/edge.ts +++ b/packages/edge/src/edge.ts @@ -3,7 +3,7 @@ import { encode } from "@msgpack/msgpack"; import { Context, ILogLevel, ILogtailLog, ILogtailEdgeOptions, LogLevel } from "@logtail/types"; import { Base } from "@logtail/core"; -import { ExecutionContext } from "@cloudflare/workers-types"; +import type { ExecutionContext } from "@cloudflare/workers-types"; import { getStackContext } from "./context"; import { EdgeWithExecutionContext } from "./edgeWithExecutionContext"; diff --git a/packages/edge/src/edgeWithExecutionContext.ts b/packages/edge/src/edgeWithExecutionContext.ts index 73fd02c..30a7ef6 100644 --- a/packages/edge/src/edgeWithExecutionContext.ts +++ b/packages/edge/src/edgeWithExecutionContext.ts @@ -1,6 +1,6 @@ import { Context, ILogLevel, ILogtailLog } from "@logtail/types"; -import { ExecutionContext } from "@cloudflare/workers-types"; +import type { ExecutionContext } from "@cloudflare/workers-types"; import { Edge } from "./edge"; diff --git a/yarn.lock b/yarn.lock index 292812a..087725f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -302,9 +302,9 @@ integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== "@cloudflare/workers-types@^4.20230904.0": - version "4.20240620.0" - resolved "https://registry.yarnpkg.com/@cloudflare/workers-types/-/workers-types-4.20240620.0.tgz#1e996c0b81a1dab392f0292bea036fd7bb3b73f3" - integrity sha512-CQD8YS6evRob7LChvIX3gE3zYo0KVgaLDOu1SwNP1BVIS2Sa0b+FC8S1e1hhrNN8/E4chYlVN+FDAgA4KRDUEQ== + version "4.20250719.0" + resolved "https://registry.yarnpkg.com/@cloudflare/workers-types/-/workers-types-4.20250719.0.tgz#f84eda1416f30768a77f710780a4eb3fdd197d54" + integrity sha512-tSc2FM2QPWA8ZmDniQXz+4qVKuf8zrwVwqlkXxxGBsQHxTpcukuMibYcYWxwonzbzK7YzSug+iena2F8gGOuOw== "@colors/colors@1.6.0", "@colors/colors@^1.6.0": version "1.6.0" From 0a07a35be461756a9fcb5484a0a2a0c2adf7d243 Mon Sep 17 00:00:00 2001 From: Petr Heinz Date: Tue, 4 Nov 2025 16:48:34 +0100 Subject: [PATCH 2/2] :lipstick: prettier --- packages/edge/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/edge/package.json b/packages/edge/package.json index e351517..46d99be 100644 --- a/packages/edge/package.json +++ b/packages/edge/package.json @@ -48,10 +48,10 @@ "stack-trace": "0.0.10" }, "devDependencies": { - "@cloudflare/workers-types": "^4.20230904.0" + "@cloudflare/workers-types": "^4.20230904.0" }, "peerDependencies": { - "@cloudflare/workers-types": "^4.20230904.0" + "@cloudflare/workers-types": "^4.20230904.0" }, "gitHead": "0f816cacc21b352576a5707741f9151aa1481041" }