puppeteer-browser-ready 1.2.3 → 1.3.1

package/README.md

@@ -130,14 +130,28 @@ describe('The web page', () => {
    before(loadWebPage);
    after(closeWebPage);
 
-   it('has the correct URL -> ' + url, () => {
+   it('has the correct URL', () => {
       const actual =   { status: web.status, url: web.location.href };
       const expected = { status: 200,        url: url };
       assertDeepStrictEqual(actual, expected);
       });
 
-   it('has exactly one header, main, and footer', () => {
-      const actual =   getTags('body >*');
+   it('title starts with "Pretty-Print JSON"', () => {
+      const actual =   { title: web.title.substring(0, 17) };
+      const expected = { title: 'Pretty-Print JSON' };
+      assertDeepStrictEqual(actual, expected);
+      });
+
+   it('body has exactly one header, main, and footer -- node-html-parsed', () => {
+      const getTags =  (elems) => [...elems].map(elem => elem.tagName.toLowerCase());
+      const actual =   getTags(web.root.querySelectorAll('body >*'));
+      const expected = ['header', 'main', 'footer'];
+      assertDeepStrictEqual(actual, expected);
+      });
+
+   it('body has exactly one header, main, and footer -- page.$$eval()', async () => {
+      const getTags =  (elems) => elems.map(elem => elem.nodeName.toLowerCase());
+      const actual =   await web.page.$$eval('body >*', getTags);
       const expected = ['header', 'main', 'footer'];
       assertDeepStrictEqual(actual, expected);
       });
@@ -160,8 +174,10 @@ describe('The document content', () => {
 **Output:**
 ```
   The web page
-    ✓ has the correct URL -> https://pretty-print-json.js.org/
-    ✓ has exactly one header, main, and footer
+    ✓ has the correct URL
+    ✓ title starts with "Pretty-Print JSON"
+    ✓ body has exactly one header, main, and footer -- node-html-parsed
+    ✓ body has exactly one header, main, and footer -- page.$$eval()
 
   The document content
     ✓ has a 🚀 traveling to 🪐!
@@ -218,7 +234,7 @@ Example configuration in **package.json** to allow 5,000 ms:
 <br>
 
 ---
-**CLI Build Tools**
+**CLI Build Tools for package.json**
    - 🎋 [add-dist-header](https://github.com/center-key/add-dist-header):&nbsp; _Prepend a one-line banner comment (with license notice) to distribution files_
    - 📄 [copy-file-util](https://github.com/center-key/copy-file-util):&nbsp; _Copy or rename a file with optional package version number_
    - 📂 [copy-folder-util](https://github.com/center-key/copy-folder-util):&nbsp; _Recursively copy files from one folder to another folder_

package/dist/puppeteer-browser-ready.d.ts

@@ -1,6 +1,5 @@
-//! puppeteer-browser-ready v1.2.3 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
+//! puppeteer-browser-ready v1.3.1 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
 
-/// <reference types="cheerio" />
 import { Browser, HTTPResponse, Page } from 'puppeteer';
 import { HTMLElement } from 'node-html-parser';
 import { Server } from 'http';
@@ -29,11 +28,9 @@ export type Web = {
     location: Location;
     title: string | null;
     html: string | null;
-    $: cheerio.Root | null;
     root: HTMLElement | null;
 };
 export type BrowserReadySettings = {
-    addCheerio: boolean;
     parseHtml: boolean;
     verbose: boolean;
 };

package/dist/puppeteer-browser-ready.js

@@ -1,7 +1,6 @@
-//! puppeteer-browser-ready v1.2.3 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
+//! puppeteer-browser-ready v1.3.1 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
 
 import { parse } from 'node-html-parser';
-import cheerio from 'cheerio';
 import express from 'express';
 import httpTerminator from 'http-terminator';
 // Package
@@ -43,13 +42,11 @@ const browserReady = {
         return http.terminator.terminate();
     },
     goto(url, options) {
-        const defaults = { addCheerio: false, parseHtml: true, verbose: false };
+        const defaults = { parseHtml: true, verbose: false };
         const settings = { ...defaults, ...options };
-        if (settings.addCheerio)
-            console.log('puppeteer-browser-ready: Option "addCheerio" is deprecated, use "parseHtml" instead.');
         const log = (label, msg) => settings.verbose &&
             console.log('   ', Date.now() % 100000, label + ':', msg);
-        const rootInfo = (root) => root.constructor.name + '/' + root.firstChild.toString();
+        const rootInfo = (root) => root.constructor.name + '/' + root.firstChild?.toString();
         const web = async (browser) => {
             log('Connected', browser.isConnected());
             try {
@@ -65,10 +62,9 @@ const browserReady = {
                 log('Title', title);
                 const html = response && await response.text();
                 log('Bytes', html?.length);
-                const $ = html && settings.addCheerio ? cheerio.load(html) : null; //deprecated
                 const root = html && settings.parseHtml ? parse(html) : null;
                 log('DOM root', root ? rootInfo(root) : null);
-                return { browser, page, response, status, location, title, html, $, root };
+                return { browser, page, response, status, location, title, html, root };
             }
             catch (error) {
                 const status = browser.isConnected() ? 'connected' : 'not connected';

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "puppeteer-browser-ready",
-   "version": "1.2.3",
+   "version": "1.3.1",
    "description": "Simple utility to go to a URL and wait for the HTTP response",
    "license": "MIT",
    "type": "module",
@@ -16,7 +16,10 @@
       },
       "./": "./dist/"
    },
-   "repository": "github:center-key/puppeteer-browser-ready",
+   "repository": {
+      "type": "git",
+      "url": "git+https://github.com/center-key/puppeteer-browser-ready.git"
+   },
    "homepage": "https://github.com/center-key/puppeteer-browser-ready",
    "bugs": "https://github.com/center-key/puppeteer-browser-ready/issues",
    "docs": "https://github.com/center-key/puppeteer-browser-ready#readme",
@@ -74,7 +77,7 @@
       "build": [
          "tsc",
          "add-dist-header build dist",
-         "html-validator"
+         "html-validator spec"
       ]
    },
    "scripts": {
@@ -85,31 +88,29 @@
       "puppeteer": "^15 || ^16 || ^17 || ^18 || ^19.7 || ^20 || ^21"
    },
    "dependencies": {
-      "cheerio": "~1.0.0-rc.12",
       "express": "~4.18",
       "http-terminator": "~3.2",
       "node-html-parser": "~6.1"
    },
    "devDependencies": {
-      "@types/cheerio": "~0.22",
       "@types/express": "~4.17",
       "@types/mocha": "~10.0",
-      "@types/node": "~20.6",
+      "@types/node": "~20.10",
       "@types/ws": "~8.5",
-      "@typescript-eslint/eslint-plugin": "~6.7",
-      "@typescript-eslint/parser": "~6.7",
+      "@typescript-eslint/eslint-plugin": "~6.15",
+      "@typescript-eslint/parser": "~6.15",
       "add-dist-header": "~1.3",
       "assert-deep-strict-equal": "~1.1",
       "copy-file-util": "~1.1",
       "copy-folder-util": "~1.1",
-      "eslint": "~8.49",
+      "eslint": "~8.56",
       "jshint": "~2.13",
       "mocha": "~10.2",
-      "open": "~9.1",
-      "puppeteer": "~21.2",
+      "open": "~10.0",
+      "puppeteer": "~21.6",
       "rimraf": "~5.0",
       "run-scripts-util": "~1.2",
-      "typescript": "~5.2",
-      "w3c-html-validator": "~1.4"
+      "typescript": "~5.3",
+      "w3c-html-validator": "~1.6"
    }
 }