Skip to content

Commit 7fdd394

Browse files
Fix up vite-plugin runner type params (#10631)
* refactor: update runner-worker with better type params * turn off inspector for wrangler e2e tests where not needed
1 parent 597e07a commit 7fdd394

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

packages/vite-plugin-cloudflare/src/runner-worker/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export { __VITE_RUNNER_OBJECT__ } from "./module-runner";
1414
* Constructor interface for `WorkerEntrypoint` class.
1515
* @template T - The `env` type
1616
*/
17-
interface WorkerEntrypointConstructor<T = unknown> {
17+
interface WorkerEntrypointConstructor<T = Cloudflare.Env> {
1818
new (
1919
...args: ConstructorParameters<typeof WorkerEntrypoint<T>>
2020
): WorkerEntrypoint<T>;
@@ -24,7 +24,7 @@ interface WorkerEntrypointConstructor<T = unknown> {
2424
* Constructor interface for `DurableObject` class.
2525
* @template T - The `env` type
2626
*/
27-
interface DurableObjectConstructor<T = unknown> {
27+
interface DurableObjectConstructor<T = Cloudflare.Env> {
2828
new (
2929
...args: ConstructorParameters<typeof DurableObject<T>>
3030
): DurableObject<T>;
@@ -34,7 +34,7 @@ interface DurableObjectConstructor<T = unknown> {
3434
* Constructor interface for `WorkflowEntrypoint` class.
3535
* @template T - The `env` type
3636
*/
37-
interface WorkflowEntrypointConstructor<T = unknown> {
37+
interface WorkflowEntrypointConstructor<T = Cloudflare.Env> {
3838
new (
3939
...args: ConstructorParameters<typeof WorkflowEntrypoint<T>>
4040
): WorkflowEntrypoint<T>;

packages/wrangler/e2e/remote-binding/start-worker-remote-bindings.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)("startWorker - remote bindings", () => {
5353
config: `${helper.tmpPath}/wrangler.json`,
5454
dev: {
5555
experimentalRemoteBindings,
56+
inspector: false,
5657
},
5758
});
5859

@@ -87,6 +88,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)("startWorker - remote bindings", () => {
8788
config: `${helper.tmpPath}/wrangler.json`,
8889
dev: {
8990
experimentalRemoteBindings,
91+
inspector: false,
9092
},
9193
});
9294

packages/wrangler/e2e/start-worker-auth-opts.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ describe("startWorker - auth options", () => {
7373
},
7474
dev: {
7575
auth: validAuth,
76+
inspector: false,
7677
},
7778
});
7879

@@ -124,6 +125,7 @@ describe("startWorker - auth options", () => {
124125
},
125126
dev: {
126127
auth: incorrectAuth,
128+
inspector: false,
127129
},
128130
});
129131

packages/wrangler/e2e/startWorker.test.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe("DevEnv", () => {
7373
const worker = await startWorker({
7474
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
7575

76-
dev: { remote },
76+
dev: { remote, inspector: false },
7777
});
7878

7979
let res = await worker.fetch("http://dummy");
@@ -343,6 +343,7 @@ describe("DevEnv", () => {
343343
dev: {
344344
remote,
345345
liveReload: true,
346+
inspector: false,
346347
},
347348
});
348349

@@ -436,6 +437,7 @@ describe("DevEnv", () => {
436437
const worker = await startWorker({
437438
name: "test-worker",
438439
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
440+
dev: { inspector: false },
439441
});
440442

441443
await expect(worker.fetch("http://dummy")).rejects.toThrowError("Boom!");
@@ -521,6 +523,7 @@ describe("DevEnv", () => {
521523
origin: {
522524
hostname: "www.google.com",
523525
},
526+
inspector: false,
524527
},
525528
});
526529

@@ -574,6 +577,9 @@ describe("DevEnv", () => {
574577
const worker = await startWorker({
575578
name: "test-worker",
576579
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
580+
dev: {
581+
inspector: false,
582+
},
577583
});
578584

579585
let res = await worker.fetch("http://dummy/short");
@@ -641,6 +647,7 @@ describe("DevEnv", () => {
641647
config: path.resolve(helper.tmpPath, "wrangler.jsonc"),
642648
name: "test-worker",
643649
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
650+
dev: { inspector: false },
644651
});
645652

646653
const res = await worker.fetch("http://dummy/test/path/1");
@@ -686,6 +693,7 @@ describe("DevEnv", () => {
686693
config: path.resolve(helper.tmpPath, "wrangler.jsonc"),
687694
name: "test-worker",
688695
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
696+
dev: { inspector: false },
689697
});
690698

691699
const res = await worker.fetch("http://dummy/test/path/1");
@@ -743,6 +751,7 @@ describe("DevEnv", () => {
743751
WRANGLER_ENV_VAR_3: { type: "plain_text", value: "inline-3" },
744752
WRANGLER_ENV_VAR_4: { type: "plain_text", value: "inline-4" },
745753
},
754+
dev: { inspector: false },
746755
});
747756

748757
const res = await worker.fetch("http://dummy/test/path/1");
@@ -798,6 +807,7 @@ describe("DevEnv", () => {
798807
name: "test-worker",
799808
entrypoint: path.resolve(helper.tmpPath, "src/index.ts"),
800809
envFiles: ["other/.env", "other/.env.local"],
810+
dev: { inspector: false },
801811
});
802812

803813
const res = await worker.fetch("http://dummy/test/path/1");

0 commit comments

Comments
 (0)