Skip to content

Commit f62d0b6

Browse files
authored
Use tsdown to bundle the Vite plugin (#10866)
* Use tsdown to bundle Vite plugin * Move Workers into separate directory * Add changeset
1 parent 26adce7 commit f62d0b6

File tree

16 files changed

+664
-210
lines changed

16 files changed

+664
-210
lines changed

.changeset/crazy-hounds-rhyme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@cloudflare/vite-plugin": patch
3+
---
4+
5+
Use tsdown to bundle the package.

packages/vite-plugin-cloudflare/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
"dist"
3434
],
3535
"scripts": {
36-
"build": "tsup",
36+
"build": "tsdown",
3737
"check:type": "tsc --build",
38-
"dev": "tsup --watch",
38+
"dev": "tsdown --watch",
3939
"test": "vitest run",
4040
"test:ci": "pnpm test",
4141
"test:e2e": "vitest run -c e2e/vitest.config.ts",
@@ -62,7 +62,7 @@
6262
"@types/ws": "^8.5.13",
6363
"magic-string": "^0.30.12",
6464
"mlly": "^1.7.4",
65-
"tsup": "8.3.0",
65+
"tsdown": "^0.15.4",
6666
"typescript": "catalog:default",
6767
"vite": "catalog:vite-plugin",
6868
"vitest": "catalog:default"

packages/vite-plugin-cloudflare/src/miniflare-options.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ function getWorkerToWorkflowEntrypointClassNamesMap(
180180
// to paths ensures correct names. This requires us to specify `contents` in
181181
// the miniflare module definitions though, as the new paths don't exist.
182182
const miniflareModulesRoot = process.platform === "win32" ? "Z:\\" : "/";
183-
const ROUTER_WORKER_PATH = "./asset-workers/router-worker.js";
184-
const ASSET_WORKER_PATH = "./asset-workers/asset-worker.js";
183+
const ROUTER_WORKER_PATH = "./workers/router-worker.js";
184+
const ASSET_WORKER_PATH = "./workers/asset-worker.js";
185+
const VITE_PROXY_WORKER_PATH = "./workers/vite-proxy-worker.js";
186+
const RUNNER_PATH = "./workers/runner-worker.js";
185187
const WRAPPER_PATH = "__VITE_WORKER_ENTRY__";
186-
const RUNNER_PATH = "./runner-worker/index.js";
187-
const VITE_PROXY_WORKER_PATH = "./vite-proxy-worker/index.js";
188188

189189
export function getEntryWorkerConfig(
190190
resolvedPluginConfig: AssetsOnlyResolvedConfig | WorkersResolvedConfig

packages/vite-plugin-cloudflare/src/asset-workers/asset-worker.ts renamed to packages/vite-plugin-cloudflare/src/workers/asset-worker/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import AssetWorker from "@cloudflare/workers-shared/asset-worker";
2-
import { UNKNOWN_HOST } from "../shared";
2+
import { UNKNOWN_HOST } from "../../shared";
33
import type { Env as _Env } from "@cloudflare/workers-shared/asset-worker";
44
import type { ResolvedConfig } from "vite";
55

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
INIT_PATH,
88
IS_ENTRY_WORKER_HEADER,
99
WORKER_ENTRY_PATH_HEADER,
10-
} from "../shared";
10+
} from "../../shared";
1111
import { stripInternalEnv } from "./env";
1212
import { maybeCaptureError } from "./errors";
1313
import { getWorkerEntryExport } from "./module-runner";

packages/vite-plugin-cloudflare/src/runner-worker/module-runner.ts renamed to packages/vite-plugin-cloudflare/src/workers/runner-worker/module-runner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DurableObject } from "cloudflare:workers";
22
import { ModuleRunner, ssrModuleExportsKey } from "vite/module-runner";
3-
import { VIRTUAL_WORKER_ENTRY } from "../plugins/virtual-modules";
4-
import { INIT_PATH, UNKNOWN_HOST } from "../shared";
3+
import { VIRTUAL_WORKER_ENTRY } from "../../plugins/virtual-modules";
4+
import { INIT_PATH, UNKNOWN_HOST } from "../../shared";
55
import { stripInternalEnv } from "./env";
66
import type { WrapperEnv } from "./env";
77
import type {

0 commit comments

Comments
 (0)