Update HTMLRewriter to include onDocument, switch to miniflare.dev

Author: mrbbot

src/cli.ts

@@ -77,12 +77,12 @@ export default function parseArgv(raw: string[]): Options {
       },
       modules: {
         type: "boolean",
-        description: "Enable ES modules",
+        description: "Enable modules",
         alias: "m",
       },
       "modules-rule": {
         type: "array",
-        description: "ES modules import rule (TYPE=GLOB)",
+        description: "Modules import rule (TYPE=GLOB)",
       },
       "build-command": {
         type: "string",

src/index.ts

@@ -54,7 +54,7 @@ export class Miniflare {
 
   readonly #wss: WebSocket.Server;
 
-  constructor(options: Options) {
+  constructor(options: Options = {}) {
     if (options.sourceMap) {
       sourceMap.install({ emptyCacheBetweenOperations: true });
     }
@@ -396,7 +396,7 @@ export class Miniflare {
           return [
             '<a href="https://developers.cloudflare.com/workers/" target="_blank" style="text-decoration:none">📚 Workers Docs</a>',
             '<a href="https://discord.gg/cloudflaredev" target="_blank" style="text-decoration:none">💬 Workers Discord</a>',
-            '<a href="https://github.com/mrbbot/miniflare" target="_blank" style="text-decoration:none">🔥 Miniflare Docs</a>',
+            '<a href="https://miniflare.dev" target="_blank" style="text-decoration:none">🔥 Miniflare Docs</a>',
           ].join("");
         });
         const errorHtml = await youch.toHTML();

src/modules/events.ts

@@ -152,7 +152,8 @@ export class EventsModule extends Module {
         }
       } catch (e) {
         if (passThroughMap.get(event)) {
-          this.log.error(e.stack);
+          // warn instead of error so we don't throw an exception when not logging
+          this.log.warn(e.stack);
           break;
         }
         throw e;

src/modules/standards.ts

@@ -8,8 +8,8 @@ import originalFetch, {
   RequestInit,
   Response,
 } from "@mrbbot/node-fetch";
+import { ParsedHTMLRewriter } from "@mrbbot/parsed-html-rewriter";
 import { Crypto } from "@peculiar/webcrypto";
-import { ParsedHTMLRewriter } from "@worker-tools/parsed-html-rewriter";
 import {
   ByteLengthQueuingStrategy,
   CountQueuingStrategy,

test/cli.spec.ts

@@ -27,7 +27,7 @@ test("parseArgv: parses complete argv", (t) => {
     "build_watch",
     "--watch",
     "--upstream",
-    "https://mrbbot.dev",
+    "https://miniflare.dev",
     "--cron",
     "15 * * * *",
     "--cron",
@@ -77,7 +77,7 @@ test("parseArgv: parses complete argv", (t) => {
     buildBasePath: "build",
     buildWatchPath: "build_watch",
     watch: true,
-    upstream: "https://mrbbot.dev",
+    upstream: "https://miniflare.dev",
     crons: ["15 * * * *", "45 * * * *"],
     kvNamespaces: ["TEST_NAMESPACE1", "TEST_NAMESPACE2"],
     kvPersist: true,
@@ -112,7 +112,7 @@ test("parseArgv: parses aliased argv", (t) => {
     "-c",
     "wrangler.test.toml",
     "-u",
-    "https://mrbbot.dev",
+    "https://miniflare.dev",
     "-t",
     "15 * * * *",
     "-t",
@@ -142,7 +142,7 @@ test("parseArgv: parses aliased argv", (t) => {
     wranglerConfigPath: "wrangler.test.toml",
     modules: true,
     watch: true,
-    upstream: "https://mrbbot.dev",
+    upstream: "https://miniflare.dev",
     crons: ["15 * * * *", "45 * * * *"],
     kvNamespaces: ["TEST_NAMESPACE1", "TEST_NAMESPACE2"],
     sitePath: "public",

test/index.spec.ts

@@ -101,23 +101,23 @@ test("getCache: gets cache for manipulation", async (t) => {
         const url = new URL(request.url);
         const cache = caches.default;
         if(url.pathname === "/put") {
-          await cache.put("https://mrbbot.dev/", new Response("1", {
+          await cache.put("https://miniflare.dev/", new Response("1", {
             headers: { "Cache-Control": "max-age=3600" },
           }));
         }
-        return cache.match("https://mrbbot.dev/");
+        return cache.match("https://miniflare.dev/");
       }
     }`,
   });
   let res = await mf.dispatchFetch("http://localhost:8787/put");
   t.is(await res.text(), "1");
 
   const cache = await mf.getCache();
-  const cachedRes = await cache.match("https://mrbbot.dev/");
+  const cachedRes = await cache.match("https://miniflare.dev/");
   t.is(await cachedRes?.text(), "1");
 
   await cache.put(
-    "https://mrbbot.dev",
+    "https://miniflare.dev",
     new Response("2", {
       headers: { "Cache-Control": "max-age=3600" },
     })

test/modules/standards.spec.ts

@@ -131,8 +131,16 @@ test("HTMLRewriter: transforms responses", async (t) => {
           element.setInnerContent("new");
         },
       };
-      // TODO: add onDocument handler here too
-      const rewriter = new sandbox.HTMLRewriter().on("p", elementHandler);
+      const documentHandler = {
+        end(end: {
+          append: (content: string, options?: { html?: boolean }) => void;
+        }) {
+          end.append("<!--after-->", { html: true });
+        },
+      };
+      const rewriter = new sandbox.HTMLRewriter()
+        .on("p", elementHandler)
+        .onDocument(documentHandler);
 
       e.respondWith(
         rewriter.transform(
@@ -143,7 +151,10 @@ test("HTMLRewriter: transforms responses", async (t) => {
   }).toString()})()`;
   const mf = new Miniflare({ script });
   const res = await mf.dispatchFetch(new Request("http://localhost:8787/"));
-  t.is(await res.text(), '<html lang="en"><body><p>new</p></body></html>');
+  t.is(
+    await res.text(),
+    '<html lang="en"><body><p>new</p></body></html><!--after-->'
+  );
 
   // Make sure globals are restored (even if they were undefined)
   t.is(global.Response, originalResponse);

test/options/index.spec.ts

@@ -49,7 +49,7 @@ test("logOptions: logs all options", (t) => {
       { type: "ESModule", include: [regexp1, regexp2] },
       { type: "Text", include: [regexp3] },
     ],
-    upstreamUrl: new URL("https://mrbbot.dev/"),
+    upstreamUrl: new URL("https://miniflare.dev/"),
     validatedCrons: ["30 * * * *"],
     kvNamespaces: ["NAMESPACE1", "NAMESPACE2"],
     kvPersist: "kv-data",
@@ -71,7 +71,7 @@ test("logOptions: logs all options", (t) => {
     `- Scripts: <script>, ${path.join("src", "index.js")}`,
     "- Modules: true",
     "- Modules Rules: {ESModule: regexp1, regexp2}, {Text: regexp3}",
-    "- Upstream: https://mrbbot.dev",
+    "- Upstream: https://miniflare.dev",
     "- Crons: 30 * * * *",
     "- KV Namespaces: NAMESPACE1, NAMESPACE2",
     "- KV Persistence: kv-data",

test/options/processor.spec.ts

@@ -299,8 +299,8 @@ test("getWasmBindings: defaults to empty object", async (t) => {
 
 test("getUpstreamUrl: parses upstream url", (t) => {
   const processor = new OptionsProcessor(new NoOpLog(), {});
-  const url = processor.getUpstreamUrl({ upstream: "https://mrbbot.dev" });
-  t.deepEqual(url, new URL("https://mrbbot.dev"));
+  const url = processor.getUpstreamUrl({ upstream: "https://miniflare.dev" });
+  t.deepEqual(url, new URL("https://miniflare.dev"));
 });
 test("getUpstreamUrl: logs error if cannot parse upstream url", (t) => {
   const log = new TestLog();
@@ -355,7 +355,7 @@ test("getProcessedOptions: includes all processed options", async (t) => {
     wranglerConfigPath,
     modules: true,
     modulesRules: [{ type: "Text", include: ["**/*.txt"] }],
-    upstream: "https://mrbbot.dev",
+    upstream: "https://miniflare.dev",
     crons: ["* * * * *"],
     siteInclude: ["**/*.html"],
     siteExclude: ["**/*.png"],
@@ -412,7 +412,7 @@ test("getProcessedOptions: includes all processed options", async (t) => {
   t.is(instance.exports.add(1, 2), 3);
 
   // Check upstream url
-  t.deepEqual(processedOptions.upstreamUrl, new URL("https://mrbbot.dev"));
+  t.deepEqual(processedOptions.upstreamUrl, new URL("https://miniflare.dev"));
 
   // Check validated crons
   t.deepEqual(processedOptions.validatedCrons, ["* * * * *"]);

test/options/wrangler.spec.ts

@@ -95,7 +95,7 @@ test("getWranglerOptions: maps all options", (t) => {
     globs = ["**/*.js"]
     
     [miniflare]
-    upstream = "https://mrbbot.dev"
+    upstream = "https://miniflare.dev"
     kv_persist = true
     cache_persist = "./cache"
     durable_objects_persist = true
@@ -126,7 +126,7 @@ test("getWranglerOptions: maps all options", (t) => {
     modulesRules: [
       { type: "ESModule", include: ["**/*.js"], fallthrough: undefined },
     ],
-    upstream: "https://mrbbot.dev",
+    upstream: "https://miniflare.dev",
     kvPersist: true,
     cachePersist: "./cache",
     durableObjectsPersist: true,