wrangler 0.0.0-e88a54e → 0.0.0-e8e684c7

package/pages/functions/template-worker.ts

@@ -1,130 +0,0 @@
-import { match } from "path-to-regexp";
-import type { HTTPMethod } from "./routes";
-
-/* TODO: Grab these from @cloudflare/workers-types instead */
-type Params<P extends string = string> = Record<P, string | string[]>;
-
-type EventContext<Env, P extends string, Data> = {
-  request: Request;
-  waitUntil: (promise: Promise<unknown>) => void;
-  next: (input?: Request | string, init?: RequestInit) => Promise<Response>;
-  env: Env & { ASSETS: { fetch: typeof fetch } };
-  params: Params<P>;
-  data: Data;
-};
-
-declare type PagesFunction<
-  Env = unknown,
-  P extends string = string,
-  Data extends Record<string, unknown> = Record<string, unknown>
-> = (context: EventContext<Env, P, Data>) => Response | Promise<Response>;
-/* end @cloudflare/workers-types */
-
-type RouteHandler = {
-  routePath: string;
-  method?: HTTPMethod;
-  modules: PagesFunction[];
-  middlewares: PagesFunction[];
-};
-
-// inject `routes` via ESBuild
-declare const routes: RouteHandler[];
-// define `__FALLBACK_SERVICE__` via ESBuild
-declare const __FALLBACK_SERVICE__: string;
-
-// expect an ASSETS fetcher binding pointing to the asset-server stage
-type FetchEnv = {
-  [name: string]: { fetch: typeof fetch };
-  ASSETS: { fetch: typeof fetch };
-};
-
-type WorkerContext = {
-  waitUntil: (promise: Promise<unknown>) => void;
-};
-
-function* executeRequest(request: Request, _env: FetchEnv) {
-  const requestPath = new URL(request.url).pathname;
-
-  // First, iterate through the routes (backwards) and execute "middlewares" on partial route matches
-  for (const route of [...routes].reverse()) {
-    if (route.method && route.method !== request.method) {
-      continue;
-    }
-
-    const routeMatcher = match(route.routePath, { end: false });
-    const matchResult = routeMatcher(requestPath);
-    if (matchResult) {
-      for (const handler of route.middlewares.flat()) {
-        yield {
-          handler,
-          params: matchResult.params as Params,
-        };
-      }
-    }
-  }
-
-  // Then look for the first exact route match and execute its "modules"
-  for (const route of routes) {
-    if (route.method && route.method !== request.method) {
-      continue;
-    }
-
-    const routeMatcher = match(route.routePath, { end: true });
-    const matchResult = routeMatcher(requestPath);
-    if (matchResult && route.modules.length) {
-      for (const handler of route.modules.flat()) {
-        yield {
-          handler,
-          params: matchResult.params as Params,
-        };
-      }
-      break;
-    }
-  }
-}
-
-export default {
-  async fetch(request: Request, env: FetchEnv, workerContext: WorkerContext) {
-    const handlerIterator = executeRequest(request, env);
-    const data = {}; // arbitrary data the user can set between functions
-    const next = async (input?: RequestInfo, init?: RequestInit) => {
-      if (input !== undefined) {
-        request = new Request(input, init);
-      }
-
-      const result = handlerIterator.next();
-      // Note we can't use `!result.done` because this doesn't narrow to the correct type
-      if (result.done == false) {
-        const { handler, params } = result.value;
-        const context = {
-          request: new Request(request.clone()),
-          next,
-          params,
-          data,
-          env,
-          waitUntil: workerContext.waitUntil.bind(workerContext),
-        };
-
-        const response = await handler(context);
-
-        // https://fetch.spec.whatwg.org/#null-body-status
-        return new Response(
-          [101, 204, 205, 304].includes(response.status) ? null : response.body,
-          response
-        );
-      } else if (__FALLBACK_SERVICE__) {
-        // There are no more handlers so finish with the fallback service (`env.ASSETS.fetch` in Pages' case)
-        return env[__FALLBACK_SERVICE__].fetch(request);
-      } else {
-        // There was not fallback service so actually make the request to the origin.
-        return fetch(request);
-      }
-    };
-
-    try {
-      return next();
-    } catch (err) {
-      return new Response("Internal Error", { status: 500 });
-    }
-  },
-};

package/src/__tests__/dev2.test.tsx

@@ -1,154 +0,0 @@
-import * as fs from "node:fs";
-import React from "react";
-import TestRenderer from "react-test-renderer";
-import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { unsetAllMocks } from "./helpers/mock-cfetch";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import type { DevProps, default as DevType } from "../dev/dev";
-
-function sleep(period = 100): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, period));
-}
-
-// we use this ["mock"] form to avoid esbuild-jest from rewriting it
-jest["mock"]("../proxy", () => {
-  return {
-    usePreviewServer() {},
-    waitForPortToBeAvailable() {},
-  };
-});
-jest["mock"]("../inspect", () => {
-  return () => {};
-});
-
-const Dev: typeof DevType = jest.requireActual("../dev/dev").DevImplementation;
-
-mockAccountId();
-mockApiToken();
-runInTempDir();
-mockConsoleMethods();
-afterEach(() => {
-  unsetAllMocks();
-});
-
-describe("dev", () => {
-  it("should render", async () => {
-    fs.writeFileSync("./index.js", `export default {}`);
-
-    const testRenderer = await renderDev({
-      entry: {
-        file: "./index.js",
-        directory: process.cwd(),
-        format: "modules",
-      },
-    });
-    expect(testRenderer.toJSON()).toMatchInlineSnapshot(`
-      <ink-box
-        style={
-          Object {
-            "borderStyle": "round",
-            "flexDirection": "row",
-            "flexGrow": 0,
-            "flexShrink": 1,
-            "marginBottom": 0,
-            "marginLeft": 0,
-            "marginRight": 0,
-            "marginTop": 0,
-            "paddingBottom": 0,
-            "paddingLeft": 1,
-            "paddingRight": 1,
-            "paddingTop": 0,
-          }
-        }
-      >
-        <ink-text
-          internal_transform={[Function]}
-          style={
-            Object {
-              "flexDirection": "row",
-              "flexGrow": 0,
-              "flexShrink": 1,
-              "textWrap": "wrap",
-            }
-          }
-        >
-          B to open a browser, D to open Devtools, L to turn off local mode, X to exit
-        </ink-text>
-      </ink-box>
-    `);
-    await TestRenderer.act(async () => {
-      // TODO: get rid of these sleep statements
-      await sleep(50);
-      testRenderer.unmount();
-      await sleep(50);
-    });
-    await sleep(50);
-  });
-});
-
-async function renderDev({
-  name,
-  entry = { file: "index.js", directory: "", format: "modules" },
-  port,
-  ip = "localhost",
-  inspectorPort = 9229,
-  accountId,
-  legacyEnv = true,
-  initialMode = "local",
-  jsxFactory,
-  jsxFragment,
-  localProtocol = "http",
-  upstreamProtocol = "https",
-  rules = [],
-  bindings = {
-    kv_namespaces: [],
-    vars: {},
-    durable_objects: { bindings: [] },
-    r2_buckets: [],
-    wasm_modules: undefined,
-    text_blobs: undefined,
-    unsafe: [],
-  },
-  public: publicDir,
-  assetPaths,
-  compatibilityDate,
-  compatibilityFlags,
-  usageModel,
-  buildCommand = {},
-  enableLocalPersistence = false,
-  env,
-  zone,
-}: Partial<DevProps>): Promise<TestRenderer.ReactTestRenderer> {
-  let instance: TestRenderer.ReactTestRenderer | undefined;
-  await TestRenderer.act(async () => {
-    instance = TestRenderer.create(
-      <Dev
-        name={name}
-        entry={entry}
-        env={env}
-        rules={rules}
-        port={port}
-        ip={ip}
-        inspectorPort={inspectorPort}
-        legacyEnv={legacyEnv}
-        buildCommand={buildCommand}
-        initialMode={initialMode}
-        localProtocol={localProtocol}
-        upstreamProtocol={upstreamProtocol}
-        jsxFactory={jsxFactory}
-        jsxFragment={jsxFragment}
-        accountId={accountId}
-        assetPaths={assetPaths}
-        public={publicDir}
-        compatibilityDate={compatibilityDate}
-        compatibilityFlags={compatibilityFlags}
-        usageModel={usageModel}
-        bindings={bindings}
-        enableLocalPersistence={enableLocalPersistence}
-        zone={zone}
-      />
-    );
-  });
-  return instance as TestRenderer.ReactTestRenderer;
-}

package/src/__tests__/helpers/faye-websocket.d.ts

@@ -1,6 +0,0 @@
-module "faye-websocket" {
-  /**
-   * Standards-compliant WebSocket client and server.
-   */
-  export default WebSocket;
-}

package/src/__tests__/logout.test.ts

@@ -1,52 +0,0 @@
-import { existsSync } from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import fetchMock from "jest-fetch-mock";
-import {
-  reinitialiseAuthTokens,
-  USER_AUTH_CONFIG_FILE,
-  writeAuthConfigFile,
-} from "../user";
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import { runWrangler } from "./helpers/run-wrangler";
-
-describe("wrangler", () => {
-  runInTempDir({ homedir: "./home" });
-  const std = mockConsoleMethods();
-
-  describe("logout", () => {
-    it("should exit with a message stating the user is not logged in", async () => {
-      await runWrangler("logout");
-      expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
-    });
-
-    it("should logout user that has been properly logged in", async () => {
-      writeAuthConfigFile({
-        oauth_token: "some-oauth-tok",
-        refresh_token: "some-refresh-tok",
-      });
-      // Mock out the response for a request to revoke the auth tokens,
-      // checking the form of the request is as expected.
-      fetchMock.mockResponseOnce(async (req) => {
-        expect(req.url).toEqual("https://dash.cloudflare.com/oauth2/revoke");
-        expect(req.method).toEqual("POST");
-        return "";
-      });
-
-      // Now that we have changed the auth tokens in the wrangler.toml we must reinitialize the user auth state.
-      reinitialiseAuthTokens();
-      await runWrangler("logout");
-
-      expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
-
-      // Make sure that we made the request to logout.
-      expect(fetchMock).toHaveBeenCalledTimes(1);
-
-      // Make sure that logout removed the config file containing the auth tokens.
-      expect(existsSync(path.join(os.homedir(), USER_AUTH_CONFIG_FILE))).toBe(
-        false
-      );
-    });
-  });
-});

package/src/__tests__/sentry.test.ts

@@ -1,146 +0,0 @@
-import * as fs from "node:fs";
-import * as fsp from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-import * as TOML from "@iarna/toml";
-import * as Sentry from "@sentry/node";
-import prompts from "prompts";
-
-import { mockConsoleMethods } from "./helpers/mock-console";
-import { runInTempDir } from "./helpers/run-in-tmp";
-import { runWrangler } from "./helpers/run-wrangler";
-const { reportError } = jest.requireActual("../reporting");
-
-describe("Error Reporting", () => {
-  runInTempDir({ homedir: "./home" });
-  mockConsoleMethods();
-  const reportingTOMLPath = ".wrangler/config/reporting.toml";
-
-  const originalTTY = process.stdout.isTTY;
-  beforeEach(() => {
-    jest.mock("@sentry/node");
-    jest.spyOn(Sentry, "captureException");
-    process.stdout.isTTY = true;
-  });
-
-  afterEach(() => {
-    jest.unmock("@sentry/node");
-    jest.clearAllMocks();
-    process.stdout.isTTY = originalTTY;
-  });
-
-  it("should confirm user will allow error reporting usage", async () => {
-    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: true });
-
-    await reportError(new Error("test error"), "testFalse");
-
-    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
-      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
-    );
-
-    expect(error_tracking_opt).toBe(true);
-    expect(error_tracking_opt_date).toBeTruthy();
-
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      new Error("test error")
-    );
-  });
-
-  it("should confirm user will disallow error reporting usage", async () => {
-    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: false });
-    await reportError(new Error("test error"), "testFalse");
-
-    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
-      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
-    );
-
-    expect(error_tracking_opt).toBe(false);
-    expect(error_tracking_opt_date).toBeTruthy();
-
-    expect(Sentry.captureException).not.toHaveBeenCalledWith(
-      new Error("test error"),
-      "testFalse"
-    );
-  });
-
-  it("should confirm user will allow 'once' error reporting usage", async () => {
-    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: "once" });
-    await runWrangler();
-    await reportError(new Error("test error"), "testFalse");
-
-    expect(fs.existsSync(path.join(os.homedir(), reportingTOMLPath))).toBe(
-      false
-    );
-
-    expect(Sentry.captureException).not.toHaveBeenCalledWith(
-      new Error("test error"),
-      "testFalse"
-    );
-  });
-
-  it("should not prompt w/ subsequent Errors after user disallows error reporting", async () => {
-    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: false });
-    await reportError(new Error("test error"), "testFalse");
-
-    expect(Sentry.captureException).not.toHaveBeenCalledWith(
-      new Error("test error"),
-      "testFalse"
-    );
-
-    await reportError(new Error("second test error"), "testFalse");
-    expect(Sentry.captureException).not.toHaveBeenCalledWith(
-      new Error("second test error"),
-      "testFalse"
-    );
-  });
-
-  it("should not prompt w/ subsequent Errors after user Always allows error reporting", async () => {
-    jest.spyOn(prompts, "prompt").mockResolvedValue({ sentryDecision: true });
-    await reportError(new Error("test error"), "testFalse");
-
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      new Error("test error")
-    );
-
-    await reportError(new Error("second test error"), "testFalse");
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      new Error("second test error")
-    );
-  });
-
-  it("should prompt w/ subsequent Errors after user allows error reporting once", async () => {
-    const promptSpy = jest
-      .spyOn(prompts, "prompt")
-      .mockResolvedValue({ sentryDecision: "once" });
-    await reportError(new Error("test error"), "testFalse");
-
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      new Error("test error")
-    );
-
-    await reportError(new Error("second test error"), "testFalse");
-    expect(Sentry.captureException).toHaveBeenCalledWith(
-      new Error("second test error")
-    );
-
-    expect(promptSpy).toBeCalledTimes(2);
-  });
-
-  it("should not prompt in non-TTY environment", async () => {
-    process.stdout.isTTY = false;
-
-    await reportError(new Error("test error"), "testFalse");
-
-    const { error_tracking_opt, error_tracking_opt_date } = TOML.parse(
-      await fsp.readFile(path.join(os.homedir(), reportingTOMLPath), "utf-8")
-    );
-
-    expect(error_tracking_opt).toBe(false);
-    expect(error_tracking_opt_date).toBeTruthy();
-
-    expect(Sentry.captureException).not.toHaveBeenCalledWith(
-      new Error("test error")
-    );
-    process.stdout.isTTY = originalTTY;
-  });
-});