respec 36.0.0 → 37.0.0

package/builds/respec-worker.js

@@ -10,15 +10,73 @@ if (typeof self.hljs === "undefined" && self.RESPEC_HIGHLIGHT_URL) {
 }
 
 self.addEventListener("message", ({ data }) => {
-  if (data.action !== "highlight") return;
-  const { code } = data;
-  const langs = data.languages?.length ? data.languages : undefined;
-  try {
-    const { value, language } = self.hljs.highlightAuto(code, langs);
-    Object.assign(data, { value, language });
-  } catch (err) {
-    console.error("Could not transform some code?", err);
-    Object.assign(data, { value: code, language: "" });
+  switch (data.action) {
+    case "highlight-load-lang": {
+      const { langURL, langScript, propName, lang } = data;
+      console.warn(
+        `[ReSpec] The "highlight-load-lang" worker action is deprecated ` +
+          `and will be removed in a future version. ` +
+          `To migrate, fetch your language script in the main thread and ` +
+          `send the text as "langScript" instead of "langURL". ` +
+          `The "langURL" path may fail in Firefox. ` +
+          `See https://github.com/speced/respec/issues/5228`
+      );
+      try {
+        if (langScript) {
+          const blob = new Blob([langScript], {
+            type: "application/javascript",
+          });
+          const objectURL = URL.createObjectURL(blob);
+          try {
+            importScripts(objectURL);
+          } finally {
+            URL.revokeObjectURL(objectURL);
+          }
+        } else if (langURL) {
+          const { protocol, hostname } = new URL(langURL);
+          const isSecure =
+            protocol === "https:" ||
+            (protocol === "http:" &&
+              (hostname === "localhost" ||
+                hostname === "127.0.0.1" ||
+                hostname === "[::1]"));
+          if (!isSecure) {
+            throw new Error(
+              `langURL must be https: or http: on localhost, got "${langURL}"`
+            );
+          }
+          importScripts(langURL);
+        } else {
+          throw new Error(
+            `No langScript or langURL provided for language "${lang}"`
+          );
+        }
+        if (typeof self[propName] === "function") {
+          self.hljs.registerLanguage(lang, self[propName]);
+        } else {
+          throw new Error(
+            `Language definer "${propName}" is not a function on self`
+          );
+        }
+      } catch (err) {
+        console.error("Failed to load or register language", lang, err);
+      }
+      delete data.langScript;
+      delete data.langURL;
+      break;
+    }
+    case "highlight": {
+      const { code } = data;
+      const langs = data.languages?.length ? data.languages : undefined;
+      try {
+        const { value, language } = self.hljs.highlightAuto(code, langs);
+        Object.assign(data, { value, language });
+      } catch (err) {
+        console.error("Could not transform some code?", err);
+        Object.assign(data, { value: code, language: "" });
+      }
+      break;
+    }
   }
   self.postMessage(data);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "36.0.0",
+  "version": "37.0.0",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
@@ -55,16 +55,16 @@
     "lint-staged": "^16.4.0",
     "loading-indicator": "^2.0.0",
     "pluralize": "^8.0.0",
-    "prettier": "^3.8.2",
+    "prettier": "^3.8.3",
     "prompt": "^1.3.0",
-    "rollup": "^4.60.1",
+    "rollup": "^4.60.2",
     "rollup-plugin-minify-html-literals": "^1.2.6",
     "serve": "^14.2.6",
     "serve-handler": "^6.1.7",
     "simple-git-hooks": "^2.13.1",
     "sniffy-mimetype": "^1.1.1",
     "typescript": "^6.0.3",
-    "vnu-jar": "^26.4.11",
+    "vnu-jar": "^26.4.16",
     "webidl2": "^24.5.0"
   },
   "scripts": {
@@ -92,8 +92,8 @@
   "dependencies": {
     "colors": "1.4.0",
     "finalhandler": "^2.1.1",
-    "marked": "^18.0.0",
-    "puppeteer": "^24.40.0",
+    "marked": "^18.0.2",
+    "puppeteer": "^24.42.0",
     "sade": "^1.8.1",
     "serve-static": "^2.2.1"
   },

package/tools/respecDocWriter.js

@@ -225,7 +225,7 @@ async function checkIfReSpec(page) {
  */
 async function generateHTML(page, timer, version, url) {
   try {
-    return await page.evaluate(evaluateHTML, version, timer);
+    return await page.evaluate(evaluateHTML, timer);
   } catch (err) {
     const msg = `\n😭  Sorry, there was an error generating the HTML. Please report this issue!\n${`${
       `Specification: ${url}\n` +
@@ -237,43 +237,24 @@ async function generateHTML(page, timer, version, url) {
 }
 
 /**
- * @param {ReSpecVersion} version
  * @param {ReturnType<typeof createTimer>} timer
  */
-async function evaluateHTML(version, timer) {
+async function evaluateHTML(timer) {
   await timeout(
     document.respec ? document.respec.ready : document.respecIsReady,
     timer.remaining
   );
 
-  const [major, minor] = version;
-  if (major < 20 || (major === 20 && minor < 10)) {
-    console.warn(
-      "👴🏽  Ye Olde ReSpec version detected! Please update to 20.10.0 or above. " +
-        `Your version: ${window.respecVersion}.`
+  if (!document.respec?.toHTML) {
+    throw new Error(
+      "document.respec.toHTML is not available. " +
+        "Please upgrade to a newer version of ReSpec, " +
+        "or use an older version of the ReSpec CLI."
     );
-    // Document references an older version of ReSpec that does not yet
-    // have the "core/exporter" module. Try with the old "ui/save-html"
-    // module.
-    const { exportDocument } = await new Promise((resolve, reject) => {
-      require(["ui/save-html"], resolve, err => {
-        reject(new Error(err.message));
-      });
-    });
-    return exportDocument("html", "text/html");
-  } else if (!document.respec || !document.respec.toHTML) {
-    const { rsDocToDataURL } = await new Promise((resolve, reject) => {
-      require(["core/exporter"], resolve, err => {
-        reject(new Error(err.message));
-      });
-    });
-    const dataURL = rsDocToDataURL("text/html");
-    const encodedString = dataURL.replace(/^data:\w+\/\w+;charset=utf-8,/, "");
-    return decodeURIComponent(encodedString);
-  } else {
-    return await document.respec.toHTML();
   }
 
+  return await document.respec.toHTML();
+
   function timeout(promise, ms) {
     return new Promise((resolve, reject) => {
       promise.then(resolve, reject);