Skip to content

Commit 43b6f7b

Browse files
dario-piotrowiczdario-piotrowicz
authored
chore: rename old mixed-mode references to remote-bindings (#10134)
1 parent b70a702 commit 43b6f7b

File tree

16 files changed

+115
-115
lines changed

16 files changed

+115
-115
lines changed

‎packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/auxiliary-worker/wrangler.jsonc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "cloudflare-vite-e2e-mixed-mode-auxiliary-worker",
2+
"name": "cloudflare-vite-e2e-remote-bindings-auxiliary-worker",
33
"main": "./src/index.ts",
44
"compatibility_date": "2024-12-30",
55
"compatibility_flags": ["nodejs_compat"],

‎packages/vite-plugin-cloudflare/e2e/fixtures/remote-bindings/entry-worker/wrangler.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "cloudflare-vite-e2e-mixed-mode-entry-worker",
2+
"name": "cloudflare-vite-e2e-remote-bindings-entry-worker",
33
"main": "./src/index.ts",
44
"compatibility_date": "2024-12-30",
55
"compatibility_flags": ["nodejs_compat"],
66
"services": [
77
{
88
"binding": "LOCAL_WORKER",
9-
"service": "cloudflare-vite-e2e-mixed-mode-auxiliary-worker",
9+
"service": "cloudflare-vite-e2e-remote-bindings-auxiliary-worker",
1010
"experimental_remote": false,
1111
},
1212
{

‎packages/wrangler/e2e/remote-binding/dev-remote-bindings.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
4141
await spawnLocalWorker(helper);
4242
await helper.seed({
4343
"wrangler.json": JSON.stringify({
44-
name: "mixed-mode-mixed-bindings-test",
44+
name: "remote-bindings-mixed-bindings-test",
4545
main: "local-and-remote-service-bindings.js",
4646
compatibility_date: "2025-05-07",
4747
services: [
@@ -70,7 +70,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
7070
await spawnLocalWorker(helper);
7171
await helper.seed({
7272
"wrangler.json": JSON.stringify({
73-
name: "mixed-mode-mixed-bindings-test",
73+
name: "remote-bindings-mixed-bindings-test",
7474
main: "simple-service-binding.js",
7575
compatibility_date: "2025-05-07",
7676
services: [
@@ -127,7 +127,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
127127
await spawnLocalWorker(helper);
128128
await helper.seed({
129129
"wrangler.json": JSON.stringify({
130-
name: "mixed-mode-mixed-bindings-test",
130+
name: "remote-bindings-mixed-bindings-test",
131131
main: "local-service-binding-and-remote-ai.js",
132132
compatibility_date: "2025-05-07",
133133
ai: {
@@ -150,11 +150,11 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
150150
`);
151151
});
152152

153-
it("doesn't show any logs from startMixedModeSession()", async () => {
153+
it("doesn't show any logs from startRemoteProxySession()", async () => {
154154
await spawnLocalWorker(helper);
155155
await helper.seed({
156156
"wrangler.json": JSON.stringify({
157-
name: "mixed-mode-mixed-bindings-test",
157+
name: "remote-bindings-mixed-bindings-test",
158158
main: "ai.js",
159159
compatibility_date: "2025-05-07",
160160
ai: {
@@ -202,7 +202,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
202202
it("when a remote service binding is not properly configured", async () => {
203203
await helper.seed({
204204
"wrangler.json": JSON.stringify({
205-
name: "mixed-mode-mixed-bindings-test",
205+
name: "remote-bindings-mixed-bindings-test",
206206
main: "simple-service-binding.js",
207207
compatibility_date: "2025-05-07",
208208
services: [
@@ -231,7 +231,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
231231
it("when a remote KV binding is not properly configured", async () => {
232232
await helper.seed({
233233
"wrangler.json": JSON.stringify({
234-
name: "mixed-mode-mixed-bindings-test",
234+
name: "remote-bindings-mixed-bindings-test",
235235
main: "kv.js",
236236
compatibility_date: "2025-05-07",
237237
kv_namespaces: [
@@ -262,7 +262,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
262262
it("handles both remote and local service bindings at the same time in all workers", async () => {
263263
await helper.seed({
264264
"wrangler.json": JSON.stringify({
265-
name: "mixed-mode-mixed-bindings-multi-worker-test",
265+
name: "remote-bindings-mixed-bindings-multi-worker-test",
266266
main: "local-and-remote-service-bindings.js",
267267
compatibility_date: "2025-05-07",
268268
services: [

‎packages/wrangler/e2e/remote-binding/miniflare-remote-resources.test.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ const testCases: TestCase<string>[] = [
137137
setup: async (helper) => {
138138
const ns = await helper.kv(false);
139139
await helper.run(
140-
`wrangler kv key put --remote --namespace-id=${ns} test-mixed-mode-key existing-value`
140+
`wrangler kv key put --remote --namespace-id=${ns} test-remote-bindings-key existing-value`
141141
);
142142
return ns;
143143
},
@@ -168,11 +168,11 @@ const testCases: TestCase<string>[] = [
168168
await helper.seed({ "test.txt": "existing-value" });
169169
const name = await helper.r2(false);
170170
await helper.run(
171-
`wrangler r2 object put --remote ${name}/test-mixed-mode-key --file test.txt`
171+
`wrangler r2 object put --remote ${name}/test-remote-bindings-key --file test.txt`
172172
);
173173
onTestFinished(async () => {
174174
await helper.run(
175-
`wrangler r2 object delete --remote ${name}/test-mixed-mode-key`
175+
`wrangler r2 object delete --remote ${name}/test-remote-bindings-key`
176176
);
177177
});
178178
return name;
@@ -204,7 +204,7 @@ const testCases: TestCase<string>[] = [
204204
await helper.seed({
205205
"schema.sql": dedent`
206206
CREATE TABLE entries (key TEXT PRIMARY KEY, value TEXT);
207-
INSERT INTO entries (key, value) VALUES ('test-mixed-mode-key', 'existing-value');
207+
INSERT INTO entries (key, value) VALUES ('test-remote-bindings-key', 'existing-value');
208208
`,
209209
});
210210
const { id, name } = await helper.d1(false);
@@ -288,7 +288,7 @@ const testCases: TestCase<string>[] = [
288288
setup: async (helper) => {
289289
const namespace = await helper.dispatchNamespace(false);
290290

291-
const customerWorkerName = "mixed-mode-test-customer-worker";
291+
const customerWorkerName = "remote-bindings-test-customer-worker";
292292
await helper.seed({
293293
"customer-worker.js": dedent/* javascript */ `
294294
export default {
@@ -408,7 +408,7 @@ const mtlsTest: TestCase<{ certificateId: string; workerName: string }> = {
408408
};
409409

410410
describe.skipIf(!CLOUDFLARE_ACCOUNT_ID).each([...testCases, mtlsTest])(
411-
"Mixed Mode for $name",
411+
"Remote bindings test for $name",
412412
(testCase) => {
413413
let helper: WranglerE2ETestHelper;
414414
beforeEach(() => {
@@ -417,7 +417,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID).each([...testCases, mtlsTest])(
417417
it("enabled", async () => {
418418
await runTestCase(testCase as TestCase<unknown>, helper);
419419
});
420-
// Ensure the test case _relies_ on Mixed Mode, and fails in regular local dev
420+
// Ensure the test case _relies_ on remote bindings, and fails in regular local dev
421421
it.skipIf(testCase.worksWithoutRemoteBindings)(
422422
"fails when disabled",
423423
// Turn off retries because this test is expected to fail
@@ -453,7 +453,7 @@ async function runTestCase<T>(
453453
);
454454

455455
const miniflareConfig = disableRemoteBindings
456-
? // @ts-expect-error Deliberately passing in undefined here to turn off Mixed Mode
456+
? // @ts-expect-error Deliberately passing in undefined here to turn off remote bindings
457457
testCase.miniflareConfig(undefined)
458458
: testCase.miniflareConfig(
459459
remoteProxySession.remoteProxyConnectionString,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)("startWorker - remote bindings", () => {
3535
it("allows connecting to a remote worker", testOpts, async () => {
3636
await helper.seed({
3737
"wrangler.json": JSON.stringify({
38-
name: "mixed-mode-mixed-bindings-test",
38+
name: "remote-bindings-test",
3939
main: "simple-service-binding.js",
4040
compatibility_date: "2025-05-07",
4141
services: [
@@ -68,7 +68,7 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)("startWorker - remote bindings", () => {
6868
it("handles code changes during development", testOpts, async () => {
6969
await helper.seed({
7070
"wrangler.json": JSON.stringify({
71-
name: "mixed-mode-mixed-bindings-test",
71+
name: "remote-bindings-test",
7272
main: "simple-service-binding.js",
7373
compatibility_date: "2025-05-07",
7474
services: [

‎packages/wrangler/e2e/remote-binding/workers/d1.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
async fetch(request, env) {
33
const result = await env.DB.prepare(
4-
"SELECT * FROM entries WHERE key = 'test-mixed-mode-key'"
4+
"SELECT * FROM entries WHERE key = 'test-remote-bindings-key'"
55
).all();
66
return new Response(result.results[0].value);
77
},

‎packages/wrangler/e2e/remote-binding/workers/dispatch-namespace.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
async fetch(request, env) {
3-
const worker = env.DISPATCH.get("mixed-mode-test-customer-worker");
3+
const worker = env.DISPATCH.get("remote-bindings-test-customer-worker");
44
return Response.json({
55
worker: await (await worker.fetch("http://example.com")).text(),
66
});

‎packages/wrangler/e2e/remote-binding/workers/images.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default {
77

88
const response = (
99
await env.IMAGES.input(image.body)
10-
// Without Mixed mode, this fails with: Error: IMAGES_INFO_ERROR 9520: ERROR: Unsupported image type
10+
// Without setting IMAGES as a remote binding, this fails with: Error: IMAGES_INFO_ERROR 9520: ERROR: Unsupported image type
1111
.output({ format: "image/avif" })
1212
).response();
1313
const info = await env.IMAGES.info(response.body);

‎packages/wrangler/e2e/remote-binding/workers/kv.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
async fetch(request, env) {
33
return new Response(
4-
`The pre-existing value is: ${await env.KV_BINDING.get("test-mixed-mode-key")}`
4+
`The pre-existing value is: ${await env.KV_BINDING.get("test-remote-bindings-key")}`
55
);
66
},
77
};

‎packages/wrangler/e2e/remote-binding/workers/r2.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export default {
22
async fetch(request, env) {
33
return new Response(
4-
`The pre-existing value is: ${await (await env.R2_BINDING.get("test-mixed-mode-key")).text()}`
4+
`The pre-existing value is: ${await (await env.R2_BINDING.get("test-remote-bindings-key")).text()}`
55
);
66
},
77
};

0 commit comments

Comments
 (0)