nnw-theme 2.0.2 → 2.0.3

package/dist/render.js

@@ -2,11 +2,11 @@ import { createHash } from "node:crypto";
 import { mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { decodeHTML } from "entities";
+import { Parser } from "htmlparser2";
 import { renderingInputs } from "./netnewswire.js";
 import { fixturePath, readFixture, repositoryFixtures, ThemeError, themeStem, } from "./project.js";
 import { formatG, pyStr } from "./pyformat.js";
 const MACRO_RE = /\[\[([a-zA-Z0-9_-]+)\]\]/g;
-const SCRIPT_RE = /<script\b[^>]*>[\s\S]*?<\/script>/gi;
 // A whole <img> or <source> tag; quoted attribute values may contain ">".
 const MEDIA_TAG_RE = /<(img|source)\b((?:[^>"']|"[^"]*"|'[^']*')*)>/gi;
 const ATTRIBUTE_RE = /([^\s"'=<>/]+)(?:\s*=\s*("[^"]*"|'[^']*'|[^\s"'=<>`]+))?/g;
@@ -301,6 +301,37 @@ function injectScripts(page, inputs, platform) {
     const end = page.lastIndexOf("</body>");
     return `${page.slice(0, end)}${bundle}\n${page.slice(end)}`;
 }
+/**
+ * Remove every <script> element as WebKit's tokenizer finds them, including end
+ * tags like "</script >" and a script left open to the end of the document.
+ */
+export function removeScripts(html) {
+    const ranges = [];
+    let start = -1;
+    const parser = new Parser({
+        onopentag(name) {
+            if (name === "script")
+                start = parser.startIndex;
+        },
+        onclosetag(name, isImplied) {
+            if (name !== "script" || start < 0)
+                return;
+            const end = isImplied
+                ? html.length
+                : html.indexOf(">", parser.endIndex) + 1 || html.length;
+            ranges.push([start, end]);
+            start = -1;
+        },
+    });
+    parser.end(html);
+    let result = "";
+    let offset = 0;
+    for (const [from, to] of ranges) {
+        result += html.slice(offset, from);
+        offset = to;
+    }
+    return result + html.slice(offset);
+}
 function isFile(path) {
     try {
         return statSync(path).isFile();
@@ -319,7 +350,7 @@ export function renderPage(theme, fixture, target, snapshot = renderingInputs().
     if (!required.every(isFile)) {
         throw new ThemeError("bundled NetNewsWire rendering inputs are incomplete");
     }
-    const skeleton = read(pagePath).replace(SCRIPT_RE, "");
+    const skeleton = removeScripts(read(pagePath));
     const stylesheet = read(join(theme, "stylesheet.css"));
     // styleSubstitutions() is empty on macOS, so the macro must stay literal there.
     const styleSubstitutions = {};
@@ -331,7 +362,7 @@ export function renderPage(theme, fixture, target, snapshot = renderingInputs().
     const template = read(join(theme, "template.html"));
     let body = substitute(template, fixtureMapping(fixture, target));
     if (!target.themeScripts)
-        body = body.replace(SCRIPT_RE, "");
+        body = removeScripts(body);
     let page = substitute(skeleton, {
         title: fixture.title ?? "Theme preview",
         style,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nnw-theme",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"description": "Create, preview, check, and publish a NetNewsWire theme.",
 	"license": "Apache-2.0",
 	"author": "Dave Marquard",
@@ -44,8 +44,8 @@
 		"entities": "8.1.0",
 		"fflate": "0.8.3",
 		"htmlparser2": "12.0.0",
-		"playwright-core": "1.64.0-alpha-2026-09-14",
-		"smol-toml": "1.8.0"
+		"playwright-core": "1.64.0",
+		"smol-toml": "1.9.1"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.14",