Skip to content

Commit b499b74

Browse files
penalosapenalosa
authored
No more React in wrangler dev (--x-dev-env only) (#7069)
* No more React in dev * fix e2e * remove more dead code * fix * fix fixtures * fix prettier * fix lockfile * more dead code elimination * lockfile * fix regression * Create late-guests-end.md * fix lockfile * fix merge * fix snapshots * remove stray log * windows? * add e2e retries * fail at the right bit of e2e c3 test * skip on windows * remove retries * Update messaging
1 parent f0e6e15 commit b499b74

File tree

119 files changed

+1524
-6408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1524
-6408
lines changed

‎.changeset/late-guests-end.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Internal refactor to remove the non `--x-dev-env` flow from `wrangler dev`

‎fixtures/additional-modules/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build": "wrangler deploy --dry-run --outdir=dist",
66
"check:type": "tsc",
77
"deploy": "wrangler deploy",
8-
"start": "wrangler dev --x-dev-env",
8+
"start": "wrangler dev",
99
"test:ci": "vitest run",
1010
"test:watch": "vitest",
1111
"type:tests": "tsc -p ./test/tsconfig.json"

‎fixtures/d1-worker-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"db:query": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --command='SELECT * FROM Customers'",
1010
"db:query-json": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --command='SELECT * FROM Customers' --json",
1111
"db:reset": "wrangler d1 execute UPDATE_THIS_FOR_REMOTE_USE --local --file=./schema.sql",
12-
"start": "wrangler dev --x-dev-env --local"
12+
"start": "wrangler dev --local"
1313
},
1414
"devDependencies": {
1515
"wrangler": "workspace:*"

‎fixtures/interactive-dev-tests/tests/index.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ function getStartedWorkerdProcesses(): Process[] {
197197
}
198198

199199
const devScripts = [
200-
{ args: ["dev", "--x-dev-env"], expectedBody: "body" },
201-
{ args: ["dev", "--no-x-dev-env"], expectedBody: "body" },
200+
{ args: ["dev"], expectedBody: "body" },
202201
{ args: ["pages", "dev", "public"], expectedBody: "<p>body</p>" },
203202
];
204203
const exitKeys = [
@@ -234,7 +233,7 @@ it.runIf(RUN_IF && nodePtySupported)(
234233
"hotkeys should be unregistered when the initial build fails",
235234
async () => {
236235
const wrangler = await startWranglerDev(
237-
["dev", "--x-dev-env", "src/startup-error.ts"],
236+
["dev", "src/startup-error.ts"],
238237
true
239238
);
240239

‎fixtures/no-bundle-import/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"deploy": "wrangler deploy",
6-
"start": "wrangler dev --x-dev-env",
6+
"start": "wrangler dev",
77
"test:ci": "vitest run",
88
"test:watch": "vitest"
99
},

‎fixtures/nodejs-als-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"build": "wrangler deploy --dry-run --outdir=./dist",
6-
"dev": "wrangler dev --x-dev-env",
6+
"dev": "wrangler dev",
77
"test:ci": "vitest run",
88
"test:watch": "vitest"
99
},

‎fixtures/nodejs-hybrid-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"build": "wrangler deploy --dry-run --outdir=./dist",
6-
"dev": "wrangler dev --x-dev-env",
6+
"dev": "wrangler dev",
77
"test:ci": "vitest run",
88
"test:watch": "vitest"
99
},

‎fixtures/service-bindings-app/a/index.ts

-9
This file was deleted.

‎fixtures/service-bindings-app/a/wrangler.toml

-6
This file was deleted.

‎fixtures/service-bindings-app/b/index.ts

-5
This file was deleted.

‎fixtures/service-bindings-app/b/wrangler.toml

-2
This file was deleted.

‎fixtures/service-bindings-app/package.json

-21
This file was deleted.

‎fixtures/service-bindings-app/tests/index.test.ts

-51
This file was deleted.

‎fixtures/service-bindings-app/tests/tsconfig.json

-7
This file was deleted.

‎fixtures/service-bindings-app/tsconfig.json

-13
This file was deleted.

‎fixtures/service-bindings-app/vitest.config.mts

-9
This file was deleted.

‎fixtures/shared/src/run-wrangler-long-lived.ts

+2-10
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export async function runWranglerPagesDev(
2929
"pages",
3030
"dev",
3131
publicPath,
32-
"--x-dev-env",
3332
"--x-registry",
3433
"--ip=127.0.0.1",
3534
...options,
@@ -39,14 +38,7 @@ export async function runWranglerPagesDev(
3938
);
4039
} else {
4140
return runLongLivedWrangler(
42-
[
43-
"pages",
44-
"dev",
45-
"--x-dev-env",
46-
"--x-registry",
47-
"--ip=127.0.0.1",
48-
...options,
49-
],
41+
["pages", "dev", "--x-registry", "--ip=127.0.0.1", ...options],
5042
cwd,
5143
env
5244
);
@@ -67,7 +59,7 @@ export async function runWranglerDev(
6759
env?: NodeJS.ProcessEnv
6860
) {
6961
return runLongLivedWrangler(
70-
["dev", "--x-dev-env", "--x-registry", "--ip=127.0.0.1", ...options],
62+
["dev", "--x-registry", "--ip=127.0.0.1", ...options],
7163
cwd,
7264
env
7365
);

‎fixtures/worker-ts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"deploy": "wrangler deploy",
6-
"start": "wrangler dev --x-dev-env"
6+
"start": "wrangler dev"
77
},
88
"devDependencies": {
99
"@cloudflare/workers-types": "^4.20241106.0",

‎fixtures/workflow/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"private": true,
44
"scripts": {
55
"deploy": "wrangler deploy",
6-
"start": "wrangler dev --x-dev-env",
6+
"start": "wrangler dev",
77
"test:ci": "vitest"
88
},
99
"devDependencies": {

‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@
8080
"@types/node": "$@types/node"
8181
},
8282
"patchedDependencies": {
83-
"[email protected]": "patches/[email protected]",
8483
"@cloudflare/[email protected]": "patches/@[email protected]",
8584
"[email protected]": "patches/[email protected]",
8685
"[email protected]": "patches/[email protected]",

‎packages/wrangler/e2e/__snapshots__/dev.test.ts.snap

+10-38
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,21 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > --test-scheduled works with wrangler dev --no-x-dev-env > custom build 1`] = `"Ran scheduled event"`;
3+
exports[`basic js dev: 'wrangler dev --remote' > --test-scheduled works with wrangler dev --remote > custom build 1`] = `"Ran scheduled event"`;
44

5-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > --test-scheduled works with wrangler dev --no-x-dev-env > no custom build 1`] = `"Ran scheduled event"`;
5+
exports[`basic js dev: 'wrangler dev --remote' > --test-scheduled works with wrangler dev --remote > no custom build 1`] = `"Ran scheduled event"`;
66

7-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > --test-scheduled works with wrangler dev --no-x-dev-env 1`] = `"Ran scheduled event"`;
7+
exports[`basic js dev: 'wrangler dev --remote' > can modify worker during wrangler dev --remote 1`] = `"Hello World!"`;
88

9-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > can modify worker during wrangler dev --no-x-dev-env 1`] = `"Hello World!"`;
9+
exports[`basic js dev: 'wrangler dev --remote' > can modify worker during wrangler dev --remote 2`] = `"Updated Worker! value"`;
1010

11-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > can modify worker during wrangler dev --no-x-dev-env 2`] = `"Updated Worker! value"`;
11+
exports[`basic js dev: 'wrangler dev --remote' > hotkeys can be disabled with wrangler dev --remote 1`] = `"Hello World!"`;
1212

13-
exports[`basic js dev: 'wrangler dev --no-x-dev-env' > hotkeys can be disabled with wrangler dev --no-x-dev-env 1`] = `"Hello World!"`;
13+
exports[`basic js dev: 'wrangler dev' > --test-scheduled works with wrangler dev > custom build 1`] = `"Ran scheduled event"`;
1414

15-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > --test-scheduled works with wrangler dev --remote --no-x-dev-env > custom build 1`] = `"Ran scheduled event"`;
15+
exports[`basic js dev: 'wrangler dev' > --test-scheduled works with wrangler dev > no custom build 1`] = `"Ran scheduled event"`;
1616

17-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > --test-scheduled works with wrangler dev --remote --no-x-dev-env > no custom build 1`] = `"Ran scheduled event"`;
17+
exports[`basic js dev: 'wrangler dev' > can modify worker during wrangler dev 1`] = `"Hello World!"`;
1818

19-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > --test-scheduled works with wrangler dev --remote --no-x-dev-env 1`] = `"Ran scheduled event"`;
19+
exports[`basic js dev: 'wrangler dev' > can modify worker during wrangler dev 2`] = `"Updated Worker! value"`;
2020

21-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > can modify worker during wrangler dev --remote --no-x-dev-env 1`] = `"Hello World!"`;
22-
23-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > can modify worker during wrangler dev --remote --no-x-dev-env 2`] = `"Updated Worker! value"`;
24-
25-
exports[`basic js dev: 'wrangler dev --remote --no-x-dev-env' > hotkeys can be disabled with wrangler dev --remote --no-x-dev-env 1`] = `"Hello World!"`;
26-
27-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > --test-scheduled works with wrangler dev --remote --x-dev-env > custom build 1`] = `"Ran scheduled event"`;
28-
29-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > --test-scheduled works with wrangler dev --remote --x-dev-env > no custom build 1`] = `"Ran scheduled event"`;
30-
31-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > --test-scheduled works with wrangler dev --remote --x-dev-env 1`] = `"Ran scheduled event"`;
32-
33-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > can modify worker during wrangler dev --remote --x-dev-env 1`] = `"Hello World!"`;
34-
35-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > can modify worker during wrangler dev --remote --x-dev-env 2`] = `"Updated Worker! value"`;
36-
37-
exports[`basic js dev: 'wrangler dev --remote --x-dev-env' > hotkeys can be disabled with wrangler dev --remote --x-dev-env 1`] = `"Hello World!"`;
38-
39-
exports[`basic js dev: 'wrangler dev --x-dev-env' > --test-scheduled works with wrangler dev --x-dev-env > custom build 1`] = `"Ran scheduled event"`;
40-
41-
exports[`basic js dev: 'wrangler dev --x-dev-env' > --test-scheduled works with wrangler dev --x-dev-env > no custom build 1`] = `"Ran scheduled event"`;
42-
43-
exports[`basic js dev: 'wrangler dev --x-dev-env' > --test-scheduled works with wrangler dev --x-dev-env 1`] = `"Ran scheduled event"`;
44-
45-
exports[`basic js dev: 'wrangler dev --x-dev-env' > can modify worker during wrangler dev --x-dev-env 1`] = `"Hello World!"`;
46-
47-
exports[`basic js dev: 'wrangler dev --x-dev-env' > can modify worker during wrangler dev --x-dev-env 2`] = `"Updated Worker! value"`;
48-
49-
exports[`basic js dev: 'wrangler dev --x-dev-env' > hotkeys can be disabled with wrangler dev --x-dev-env 1`] = `"Hello World!"`;
21+
exports[`basic js dev: 'wrangler dev' > hotkeys can be disabled with wrangler dev 1`] = `"Hello World!"`;

‎packages/wrangler/e2e/__snapshots__/pages-dev.test.ts.snap

+1-42
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,6 @@
11
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
22

3-
exports[`Pages 'wrangler pages dev --no-x-dev-env' > should merge (with override) \`wrangler.toml\` configuration with configuration provided via the command line, with command line args taking precedence 1`] = `
4-
"✨ Compiled Worker successfully
5-
▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
6-
Be aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.
7-
Remote Durable Objects that are affected:
8-
- {"name":"DO_BINDING_1_TOML","class_name":"DO_1_TOML","script_name":"DO_SCRIPT_1_TOML"}
9-
- {"name":"DO_BINDING_2_TOML","class_name":"DO_2_TOML","script_name":"DO_SCRIPT_2_TOML"}
10-
▲ [WARNING] This worker is bound to live services: SERVICE_BINDING_1_TOML (SERVICE_NAME_1_TOML), SERVICE_BINDING_2_TOML (SERVICE_NAME_2_TOML)
11-
Your worker has access to the following bindings:
12-
- Durable Objects:
13-
- DO_BINDING_1_TOML: NEW_DO_1 (defined in NEW_DO_SCRIPT_1 [not connected])
14-
- DO_BINDING_2_TOML: DO_2_TOML (defined in DO_SCRIPT_2_TOML [not connected])
15-
- DO_BINDING_3_ARGS: DO_3_ARGS (defined in DO_SCRIPT_3_ARGS [not connected])
16-
- KV Namespaces:
17-
- KV_BINDING_1_TOML: NEW_KV_ID_1 (local)
18-
- KV_BINDING_2_TOML: KV_ID_2_TOML (local)
19-
- KV_BINDING_3_ARGS: KV_ID_3_ARGS (local)
20-
- D1 Databases:
21-
- D1_BINDING_1_TOML: local-D1_BINDING_1_TOML=NEW_D1_NAME_1 (NEW_D1_NAME_1) (local)
22-
- D1_BINDING_2_TOML: D1_NAME_2_TOML (D1_ID_2_TOML) (local)
23-
- D1_BINDING_3_ARGS: local-D1_BINDING_3_ARGS=D1_NAME_3_ARGS (D1_NAME_3_ARGS) (local)
24-
- R2 Buckets:
25-
- R2_BINDING_1_TOML: NEW_R2_BUCKET_1 (local)
26-
- R2_BINDING_2_TOML: R2_BUCKET_2_TOML (local)
27-
- R2_BINDING_3_TOML: R2_BUCKET_3_ARGS (local)
28-
- Services:
29-
- SERVICE_BINDING_1_TOML: NEW_SERVICE_NAME_1 [not connected]
30-
- SERVICE_BINDING_2_TOML: SERVICE_NAME_2_TOML [not connected]
31-
- SERVICE_BINDING_3_TOML: SERVICE_NAME_3_ARGS [not connected]
32-
- AI:
33-
- Name: AI_BINDING_2_TOML
34-
- Vars:
35-
- VAR1: "(hidden)"
36-
- VAR2: "VAR_2_TOML"
37-
- VAR3: "(hidden)"
38-
Service bindings & durable object bindings connect to other \`wrangler dev\` processes running locally, with their connection status indicated by [connected] or [not connected]. For more details, refer to https://developers.cloudflare.com/workers/runtime-apis/bindings/service-bindings/#local-development
39-
▲ [WARNING] ⎔ Support for service bindings in local mode is experimental and may change.
40-
▲ [WARNING] ⎔ Support for external Durable Objects in local mode is experimental and may change.
41-
"
42-
`;
43-
44-
exports[`Pages 'wrangler pages dev --x-dev-env' > should merge (with override) \`wrangler.toml\` configuration with configuration provided via the command line, with command line args taking precedence 1`] = `
3+
exports[`Pages 'wrangler pages dev' > should merge (with override) \`wrangler.toml\` configuration with configuration provided via the command line, with command line args taking precedence 1`] = `
454
"✨ Compiled Worker successfully
465
▲ [WARNING] WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.
476
Be aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.

0 commit comments

Comments
 (0)