diff --git a/.changeset/rotten-radios-wink.md b/.changeset/rotten-radios-wink.md new file mode 100644 index 000000000000..b91c87df1b67 --- /dev/null +++ b/.changeset/rotten-radios-wink.md @@ -0,0 +1,5 @@ +--- +"wrangler": patch +--- + +Throw error if user attempts to use config with pages diff --git a/packages/wrangler/src/__tests__/pages.test.ts b/packages/wrangler/src/__tests__/pages.test.ts index 3c64fef3c331..50aecbaadccd 100644 --- a/packages/wrangler/src/__tests__/pages.test.ts +++ b/packages/wrangler/src/__tests__/pages.test.ts @@ -299,7 +299,6 @@ describe("pages", () => { directory The directory of static files to upload [string] Flags: - -c, --config Path to .toml configuration file [string] -h, --help Show help [boolean] -v, --version Show version number [boolean] @@ -969,6 +968,19 @@ describe("pages", () => { expect(std.err).toMatchInlineSnapshot(`""`); }); + + it("should throw an error if user attempts to use config with pages", async () => { + await expect( + runWrangler("pages dev --config foo.toml") + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"Pages does not support wrangler.toml"` + ); + await expect( + runWrangler("pages publish --config foo.toml") + ).rejects.toThrowErrorMatchingInlineSnapshot( + `"Pages does not support wrangler.toml"` + ); + }); }); describe("project upload", () => { diff --git a/packages/wrangler/src/pages/dev.tsx b/packages/wrangler/src/pages/dev.tsx index e9b8732d8949..d293489e1a8e 100644 --- a/packages/wrangler/src/pages/dev.tsx +++ b/packages/wrangler/src/pages/dev.tsx @@ -92,6 +92,11 @@ export function Options(yargs: Argv): Argv { type: "boolean", hidden: true, }, + config: { + describe: "Pages does not support wrangler.toml", + type: "string", + hidden: true, + }, // // TODO: Miniflare user options }) .epilogue(pagesBetaWarning); @@ -108,14 +113,18 @@ export const Handler = async ({ do: durableObjects = [], "live-reload": liveReload, "node-compat": nodeCompat, + config: config, _: [_pages, _dev, ...remaining], }: ArgumentsCamelCase) => { // Beta message for `wrangler pages ` usage logger.log(pagesBetaWarning); if (!local) { - logger.error("Only local mode is supported at the moment."); - return; + throw new FatalError("Only local mode is supported at the moment.", 1); + } + + if (config) { + throw new FatalError("Pages does not support wrangler.toml", 1); } const functionsDirectory = "./functions"; diff --git a/packages/wrangler/src/pages/publish.tsx b/packages/wrangler/src/pages/publish.tsx index f9b4cb6b63d3..5102135ca518 100644 --- a/packages/wrangler/src/pages/publish.tsx +++ b/packages/wrangler/src/pages/publish.tsx @@ -59,6 +59,11 @@ export function Options(yargs: Argv): Argv { description: "Whether or not the workspace should be considered dirty for this deployment", }, + config: { + describe: "Pages does not support wrangler.toml", + type: "string", + hidden: true, + }, }) .epilogue(pagesBetaWarning); } @@ -70,7 +75,12 @@ export const Handler = async ({ commitHash, commitMessage, commitDirty, + config: wranglerConfig, }: ArgumentsCamelCase) => { + if (wranglerConfig) { + throw new FatalError("Pages does not support wrangler.toml", 1); + } + if (!directory) { throw new FatalError("Must specify a directory.", 1); }