Skip to content

Commit 8b7ee50

Browse files
committed
update messaging
1 parent 7845972 commit 8b7ee50

File tree

10 files changed

+48
-16
lines changed

10 files changed

+48
-16
lines changed

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,10 @@ describe("delete", () => {
234234
await expect(
235235
runWrangler("delete")
236236
).rejects.toThrowErrorMatchingInlineSnapshot(
237-
`[Error: This command is for Workers, for Pages please run \`wrangler pages project delete\`.]`
237+
`
238+
[Error: It looks like you've run a Workers-specific command in a Pages project.
239+
For Pages, please run \`wrangler pages project delete\` instead.]
240+
`
238241
);
239242
});
240243
describe("force deletes", () => {

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,10 @@ describe("deploy", () => {
385385
await expect(
386386
runWrangler("deploy")
387387
).rejects.toThrowErrorMatchingInlineSnapshot(
388-
`[Error: This command is for Workers, for Pages please run \`wrangler pages deploy\`.]`
388+
`
389+
[Error: It looks like you've run a Workers-specific command in a Pages project.
390+
For Pages, please run \`wrangler pages deploy\` instead.]
391+
`
389392
);
390393
});
391394

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,10 @@ describe.sequential("wrangler dev", () => {
18901890
it("should error helpfully if pages_build_output_dir is set", async () => {
18911891
writeWranglerToml({ pages_build_output_dir: "dist", name: "test" });
18921892
await expect(runWrangler("dev")).rejects.toThrowErrorMatchingInlineSnapshot(
1893-
`[Error: This command is for Workers, for Pages please run \`wrangler pages dev\`.]`
1893+
`
1894+
[Error: It looks like you've run a Workers-specific command in a Pages project.
1895+
For Pages, please run \`wrangler pages dev\` instead.]
1896+
`
18941897
);
18951898
});
18961899
});

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ describe("wrangler secret", () => {
9595
await expect(
9696
runWrangler("secret put secret-name")
9797
).rejects.toThrowErrorMatchingInlineSnapshot(
98-
`[Error: This command is for Workers, for Pages please run \`wrangler pages secret put\`.]`
98+
`
99+
[Error: It looks like you've run a Workers-specific command in a Pages project.
100+
For Pages, please run \`wrangler pages secret put\` instead.]
101+
`
99102
);
100103
});
101104

@@ -417,7 +420,10 @@ describe("wrangler secret", () => {
417420
await expect(
418421
runWrangler("secret delete secret-name")
419422
).rejects.toThrowErrorMatchingInlineSnapshot(
420-
`[Error: This command is for Workers, for Pages please run \`wrangler pages secret delete\`.]`
423+
`
424+
[Error: It looks like you've run a Workers-specific command in a Pages project.
425+
For Pages, please run \`wrangler pages secret delete\` instead.]
426+
`
421427
);
422428
});
423429

@@ -543,7 +549,10 @@ describe("wrangler secret", () => {
543549
await expect(
544550
runWrangler("secret list")
545551
).rejects.toThrowErrorMatchingInlineSnapshot(
546-
`[Error: This command is for Workers, for Pages please run \`wrangler pages secret list\`.]`
552+
`
553+
[Error: It looks like you've run a Workers-specific command in a Pages project.
554+
For Pages, please run \`wrangler pages secret list\` instead.]
555+
`
547556
);
548557
});
549558

@@ -625,7 +634,10 @@ describe("wrangler secret", () => {
625634
await expect(
626635
runWrangler("secret bulk")
627636
).rejects.toThrowErrorMatchingInlineSnapshot(
628-
`[Error: This command is for Workers, for Pages please run \`wrangler pages secret bulk\`.]`
637+
`
638+
[Error: It looks like you've run a Workers-specific command in a Pages project.
639+
For Pages, please run \`wrangler pages secret bulk\` instead.]
640+
`
629641
);
630642
});
631643

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,10 @@ describe("tail", () => {
853853
await expect(
854854
runWrangler("tail")
855855
).rejects.toThrowErrorMatchingInlineSnapshot(
856-
`[Error: This command is for Workers, for Pages please run \`wrangler pages deployment tail\`.]`
856+
`
857+
[Error: It looks like you've run a Workers-specific command in a Pages project.
858+
For Pages, please run \`wrangler pages deployment tail\` instead.]
859+
`
857860
);
858861
});
859862
});

packages/wrangler/src/delete.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ export async function deleteHandler(args: DeleteArgs) {
9999
const config = readConfig(configPath, args);
100100
if (config.pages_build_output_dir) {
101101
throw new UserError(
102-
"This command is for Workers, for Pages please run `wrangler pages project delete`."
102+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
103+
"For Pages, please run `wrangler pages project delete` instead."
103104
);
104105
}
105106
await metrics.sendMetricsEvent(

packages/wrangler/src/deploy/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ export async function deployHandler(args: DeployArgs) {
256256
const config = readConfig(configPath, args);
257257
if (config.pages_build_output_dir) {
258258
throw new UserError(
259-
"This command is for Workers, for Pages please run `wrangler pages deploy`."
259+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
260+
"For Pages, please run `wrangler pages deploy` instead."
260261
);
261262
}
262263

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ export async function getEntry(
6868
} else {
6969
if (config.pages_build_output_dir && command === "dev") {
7070
throw new UserError(
71-
"This command is for Workers, for Pages please run `wrangler pages dev`."
71+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
72+
"For Pages, please run `wrangler pages dev` instead."
7273
);
7374
}
7475
throw new UserError(

packages/wrangler/src/secret/index.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ export const secret = (secretYargs: CommonYargsArgv) => {
146146
const config = readConfig(args.config, args);
147147
if (config.pages_build_output_dir) {
148148
throw new UserError(
149-
"This command is for Workers, for Pages please run `wrangler pages secret put`."
149+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
150+
"For Pages, please run `wrangler pages secret put` instead."
150151
);
151152
}
152153

@@ -250,7 +251,8 @@ export const secret = (secretYargs: CommonYargsArgv) => {
250251
const config = readConfig(args.config, args);
251252
if (config.pages_build_output_dir) {
252253
throw new UserError(
253-
"This command is for Workers, for Pages please run `wrangler pages secret delete`."
254+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
255+
"For Pages, please run `wrangler pages secret delete` instead."
254256
);
255257
}
256258

@@ -311,7 +313,8 @@ export const secret = (secretYargs: CommonYargsArgv) => {
311313
const config = readConfig(args.config, args);
312314
if (config.pages_build_output_dir) {
313315
throw new UserError(
314-
"This command is for Workers, for Pages please run `wrangler pages secret list`."
316+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
317+
"For Pages, please run `wrangler pages secret list` instead."
315318
);
316319
}
317320

@@ -377,7 +380,8 @@ export const secretBulkHandler = async (secretBulkArgs: SecretBulkArgs) => {
377380
const config = readConfig(secretBulkArgs.config, secretBulkArgs);
378381
if (config.pages_build_output_dir) {
379382
throw new UserError(
380-
"This command is for Workers, for Pages please run `wrangler pages secret bulk`."
383+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
384+
"For Pages, please run `wrangler pages secret bulk` instead."
381385
);
382386
}
383387

packages/wrangler/src/tail/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ export async function tailHandler(args: TailArgs) {
9595
const config = readConfig(args.config, args);
9696
if (config.pages_build_output_dir) {
9797
throw new UserError(
98-
"This command is for Workers, for Pages please run `wrangler pages deployment tail`."
98+
"It looks like you've run a Workers-specific command in a Pages project.\n" +
99+
"For Pages, please run `wrangler pages deployment tail` instead."
99100
);
100101
}
101102
await metrics.sendMetricsEvent("begin log stream", {

0 commit comments

Comments
 (0)