Simplify @cloudflare/workers-shared exports

cloudflare · Feb 19, 2025 · deb587b · deb587b
1 parent 693d63e
commit deb587b
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 55 deletions.
diff --git a/.changeset/good-pears-marry.md b/.changeset/good-pears-marry.md
@@ -0,0 +1,5 @@
+---
+"@cloudflare/workers-shared": minor
+---
+
+chore: Remove Workers from @cloudflare/workers-shared exports
diff --git a/packages/vite-plugin-cloudflare/src/asset-workers/asset-worker.ts b/packages/vite-plugin-cloudflare/src/asset-workers/asset-worker.ts
@@ -1,5 +1,4 @@
-// @ts-ignore
-import AssetWorker from "@cloudflare/workers-shared/dist/asset-worker.mjs";
+import AssetWorker from "@cloudflare/workers-shared/asset-worker/src/index";
 import { UNKNOWN_HOST } from "../shared";
 import type { WorkerEntrypoint } from "cloudflare:workers";
 
@@ -8,7 +7,7 @@ interface Env {
 	__VITE_FETCH_ASSET__: Fetcher;
 }
 
-export default class CustomAssetWorker extends (AssetWorker as typeof WorkerEntrypoint<Env>) {
+export default class CustomAssetWorker extends (AssetWorker as typeof WorkerEntrypoint as typeof WorkerEntrypoint<Env>) {
 	override async fetch(request: Request): Promise<Response> {
 		const response = await super.fetch!(request);
 		const modifiedResponse = new Response(response.body, response);

diff --git a/packages/vite-plugin-cloudflare/src/asset-workers/router-worker.ts b/packages/vite-plugin-cloudflare/src/asset-workers/router-worker.ts
@@ -1,4 +1,3 @@
-// @ts-ignore
-import routerWorker from "@cloudflare/workers-shared/dist/router-worker.mjs";
+import routerWorker from "@cloudflare/workers-shared/router-worker/src/index";
 
 export default routerWorker;
diff --git a/packages/workers-shared/asset-worker/src/assets-manifest.ts b/packages/workers-shared/asset-worker/src/assets-manifest.ts
@@ -76,10 +76,14 @@ export const compare = (a: Uint8Array, b: Uint8Array) => {
 	}
 
 	for (const [i, v] of a.entries()) {
-		if (v < b[i]) {
+		const other = b[i];
+		if (other === undefined) {
+			return 1;
+		}
+		if (v < other) {
 			return -1;
 		}
-		if (v > b[i]) {
+		if (v > other) {
 			return 1;
 		}
 	}

diff --git a/packages/workers-shared/asset-worker/src/index.ts b/packages/workers-shared/asset-worker/src/index.ts
@@ -59,7 +59,7 @@ export type Env = {
  * they are still in flux and that they are not an established API contract.
  */
 export default class extends WorkerEntrypoint<Env> {
-	async fetch(request: Request): Promise<Response> {
+	override async fetch(request: Request): Promise<Response> {
 		let sentry: ReturnType<typeof setupSentry> | undefined;
 		const analytics = new Analytics(this.env.ANALYTICS);
 		const performance = new PerformanceTimer(this.env.UNSAFE_PERFORMANCE);

diff --git a/packages/workers-shared/asset-worker/tsconfig.json b/packages/workers-shared/asset-worker/tsconfig.json
@@ -1,15 +1,4 @@
 {
-	"compilerOptions": {
-		"target": "es2021",
-		"lib": ["es2021"],
-		"module": "NodeNext",
-		"moduleResolution": "nodenext",
-		"types": ["@cloudflare/workers-types/experimental"],
-		"noEmit": true,
-		"isolatedModules": true,
-		"allowSyntheticDefaultImports": true,
-		"forceConsistentCasingInFileNames": true,
-		"strict": true,
-		"skipLibCheck": true
-	}
+	"extends": "@cloudflare/workers-tsconfig/worker.json",
+	"include": ["./src/**/*"]
 }
diff --git a/packages/workers-shared/package.json b/packages/workers-shared/package.json
@@ -23,11 +23,7 @@
 		"dist"
 	],
 	"scripts": {
-		"build": "pnpm run clean && pnpm run bundle:asset-worker:prod && pnpm run bundle:router-worker:prod && pnpm run types:emit",
-		"bundle:asset-worker": "esbuild asset-worker/src/index.ts --format=esm --bundle --outfile=dist/asset-worker.mjs --sourcemap=external --external:cloudflare:*",
-		"bundle:asset-worker:prod": "pnpm run bundle:asset-worker --minify && node -r esbuild-register scripts/copy-config-file.ts",
-		"bundle:router-worker": "esbuild router-worker/src/index.ts --format=esm --bundle --outfile=dist/router-worker.mjs --sourcemap=external",
-		"bundle:router-worker:prod": "pnpm run bundle:router-worker --minify",
+		"build": "pnpm run clean && pnpm run types:emit",
 		"check:lint": "eslint . --max-warnings=0",
 		"check:type": "pnpm run check:type:tests && tsc",
 		"check:type:tests": "tsc -p ./asset-worker/tests/tsconfig.json && tsc -p ./router-worker/tests/tsconfig.json",

diff --git a/packages/workers-shared/router-worker/tsconfig.json b/packages/workers-shared/router-worker/tsconfig.json
@@ -1,15 +1,4 @@
 {
-	"compilerOptions": {
-		"target": "es2021",
-		"lib": ["es2021"],
-		"module": "NodeNext",
-		"moduleResolution": "nodenext",
-		"types": ["@cloudflare/workers-types/experimental"],
-		"noEmit": true,
-		"isolatedModules": true,
-		"allowSyntheticDefaultImports": true,
-		"forceConsistentCasingInFileNames": true,
-		"strict": true,
-		"skipLibCheck": true
-	}
+	"extends": "@cloudflare/workers-tsconfig/worker.json",
+	"include": ["./src/**/*"]
 }
diff --git a/packages/workers-shared/scripts/copy-config-file.ts b/packages/workers-shared/scripts/copy-config-file.ts
diff --git a/packages/workers-shared/tsconfig.json b/packages/workers-shared/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"extends": "@cloudflare/workers-tsconfig/tsconfig.json",
 	"compilerOptions": {
+		"alwaysStrict": true,
 		"module": "esnext",
 		"sourceMap": true,
 		"forceConsistentCasingInFileNames": true,