respec 32.8.1 → 33.0.1

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "respec",
-  "version": "32.8.1",
+  "version": "33.0.1",
   "license": "W3C",
   "description": "A technical specification pre-processor.",
   "engines": {
-    "node": ">=16",
-    "npm": ">=7"
+    "node": ">=18.14"
   },
+  "packageManager": "pnpm@8.1.1",
   "bin": {
     "respec": "tools/respec2html.js",
     "respec2html": "tools/respec2html.js"
   },
   "main": "./tools/respecDocWriter.js",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "git://github.com/w3c/respec.git"
@@ -23,9 +24,9 @@
     "Robin Berjon"
   ],
   "devDependencies": {
-    "@rollup/plugin-alias": "^4.0.3",
+    "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^24.0.1",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.2",
     "@types/marked": "^4.0.8",
     "@types/pluralize": "0.0.29",
     "boxen": "^7.0.2",
@@ -59,36 +60,37 @@
     "serve": "^14.2.0",
     "serve-handler": "^6.1.5",
     "sniffy-mimetype": "^1.1.1",
-    "typescript": "^5.0.2",
+    "typescript": "^5.0.3",
     "vnu-jar": "^22.9.29",
     "webidl2": "^24.2.2"
   },
   "scripts": {
-    "build:aom-debug": "npm run build:aom -- --debug",
-    "build:aom": "node ./tools/builder.js aom",
-    "build:geonovum-debug": "npm run build:geonovum -- --debug",
-    "build:geonovum": "node ./tools/builder.js geonovum",
-    "build:w3c-debug": "npm run build:w3c -- --debug",
-    "build:w3c": "node ./tools/builder.js w3c",
-    "build:dini-debug": "node run build:dini -- --debug",
-    "build:dini": "node ./tools/builder.js dini",
+    "build:aom-debug": "pnpm build:aom -- --debug",
+    "build:aom": "pnpm builder aom",
+    "build:geonovum-debug": "pnpm build:geonovum -- --debug",
+    "build:geonovum": "pnpm builder geonovum",
+    "build:w3c-debug": "pnpm build:w3c -- --debug",
+    "build:w3c": "pnpm builder w3c",
+    "build:dini-debug": "pnpm build:dini -- --debug",
+    "build:dini": "pnpm builder dini",
     "builddeps": "rollup -c js/deps/rollup.config.js --bundleConfigAsCjs && rollup -c worker/rollup.config.js --bundleConfigAsCjs",
     "lint": "tsc -p src/jsconfig.json && eslint .",
-    "prepare": "npm run builddeps",
-    "release": "node ./tools/release.js",
+    "prepare": "pnpm builddeps",
+    "builder": "node ./tools/builder.cjs",
+    "release": "node ./tools/release.cjs",
     "server": "serve",
-    "start": "node ./tools/dev-server.js",
-    "test:build": "jasmine --random=false ./tests/test-build.js",
-    "test:headless": "jasmine --random=false ./tests/headless.js",
-    "test": "npm run test:unit && npm run test:integration",
-    "test:unit": "karma start ./tests/unit/karma.conf.js --single-run",
-    "test:integration": "karma start ./tests/spec/karma.conf.js --single-run"
+    "start": "node ./tools/dev-server.cjs",
+    "test:build": "jasmine --random=false ./tests/test-build.cjs",
+    "test:headless": "jasmine --random=false ./tests/headless.cjs",
+    "test": "pnpm test:unit && pnpm test:integration",
+    "test:unit": "karma start ./tests/unit/karma.conf.cjs --single-run",
+    "test:integration": "karma start ./tests/spec/karma.conf.cjs --single-run"
   },
   "dependencies": {
     "colors": "1.4.0",
     "finalhandler": "^1.2.0",
     "marked": "^4.3.0",
-    "puppeteer": "^19.8.2",
+    "puppeteer": "^19.8.3",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0"
   },

package/tools/respec2html.js

@@ -1,14 +1,16 @@
 #!/usr/bin/env node
-const path = require("path");
-const http = require("http");
-const serveStatic = require("serve-static");
-const finalhandler = require("finalhandler");
-const sade = require("sade");
-const colors = require("colors");
-const { marked } = require("marked");
+import { readFile, writeFile } from "fs/promises";
+import colors from "colors";
+import { fileURLToPath } from "url";
+import finalhandler from "finalhandler";
+import http from "http";
+import { marked } from "marked";
+import path from "path";
+import sade from "sade";
+import serveStatic from "serve-static";
+import { toHTML } from "./respecDocWriter.js";
 
-const { writeFile } = require("fs").promises;
-const { toHTML } = require("./respecDocWriter.js");
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 class Renderer extends marked.Renderer {
   strong(text) {
@@ -205,8 +207,9 @@ cli.action(async (source, destination, opts) => {
 });
 
 // https://github.com/lukeed/sade/issues/28#issuecomment-516104013
-cli._version = () => {
-  const { version } = require("../package.json");
+cli._version = async () => {
+  const packageJson = path.join(__dirname, "..", "package.json");
+  const { version } = JSON.parse(await readFile(packageJson));
   console.log(version);
 };
 

package/tools/respecDocWriter.js

@@ -1,10 +1,13 @@
 /**
  * Exports toHTML() method, allowing programmatic control of the spec generator.
  */
-const puppeteer = require("puppeteer");
-const path = require("path");
-const { mkdtemp, readFile } = require("fs").promises;
-const { tmpdir } = require("os");
+import { mkdtemp, readFile } from "fs/promises";
+import { fileURLToPath } from "url";
+import path from "path";
+import puppeteer from "puppeteer";
+import { tmpdir } from "os";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const noop = () => {};
 
@@ -22,7 +25,7 @@ const noop = () => {};
  * @return {Promise<{ html: string, errors: RsError[], warnings: RsError[] }>}
  * @throws {Error} If failed to process.
  */
-async function toHTML(src, options = {}) {
+export async function toHTML(src, options = {}) {
   const {
     timeout = 300000,
     disableSandbox = false,
@@ -345,5 +348,3 @@ function createTimer(duration) {
     },
   };
 }
-
-exports.toHTML = toHTML;