run_worker_first support in wrangler #9509

emily-shen · 2025-06-06T12:22:49Z

Supersedes #9304

Follows on from #9416

Tests
- TODO (before merge)
- Tests included
- Tests not necessary because:
Wrangler / Vite E2E Tests CI Job required? (Use "e2e" label or ask maintainer to run separately)
- I don't know
- Required
- Not required because:
Public documentation
- TODO (before merge)
- Cloudflare docs PR(s):
- Documentation not necessary because: done separately
Wrangler V3 Backport
- TODO (before merge)
- Wrangler PR:
- Not necessary because: new feat

changeset-bot · 2025-06-06T12:22:53Z

🦋 Changeset detected

Latest commit: 79c6ce9

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 5 packages

Name	Type
miniflare	Minor
wrangler	Minor
@cloudflare/pages-shared	Patch
@cloudflare/vite-plugin	Patch
@cloudflare/vitest-pool-workers	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

pkg-pr-new · 2025-06-06T16:03:46Z

create-cloudflare

npm i https://pkg.pr.new/create-cloudflare@9509

@cloudflare/kv-asset-handler

npm i https://pkg.pr.new/@cloudflare/kv-asset-handler@9509

miniflare

npm i https://pkg.pr.new/miniflare@9509

@cloudflare/pages-shared

npm i https://pkg.pr.new/@cloudflare/pages-shared@9509

@cloudflare/unenv-preset

npm i https://pkg.pr.new/@cloudflare/unenv-preset@9509

@cloudflare/vite-plugin

npm i https://pkg.pr.new/@cloudflare/vite-plugin@9509

@cloudflare/vitest-pool-workers

npm i https://pkg.pr.new/@cloudflare/vitest-pool-workers@9509

@cloudflare/workers-editor-shared

npm i https://pkg.pr.new/@cloudflare/workers-editor-shared@9509

wrangler

npm i https://pkg.pr.new/wrangler@9509

commit: 79c6ce9

jamesopstad

Various minor comments but looks good!

.changeset/tasty-hoops-own.md

packages/workers-shared/utils/configuration/constants.ts

packages/workers-shared/utils/configuration/parseStaticRouting.ts

packages/wrangler/src/__tests__/deploy.test.ts

packages/wrangler/src/assets.ts

packages/wrangler/src/config/environment.ts

packages/wrangler/src/config/validation.ts

jamesopstad · 2025-06-09T09:07:18Z

packages/wrangler/src/deployment-bundle/create-worker-upload-form.ts

+		if (assets?.routerConfig?.static_routing) {
+			const rawAssetConfig =
+				assets.routerConfig.static_routing.asset_worker?.map(
+					// unparse this for upload :(


This doesn't seem ideal. Why does Wrangler need to split the original array except for local dev?

I agree, this is definitely not ideal :(

I put it here as remote dev and deploy both need it, but on reflection its probably easier to just pass the whole thing through even if its redundant in dev (cec7cc0).

it would be good to disentangle dev asset options and upload asset options entirely, but probably best for a followup PR

petebacondarwin

Nice work. Just a bunch of nits and queries

fixtures/workers-with-assets-static-routing/public/worker/worker-runs.html

fixtures/workers-with-assets-static-routing/spa-assets/index.html

fixtures/workers-with-assets-static-routing/package.json

fixtures/workers-with-assets-static-routing/wrangler.jsonc

packages/workers-shared/utils/configuration/parseStaticRouting.ts

petebacondarwin · 2025-06-11T10:37:50Z

packages/workers-shared/utils/tests/parseStaticRouting.test.ts

+import { parseStaticRouting } from "../configuration/parseStaticRouting";
+
+describe("parseStaticRouting", () => {
+	it("throws when given empty rules", () => {


OOC - why throw an error for some invalid rules but return an object containing {errors} for other invalid rules?

partially because i'm just copying EWC's validation exactly.
but also the ones that throw are 'general' errors, and the ones that we collect are rule-specific errors.

petebacondarwin · 2025-06-11T10:43:18Z

packages/workers-shared/utils/tests/parseStaticRouting.test.ts

+		expect(errorMessage).toMatchInlineSnapshot(
+			`
+			"Invalid routes in run_worker_first:
+			'/api/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa': all rules must be less than 100 characters in length"


Interesting note: the ! of negative rules does not count towards the maximum size, right?

I don't think so, since i don't think we store them with the ! - @matthewdavidrodgers is this right?

packages/wrangler/src/__tests__/deploy.test.ts

packages/wrangler/src/assets.ts

packages/wrangler/src/deployment-bundle/worker.ts

jamesopstad · 2025-06-11T12:32:05Z

packages/wrangler/src/assets.ts

+	if (typeof config.assets?.run_worker_first === "boolean") {
+		routerConfig.invoke_user_worker_ahead_of_assets =
+			config.assets.run_worker_first;
+	} else if (Array.isArray(config.assets?.run_worker_first)) {
+		const { parsed, errorMessage } = parseStaticRouting(
+			config.assets.run_worker_first
+		);
+		if (errorMessage) {
+			throw new UserError(errorMessage, {
+				telemetryMessage: "invalid run_worker_first rules",
+			});
+		}
+		routerConfig.static_routing = parsed;
+	}


Just wondering if it would simplify things in miniflare, wrangler dev and vite dev if parseStaticRouting received the run_worker_first value directly and treated true as an alias for { parsed: { user_worker: ["/*"] }}? That way we wouldn't need to worry about the invoke_user_worker_ahead_of_assets value. false could return { parsed: undefined }. No big deal if not. This only changes the internals so we could always do this later. cc @petebacondarwin.

It is likely that the internal implementation of run_worker_first: true is simplified (i.e. no need to do any pattern matching at all), so I am hesitant to say we should alias true to /*.

Sure. I'm happy to keep things as they are.

yeah its what pete said - router worker actually getst this as two different config options invoke_user_worker_ahead_of_assets or static_routing

emily-shen requested review from a team as code owners June 6, 2025 12:22

workers-devprod added e2e Run wrangler + vite-plugin e2e tests on a PR c3-e2e Run c3 e2e tests on a PR labels Jun 6, 2025

emily-shen changed the title ~~Emily/routes plumbing take 2~~ run_worker_first support in wrangler dev Jun 6, 2025

emily-shen changed the base branch from main to pr/matthewdavidrodgers/9416 June 6, 2025 12:31

emily-shen changed the base branch from pr/matthewdavidrodgers/9416 to main June 6, 2025 12:31

emily-shen force-pushed the emily/routes-plumbing-take-2 branch 2 times, most recently from fa21799 to d4ca6c7 Compare June 6, 2025 15:58

workers-devprod added this to workers-sdk Jun 6, 2025

github-project-automation bot moved this to Untriaged in workers-sdk Jun 6, 2025

emily-shen changed the title ~~run_worker_first support in wrangler dev~~ run_worker_first support in wrangler Jun 6, 2025

emily-shen force-pushed the emily/routes-plumbing-take-2 branch from 3916678 to 0ec5888 Compare June 8, 2025 13:47

jamesopstad approved these changes Jun 9, 2025

View reviewed changes

github-project-automation bot moved this from Untriaged to Approved in workers-sdk Jun 9, 2025

petebacondarwin approved these changes Jun 11, 2025

View reviewed changes

jamesopstad reviewed Jun 11, 2025

View reviewed changes

emily-shen added 8 commits June 11, 2025 14:51

add static_routing validation

db6e206

wrangler plumbing

d791f25

e2e test

0005681

add to asset config

3285e1b

unbork pnpm lock

bc708f2

add to deploy

4ccb114

sort of simplify uploading run_worker_first

82b16c6

pr feedback

bdc0071

emily-shen added 2 commits June 11, 2025 14:51

fixup

f7d4392

pr feedback

957e4a4

emily-shen force-pushed the emily/routes-plumbing-take-2 branch from a73a801 to 957e4a4 Compare June 11, 2025 13:53

changeset

79c6ce9

emily-shen added this pull request to the merge queue Jun 11, 2025

emily-shen mentioned this pull request Jun 11, 2025

Add _routes.json to wrangler dev and deploy #9304

Closed

12 tasks

emily-shen removed this pull request from the merge queue due to a manual request Jun 11, 2025

emily-shen added this pull request to the merge queue Jun 11, 2025

Merged via the queue into main with commit 0b2ba45 Jun 11, 2025
20 checks passed

emily-shen deleted the emily/routes-plumbing-take-2 branch June 11, 2025 15:32

github-project-automation bot moved this from Approved to Done in workers-sdk Jun 11, 2025

workers-devprod mentioned this pull request Jun 11, 2025

Version Packages #9557

Merged

run_worker_first support in wrangler #9509

run_worker_first support in wrangler #9509

Uh oh!

Conversation

emily-shen commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

pkg-pr-new bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jamesopstad left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

petebacondarwin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

emily-shen commented Jun 6, 2025 •

edited

Loading

changeset-bot bot commented Jun 6, 2025 •

edited

Loading

pkg-pr-new bot commented Jun 6, 2025 •

edited

Loading