wrangler 0.0.0-e2b7352 → 0.0.0-e2f9bb2

package/src/pages.tsx

@@ -2,21 +2,78 @@
 
 import { execSync, spawn } from "node:child_process";
 import { existsSync, lstatSync, readFileSync, writeFileSync } from "node:fs";
+import { readdir, readFile, stat } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join } from "node:path";
+import { dirname, join, sep } from "node:path";
+import { cwd } from "node:process";
 import { URL } from "node:url";
+import { hash } from "blake3-wasm";
 import { watch } from "chokidar";
+import { render, Text } from "ink";
+import SelectInput from "ink-select-input";
+import Spinner from "ink-spinner";
+import Table from "ink-table";
 import { getType } from "mime";
+import prettyBytes from "pretty-bytes";
+import React from "react";
+import { format as timeagoFormat } from "timeago.js";
+import { File, FormData } from "undici";
+import { buildPlugin } from "../pages/functions/buildPlugin";
 import { buildWorker } from "../pages/functions/buildWorker";
 import { generateConfigFromFileTree } from "../pages/functions/filepath-routing";
 import { writeRoutesModule } from "../pages/functions/routes";
+import { fetchResult } from "./cfetch";
+import { getConfigCache, saveToConfigCache } from "./config-cache";
+import { prompt } from "./dialogs";
+import { FatalError } from "./errors";
+import { logger } from "./logger";
+import { getRequestContextCheckOptions } from "./miniflare-cli/request-context";
 import openInBrowser from "./open-in-browser";
 import { toUrlPath } from "./paths";
+import { requireAuth } from "./user";
 import type { Config } from "../pages/functions/routes";
 import type { Headers, Request, fetch } from "@miniflare/core";
 import type { BuildResult } from "esbuild";
 import type { MiniflareOptions } from "miniflare";
-import type { BuilderCallback } from "yargs";
+import type { BuilderCallback, CommandModule } from "yargs";
+
+export type Project = {
+  name: string;
+  subdomain: string;
+  domains: Array<string>;
+  source?: {
+    type: string;
+  };
+  latest_deployment?: {
+    modified_on: string;
+  };
+  created_on: string;
+  production_branch: string;
+};
+
+export type Deployment = {
+  id: string;
+  environment: string;
+  deployment_trigger: {
+    metadata: {
+      commit_hash: string;
+      branch: string;
+    };
+  };
+  url: string;
+  latest_stage: {
+    status: string;
+    ended_on: string;
+  };
+  project_name: string;
+};
+
+interface PagesConfigCache {
+  account_id?: string;
+  project_name?: string;
+}
+
+const PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 
 // Defer importing miniflare until we really need it. This takes ~0.5s
 // and also modifies some `stream/web` and `undici` prototypes, so we
@@ -25,17 +82,20 @@ import type { BuilderCallback } from "yargs";
 export const pagesBetaWarning =
   "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose";
 
-const EXIT_CALLBACKS: (() => void)[] = [];
-const EXIT = (message?: string, code?: number) => {
-  if (message) console.log(message);
-  if (code) process.exitCode = code;
-  EXIT_CALLBACKS.forEach((callback) => callback());
+const CLEANUP_CALLBACKS: (() => void)[] = [];
+const CLEANUP = () => {
+  CLEANUP_CALLBACKS.forEach((callback) => callback());
   RUNNING_BUILDERS.forEach((builder) => builder.stop?.());
-  process.exit(code);
 };
 
-process.on("SIGINT", () => EXIT());
-process.on("SIGTERM", () => EXIT());
+process.on("SIGINT", () => {
+  CLEANUP();
+  process.exit();
+});
+process.on("SIGTERM", () => {
+  CLEANUP();
+  process.exit();
+});
 
 function isWindows() {
   return process.platform === "win32";
@@ -95,7 +155,7 @@ function getPort(pid: number) {
     const match = matches[0];
     if (match) return parseInt(match[1]);
   } catch (thrown) {
-    console.error(
+    logger.error(
       `Error scanning for ports of process with PID ${pid}: ${thrown}`
     );
   }
@@ -108,13 +168,15 @@ async function spawnProxyProcess({
   port?: number;
   command: (string | number)[];
 }): Promise<void | number> {
-  if (command.length === 0)
-    return EXIT(
+  if (command.length === 0) {
+    CLEANUP();
+    throw new FatalError(
       "Must specify a directory of static assets to serve or a command to run.",
       1
     );
+  }
 
-  console.log(`Running ${command.join(" ")}...`);
+  logger.log(`Running ${command.join(" ")}...`);
   const proxy = spawn(
     command[0].toString(),
     command.slice(1).map((value) => value.toString()),
@@ -126,30 +188,30 @@ async function spawnProxyProcess({
       },
     }
   );
-  EXIT_CALLBACKS.push(() => {
+  CLEANUP_CALLBACKS.push(() => {
     proxy.kill();
   });
 
   proxy.stdout.on("data", (data) => {
-    console.log(`[proxy]: ${data}`);
+    logger.log(`[proxy]: ${data}`);
   });
 
   proxy.stderr.on("data", (data) => {
-    console.error(`[proxy]: ${data}`);
+    logger.error(`[proxy]: ${data}`);
   });
 
   proxy.on("close", (code) => {
-    console.error(`Proxy exited with status ${code}.`);
+    logger.error(`Proxy exited with status ${code}.`);
   });
 
   // Wait for proxy process to start...
   while (!proxy.pid) {}
 
   if (port === undefined) {
-    console.log(
+    logger.log(
       `Sleeping ${SECONDS_TO_WAIT_FOR_PROXY} seconds to allow proxy process to start before attempting to automatically determine port...`
     );
-    console.log("To skip, specify the proxy port with --proxy.");
+    logger.log("To skip, specify the proxy port with --proxy.");
     await sleep(SECONDS_TO_WAIT_FOR_PROXY * 1000);
 
     port = getPids(proxy.pid)
@@ -157,12 +219,13 @@ async function spawnProxyProcess({
       .filter((port) => port !== undefined)[0];
 
     if (port === undefined) {
-      return EXIT(
+      CLEANUP();
+      throw new FatalError(
         "Could not automatically determine proxy port. Please specify the proxy port with --proxy.",
         1
       );
     } else {
-      console.log(`Automatically determined the proxy port to be ${port}.`);
+      logger.log(`Automatically determined the proxy port to be ${port}.`);
     }
   }
 
@@ -429,12 +492,12 @@ async function generateAssetsFetch(directory: string): Promise<typeof fetch> {
   }).on("change", (path) => {
     switch (path) {
       case headersFile: {
-        console.log("_headers modified. Re-evaluating...");
+        logger.log("_headers modified. Re-evaluating...");
         headersMatcher = generateHeadersMatcher(headersFile);
         break;
       }
       case redirectsFile: {
-        console.log("_redirects modified. Re-evaluating...");
+        logger.log("_redirects modified. Re-evaluating...");
         redirectsMatcher = generateRedirectsMatcher(redirectsFile);
         break;
       }
@@ -647,7 +710,7 @@ async function generateAssetsFetch(directory: string): Promise<typeof fetch> {
 const RUNNING_BUILDERS: BuildResult[] = [];
 
 async function buildFunctions({
-  scriptPath,
+  outfile,
   outputConfigPath,
   functionsDirectory,
   minify = false,
@@ -655,8 +718,10 @@ async function buildFunctions({
   fallbackService = "ASSETS",
   watch = false,
   onEnd,
+  plugin = false,
+  buildOutputDirectory,
 }: {
-  scriptPath: string;
+  outfile: string;
   outputConfigPath?: string;
   functionsDirectory: string;
   minify?: boolean;
@@ -664,6 +729,8 @@ async function buildFunctions({
   fallbackService?: string;
   watch?: boolean;
   onEnd?: () => void;
+  plugin?: boolean;
+  buildOutputDirectory?: string;
 }) {
   RUNNING_BUILDERS.forEach(
     (runningBuilder) => runningBuilder.stop && runningBuilder.stop()
@@ -690,19 +757,483 @@ async function buildFunctions({
     outfile: routesModule,
   });
 
-  RUNNING_BUILDERS.push(
-    await buildWorker({
-      routesModule,
-      outfile: scriptPath,
-      minify,
-      sourcemap,
-      fallbackService,
-      watch,
-      onEnd,
-    })
-  );
+  if (plugin) {
+    RUNNING_BUILDERS.push(
+      await buildPlugin({
+        routesModule,
+        outfile,
+        minify,
+        sourcemap,
+        watch,
+        onEnd,
+      })
+    );
+  } else {
+    RUNNING_BUILDERS.push(
+      await buildWorker({
+        routesModule,
+        outfile,
+        minify,
+        sourcemap,
+        fallbackService,
+        watch,
+        onEnd,
+        buildOutputDirectory,
+      })
+    );
+  }
+}
+
+interface CreateDeploymentArgs {
+  directory: string;
+  projectName?: string;
+  branch?: string;
+  commitHash?: string;
+  commitMessage?: string;
+  commitDirty?: boolean;
 }
 
+const createDeployment: CommandModule<
+  CreateDeploymentArgs,
+  CreateDeploymentArgs
+> = {
+  describe: "🆙 Publish a directory of static assets as a Pages deployment",
+  builder: (yargs) => {
+    return yargs
+      .positional("directory", {
+        type: "string",
+        default: "functions",
+        description: "The directory of Pages Functions",
+      })
+      .options({
+        "project-name": {
+          type: "string",
+          description:
+            "The name of the project you want to list deployments for",
+        },
+        branch: {
+          type: "string",
+          description:
+            "The branch of the project you want to list deployments for",
+        },
+        "commit-hash": {
+          type: "string",
+          description:
+            "The branch of the project you want to list deployments for",
+        },
+        "commit-message": {
+          type: "string",
+          description:
+            "The branch of the project you want to list deployments for",
+        },
+        "commit-dirty": {
+          type: "boolean",
+          description:
+            "The branch of the project you want to list deployments for",
+        },
+      })
+      .epilogue(pagesBetaWarning);
+  },
+  handler: async ({
+    directory,
+    projectName,
+    branch,
+    commitHash,
+    commitMessage,
+    commitDirty,
+  }) => {
+    const config = getConfigCache<PagesConfigCache>(
+      PAGES_CONFIG_CACHE_FILENAME
+    );
+    const accountId = await requireAuth(config);
+
+    projectName ??= config.project_name;
+
+    const isInteractive = process.stdin.isTTY;
+    if (!projectName && isInteractive) {
+      const existingOrNew = await new Promise<"new" | "existing">((resolve) => {
+        const { unmount } = render(
+          <>
+            <Text>
+              No project selected. Would you like to create one or use an
+              existing project?
+            </Text>
+            <SelectInput
+              items={[
+                {
+                  key: "new",
+                  label: "Create a new project",
+                  value: "new",
+                },
+                {
+                  key: "existing",
+                  label: "Use an existing project",
+                  value: "existing",
+                },
+              ]}
+              onSelect={async (selected) => {
+                resolve(selected.value as "new" | "existing");
+                unmount();
+              }}
+            />
+          </>
+        );
+      });
+
+      switch (existingOrNew) {
+        case "existing": {
+          const projects = (await listProjects({ accountId })).filter(
+            (project) => !project.source
+          );
+          projectName = await new Promise((resolve) => {
+            const { unmount } = render(
+              <>
+                <Text>Select a project:</Text>
+                <SelectInput
+                  items={projects.map((project) => ({
+                    key: project.name,
+                    label: project.name,
+                    value: project,
+                  }))}
+                  onSelect={async (selected) => {
+                    resolve(selected.value.name);
+                    unmount();
+                  }}
+                />
+              </>
+            );
+          });
+          break;
+        }
+        case "new": {
+          projectName = await prompt("Enter the name of your new project:");
+
+          if (!projectName) {
+            throw new FatalError("Must specify a project name.", 1);
+          }
+
+          let isGitDir = true;
+          try {
+            execSync(`git rev-parse --is-inside-work-tree`, {
+              stdio: "ignore",
+            });
+          } catch (err) {
+            isGitDir = false;
+          }
+
+          const productionBranch = await prompt(
+            "Enter the production branch name:",
+            "text",
+            isGitDir
+              ? execSync(`git rev-parse --abbrev-ref HEAD`).toString().trim()
+              : "production"
+          );
+
+          if (!productionBranch) {
+            throw new FatalError("Must specify a production branch.", 1);
+          }
+
+          await fetchResult<Project>(`/accounts/${accountId}/pages/projects`, {
+            method: "POST",
+            body: JSON.stringify({
+              name: projectName,
+              production_branch: productionBranch,
+            }),
+          });
+
+          saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
+            account_id: accountId,
+            project_name: projectName,
+          });
+
+          logger.log(`✨ Successfully created the '${projectName}' project.`);
+          break;
+        }
+      }
+    }
+
+    if (!projectName) {
+      throw new FatalError("Must specify a project name.", 1);
+    }
+
+    // We infer git info by default is not passed in
+
+    let isGitDir = true;
+    try {
+      execSync(`git rev-parse --is-inside-work-tree`, {
+        stdio: "ignore",
+      });
+    } catch (err) {
+      isGitDir = false;
+    }
+
+    let isGitDirty = false;
+
+    if (isGitDir) {
+      try {
+        isGitDirty = Boolean(
+          execSync(`git status --porcelain`).toString().length
+        );
+
+        if (!branch) {
+          branch = execSync(`git rev-parse --abbrev-ref HEAD`)
+            .toString()
+            .trim();
+        }
+
+        if (!commitHash) {
+          commitHash = execSync(`git rev-parse HEAD`).toString().trim();
+        }
+
+        if (!commitMessage) {
+          commitMessage = execSync(`git show -s --format=%B ${commitHash}`)
+            .toString()
+            .trim();
+        }
+      } catch (err) {}
+
+      if (isGitDirty && !commitDirty) {
+        logger.warn(
+          `Warning: Your working directory is a git repo and has uncommitted changes\nTo silense this warning, pass in --commit-dirty=true`
+        );
+      }
+
+      if (commitDirty === undefined) {
+        commitDirty = isGitDirty;
+      }
+    }
+
+    let builtFunctions: string | undefined = undefined;
+    const functionsDirectory = join(cwd(), "functions");
+    if (existsSync(functionsDirectory)) {
+      const outfile = join(tmpdir(), "./functionsWorker.js");
+
+      await new Promise((resolve) =>
+        buildFunctions({
+          outfile,
+          functionsDirectory,
+          onEnd: () => resolve(null),
+          buildOutputDirectory: dirname(outfile),
+        })
+      );
+
+      builtFunctions = readFileSync(outfile, "utf-8");
+    }
+
+    type File = {
+      content: Buffer;
+      metadata: Metadata;
+    };
+
+    type Metadata = {
+      sizeInBytes: number;
+      hash: string;
+    };
+
+    const IGNORE_LIST = [
+      "_worker.js",
+      "_redirects",
+      "_headers",
+      ".DS_Store",
+      "node_modules",
+    ];
+
+    const walk = async (
+      dir: string,
+      fileMap: Map<string, File> = new Map(),
+      depth = 0
+    ) => {
+      const files = await readdir(dir);
+
+      await Promise.all(
+        files.map(async (file) => {
+          const filepath = join(dir, file);
+          const filestat = await stat(filepath);
+
+          if (IGNORE_LIST.includes(file)) {
+            return;
+          }
+
+          if (filestat.isSymbolicLink()) {
+            return;
+          }
+
+          if (filestat.isDirectory()) {
+            fileMap = await walk(filepath, fileMap, depth + 1);
+          } else {
+            let name;
+            if (depth) {
+              name = filepath.split(sep).slice(1).join("/");
+            } else {
+              name = file;
+            }
+
+            // TODO: Move this to later so we don't hold as much in memory
+            const fileContent = await readFile(filepath);
+
+            const base64Content = fileContent.toString("base64");
+            const extension =
+              name.split(".").length > 1 ? name.split(".").at(-1) || "" : "";
+
+            const content = base64Content + extension;
+
+            if (filestat.size > 25 * 1024 * 1024) {
+              throw new Error(
+                `Error: Pages only supports files up to ${prettyBytes(
+                  25 * 1024 * 1024
+                )} in size\n${name} is ${prettyBytes(filestat.size)} in size`
+              );
+            }
+
+            fileMap.set(name, {
+              content: fileContent,
+              metadata: {
+                sizeInBytes: filestat.size,
+                hash: hash(content).toString("hex").slice(0, 32),
+              },
+            });
+          }
+        })
+      );
+
+      return fileMap;
+    };
+
+    const fileMap = await walk(directory);
+
+    const start = Date.now();
+
+    const files: Array<Promise<void>> = [];
+
+    if (fileMap.size > 1000) {
+      throw new Error(
+        `Error: Pages only supports up to 1,000 files in a deployment at the moment.\nTry a smaller project perhaps?`
+      );
+    }
+
+    let counter = 0;
+
+    const { rerender, unmount } = render(
+      <Progress done={counter} total={fileMap.size} />
+    );
+
+    fileMap.forEach((file: File, name: string) => {
+      const form = new FormData();
+      form.append(
+        "file",
+        new File([new Uint8Array(file.content.buffer)], name)
+      );
+
+      // TODO: Consider a retry
+
+      const promise = fetchResult<{ id: string }>(
+        `/accounts/${accountId}/pages/projects/${projectName}/file`,
+        {
+          method: "POST",
+          body: form,
+        }
+      ).then((response) => {
+        counter++;
+        rerender(<Progress done={counter} total={fileMap.size} />);
+        if (response.id != file.metadata.hash) {
+          throw new Error(
+            `Looks like there was an issue uploading '${name}'. Try again perhaps?`
+          );
+        }
+      });
+
+      files.push(promise);
+    });
+
+    await Promise.all(files);
+
+    unmount();
+
+    const uploadMs = Date.now() - start;
+
+    logger.log(
+      `✨ Success! Uploaded ${fileMap.size} files ${formatTime(uploadMs)}\n`
+    );
+
+    const formData = new FormData();
+
+    formData.append(
+      "manifest",
+      JSON.stringify(
+        Object.fromEntries(
+          [...fileMap.entries()].map(([fileName, file]) => [
+            `/${fileName}`,
+            file.metadata.hash,
+          ])
+        )
+      )
+    );
+
+    if (branch) {
+      formData.append("branch", branch);
+    }
+
+    if (commitMessage) {
+      formData.append("commit_message", commitMessage);
+    }
+
+    if (commitHash) {
+      formData.append("commit_hash", commitHash);
+    }
+
+    if (commitDirty !== undefined) {
+      formData.append("commit_dirty", commitDirty);
+    }
+
+    let _headers: string | undefined,
+      _redirects: string | undefined,
+      _workerJS: string | undefined;
+
+    try {
+      _headers = readFileSync(join(directory, "_headers"), "utf-8");
+    } catch {}
+
+    try {
+      _redirects = readFileSync(join(directory, "_redirects"), "utf-8");
+    } catch {}
+
+    try {
+      _workerJS = readFileSync(join(directory, "_worker.js"), "utf-8");
+    } catch {}
+
+    if (_headers) {
+      formData.append("_headers", new File([_headers], "_headers"));
+    }
+
+    if (_redirects) {
+      formData.append("_redirects", new File([_redirects], "_redirects"));
+    }
+
+    if (builtFunctions) {
+      formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
+    } else if (_workerJS) {
+      formData.append("_worker.js", new File([_workerJS], "_worker.js"));
+    }
+
+    const deploymentResponse = await fetchResult<Deployment>(
+      `/accounts/${accountId}/pages/projects/${projectName}/deployments`,
+      {
+        method: "POST",
+        body: formData,
+      }
+    );
+
+    saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
+      account_id: accountId,
+      project_name: projectName,
+    });
+
+    logger.log(
+      `✨ Deployment complete! Take a peek over at ${deploymentResponse.url}`
+    );
+  },
+};
+
 export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
   return yargs
     .command(
@@ -779,10 +1310,10 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
         _: [_pages, _dev, ...remaining],
       }) => {
         // Beta message for `wrangler pages <commands>` usage
-        console.log(pagesBetaWarning);
+        logger.log(pagesBetaWarning);
 
         if (!local) {
-          console.error("Only local mode is supported at the moment.");
+          logger.error("Only local mode is supported at the moment.");
           return;
         }
 
@@ -809,17 +1340,18 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
         );
 
         if (usingFunctions) {
-          const scriptPath = join(tmpdir(), "./functionsWorker.js");
+          const outfile = join(tmpdir(), "./functionsWorker.js");
 
-          console.log(`Compiling worker to "${scriptPath}"...`);
+          logger.log(`Compiling worker to "${outfile}"...`);
 
           try {
             await buildFunctions({
-              scriptPath,
+              outfile,
               functionsDirectory,
               sourcemap: true,
               watch: true,
               onEnd: () => scriptReadyResolve(),
+              buildOutputDirectory: directory,
             });
           } catch {}
 
@@ -828,16 +1360,17 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
             ignoreInitial: true,
           }).on("all", async () => {
             await buildFunctions({
-              scriptPath,
+              outfile,
               functionsDirectory,
               sourcemap: true,
               watch: true,
               onEnd: () => scriptReadyResolve(),
+              buildOutputDirectory: directory,
             });
           });
 
           miniflareArgs = {
-            scriptPath,
+            scriptPath: outfile,
           };
         } else {
           // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -853,7 +1386,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
               scriptPath,
             };
           } else {
-            console.log("No functions. Shimming...");
+            logger.log("No functions. Shimming...");
             miniflareArgs = {
               // TODO: The fact that these request/response hacks are necessary is ridiculous.
               // We need to eliminate them from env.ASSETS.fetch (not sure if just local or prod as well)
@@ -885,6 +1418,9 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
             ? await generateAssetsFetch(directory)
             : invalidAssetsFetch;
 
+        const requestContextCheckOptions =
+          await getRequestContextCheckOptions();
+
         const miniflare = new Miniflare({
           port,
           watch: true,
@@ -920,7 +1456,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
                   url.host = `localhost:${proxyPort}`;
                   return await fetch(url, request);
                 } catch (thrown) {
-                  console.error(`Could not proxy request: ${thrown}`);
+                  logger.error(`Could not proxy request: ${thrown}`);
 
                   // TODO: Pretty error page
                   return new Response(
@@ -932,7 +1468,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
                 try {
                   return await assetsFetch(request);
                 } catch (thrown) {
-                  console.error(`Could not serve static asset: ${thrown}`);
+                  logger.error(`Could not serve static asset: ${thrown}`);
 
                   // TODO: Pretty error page
                   return new Response(
@@ -949,13 +1485,14 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
           cachePersist: true,
           liveReload,
 
+          ...requestContextCheckOptions,
           ...miniflareArgs,
         });
 
         try {
           // `startServer` might throw if user code contains errors
           const server = await miniflare.startServer();
-          console.log(`Serving at http://localhost:${port}/`);
+          logger.log(`Serving at http://localhost:${port}/`);
 
           if (process.env.BROWSER !== "none") {
             await openInBrowser(`http://localhost:${port}/`);
@@ -970,13 +1507,14 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
             });
           }
 
-          EXIT_CALLBACKS.push(() => {
+          CLEANUP_CALLBACKS.push(() => {
             server.close();
             miniflare.dispose().catch((err) => miniflare.log.error(err));
           });
         } catch (e) {
           miniflare.log.error(e as Error);
-          EXIT("Could not start Miniflare.", 1);
+          CLEANUP();
+          throw new FatalError("Could not start Miniflare.", 1);
         }
       }
     )
@@ -994,7 +1532,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
               description: "The directory of Pages Functions",
             })
             .options({
-              "script-path": {
+              outfile: {
                 type: "string",
                 default: "_worker.js",
                 description: "The location of the output Worker script",
@@ -1026,32 +1564,258 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
                 description:
                   "Watch for changes to the functions and automatically rebuild the Worker script",
               },
+              plugin: {
+                type: "boolean",
+                default: false,
+                description: "Build a plugin rather than a Worker script",
+              },
             })
             .epilogue(pagesBetaWarning),
         async ({
           directory,
-          "script-path": scriptPath,
+          outfile,
           "output-config-path": outputConfigPath,
           minify,
           sourcemap,
           fallbackService,
           watch,
+          plugin,
         }) => {
           // Beta message for `wrangler pages <commands>` usage
-          console.log(pagesBetaWarning);
+          logger.log(pagesBetaWarning);
 
           await buildFunctions({
-            scriptPath,
+            outfile,
             outputConfigPath,
             functionsDirectory: directory,
             minify,
             sourcemap,
             fallbackService,
             watch,
+            plugin,
+            buildOutputDirectory: dirname(outfile),
           });
         }
       )
-    );
+    )
+    .command("project", "⚡️ Interact with your Pages projects", (yargs) =>
+      yargs
+        .command(
+          "list",
+          "List your Cloudflare Pages projects",
+          (yargs) => yargs.epilogue(pagesBetaWarning),
+          async () => {
+            const config = getConfigCache<PagesConfigCache>(
+              PAGES_CONFIG_CACHE_FILENAME
+            );
+
+            const accountId = await requireAuth(config);
+
+            const projects: Array<Project> = await listProjects({ accountId });
+
+            const data = projects.map((project) => {
+              return {
+                "Project Name": project.name,
+                "Project Domains": `${project.domains.join(", ")}`,
+                "Git Provider": project.source ? "Yes" : "No",
+                "Last Modified": project.latest_deployment
+                  ? timeagoFormat(project.latest_deployment.modified_on)
+                  : timeagoFormat(project.created_on),
+              };
+            });
+
+            saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
+              account_id: accountId,
+            });
+
+            render(<Table data={data}></Table>);
+          }
+        )
+        .command(
+          "create [project-name]",
+          "Create a new Cloudflare Pages project",
+          (yargs) =>
+            yargs
+              .positional("project-name", {
+                type: "string",
+                demandOption: true,
+                description: "The name of your Pages project",
+              })
+              .options({
+                "production-branch": {
+                  type: "string",
+                  description:
+                    "The name of the production branch of your project",
+                },
+              })
+              .epilogue(pagesBetaWarning),
+          async ({ productionBranch, projectName }) => {
+            const config = getConfigCache<PagesConfigCache>(
+              PAGES_CONFIG_CACHE_FILENAME
+            );
+            const accountId = await requireAuth(config);
+
+            const isInteractive = process.stdin.isTTY;
+            if (!projectName && isInteractive) {
+              projectName = await prompt("Enter the name of your new project:");
+            }
+
+            if (!projectName) {
+              throw new FatalError("Must specify a project name.", 1);
+            }
+
+            if (!productionBranch && isInteractive) {
+              let isGitDir = true;
+              try {
+                execSync(`git rev-parse --is-inside-work-tree`, {
+                  stdio: "ignore",
+                });
+              } catch (err) {
+                isGitDir = false;
+              }
+
+              productionBranch = await prompt(
+                "Enter the production branch name:",
+                "text",
+                isGitDir
+                  ? execSync(`git rev-parse --abbrev-ref HEAD`)
+                      .toString()
+                      .trim()
+                  : "production"
+              );
+            }
+
+            if (!productionBranch) {
+              throw new FatalError("Must specify a production branch.", 1);
+            }
+
+            const { subdomain } = await fetchResult<Project>(
+              `/accounts/${accountId}/pages/projects`,
+              {
+                method: "POST",
+                body: JSON.stringify({
+                  name: projectName,
+                  production_branch: productionBranch,
+                }),
+              }
+            );
+
+            saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
+              account_id: accountId,
+              project_name: projectName,
+            });
+
+            logger.log(
+              `✨ Successfully created the '${projectName}' project. It will be available at https://${subdomain}/ once you create your first deployment.`
+            );
+            logger.log(
+              `To deploy a folder of assets, run 'wrangler pages publish [directory]'.`
+            );
+          }
+        )
+        .epilogue(pagesBetaWarning)
+    )
+    .command(
+      "deployment",
+      "🚀 Interact with the deployments of a project",
+      (yargs) =>
+        yargs
+          .command(
+            "list",
+            "List deployments in your Cloudflare Pages project",
+            (yargs) =>
+              yargs
+                .options({
+                  "project-name": {
+                    type: "string",
+                    description:
+                      "The name of the project you would like to list deployments for",
+                  },
+                })
+                .epilogue(pagesBetaWarning),
+            async ({ projectName }) => {
+              const config = getConfigCache<PagesConfigCache>(
+                PAGES_CONFIG_CACHE_FILENAME
+              );
+              const accountId = await requireAuth(config);
+
+              projectName ??= config.project_name;
+
+              const isInteractive = process.stdin.isTTY;
+              if (!projectName && isInteractive) {
+                const projects = await listProjects({ accountId });
+                projectName = await new Promise((resolve) => {
+                  const { unmount } = render(
+                    <>
+                      <Text>Select a project:</Text>
+                      <SelectInput
+                        items={projects.map((project) => ({
+                          key: project.name,
+                          label: project.name,
+                          value: project,
+                        }))}
+                        onSelect={async (selected) => {
+                          resolve(selected.value.name);
+                          unmount();
+                        }}
+                      />
+                    </>
+                  );
+                });
+              }
+
+              if (!projectName) {
+                throw new FatalError("Must specify a project name.", 1);
+              }
+
+              const deployments: Array<Deployment> = await fetchResult(
+                `/accounts/${accountId}/pages/projects/${projectName}/deployments`
+              );
+
+              const titleCase = (word: string) =>
+                word.charAt(0).toUpperCase() + word.slice(1);
+
+              const shortSha = (sha: string) => sha.slice(0, 7);
+
+              const getStatus = (deployment: Deployment) => {
+                // Return a pretty time since timestamp if successful otherwise the status
+                if (deployment.latest_stage.status === `success`) {
+                  return timeagoFormat(deployment.latest_stage.ended_on);
+                }
+                return titleCase(deployment.latest_stage.status);
+              };
+
+              const data = deployments.map((deployment) => {
+                return {
+                  Environment: titleCase(deployment.environment),
+                  Branch: deployment.deployment_trigger.metadata.branch,
+                  Source: shortSha(
+                    deployment.deployment_trigger.metadata.commit_hash
+                  ),
+                  Deployment: deployment.url,
+                  Status: getStatus(deployment),
+                  // TODO: Use a url shortener
+                  Build: `https://dash.cloudflare.com/${accountId}/pages/view/${deployment.project_name}/${deployment.id}`,
+                };
+              });
+
+              saveToConfigCache<PagesConfigCache>(PAGES_CONFIG_CACHE_FILENAME, {
+                account_id: accountId,
+              });
+
+              render(<Table data={data}></Table>);
+            }
+          )
+          .command({
+            command: "create [directory]",
+            ...createDeployment,
+          } as CommandModule)
+          .epilogue(pagesBetaWarning)
+    )
+    .command({
+      command: "publish [directory]",
+      ...createDeployment,
+    } as CommandModule);
 };
 
 const invalidAssetsFetch: typeof fetch = () => {
@@ -1059,3 +1823,44 @@ const invalidAssetsFetch: typeof fetch = () => {
     "Trying to fetch assets directly when there is no `directory` option specified, and not in `local` mode."
   );
 };
+
+const listProjects = async ({
+  accountId,
+}: {
+  accountId: string;
+}): Promise<Array<Project>> => {
+  const pageSize = 10;
+  let page = 1;
+  const results = [];
+  while (results.length % pageSize === 0) {
+    const json: Array<Project> = await fetchResult(
+      `/accounts/${accountId}/pages/projects`,
+      {},
+      new URLSearchParams({
+        per_page: pageSize.toString(),
+        page: page.toString(),
+      })
+    );
+    page++;
+    results.push(...json);
+    if (json.length < pageSize) {
+      break;
+    }
+  }
+  return results;
+};
+
+function formatTime(duration: number) {
+  return `(${(duration / 1000).toFixed(2)} sec)`;
+}
+
+function Progress({ done, total }: { done: number; total: number }) {
+  return (
+    <>
+      <Text>
+        <Spinner type="earth" />
+        {` Uploading... (${done}/${total})\n`}
+      </Text>
+    </>
+  );
+}