html-snapshots 6.0.0 → 6.1.0

package/lib/common/index.js

@@ -4,6 +4,7 @@
  * Copyright (c) 2013 - 2025, Alex Grant, LocalNerve, contributors
  * Licensed under the MIT license.
  */
+const { parse: legacyUrlParser } = require("node:url"); // eslint-disable-line n/no-deprecated-api
 
 /**
  * Ensures that options at least contains propties and values from must
@@ -26,6 +27,7 @@ function ensure (options, must) {
 
 /**
  * Simple test for url
+ * Tests for an absolute url string
  * 
  * If you can think of a more approriate test for this use case,
  *   please let me know in the issues...
@@ -40,6 +42,34 @@ function isUrl (obj) {
   return false;
 }
 
+/**
+ * Parse a string url to a URL object
+ * Fallback to legacy parser
+ * 
+ * @param {String} inputUrl - a url to parse.
+ */
+function parseUrl (inputUrl) {
+  let parsedUrl;
+  try {
+    if (isUrl(inputUrl)) {
+      parsedUrl = new URL(inputUrl);
+    } else {
+      parsedUrl = new URL(inputUrl, "bogus://bogus");
+      if (parsedUrl.protocol === "bogus:") {
+        parsedUrl.protocol = "";
+      }
+      if (parsedUrl.hostname === "bogus") {
+        parsedUrl.hostname = "";
+      }
+    }
+    // add legacy auth property
+    parsedUrl.auth = `${parsedUrl.username}:${parsedUrl.password}`;
+  } catch {
+    parsedUrl = legacyUrlParser(inputUrl);
+  }
+  return parsedUrl;
+}
+
 /**
  * Simple test for a function
  * 
@@ -194,5 +224,6 @@ module.exports = {
   isFunction,
   isObject,
   once,
+  parseUrl,
   prependMsgToErr
 };

package/lib/common/sitemap/sitemap.js

@@ -11,7 +11,6 @@
 const fs = require("node:fs");
 const util = require("node:util");
 const path = require("node:path");
-const urlm = require("node:url");
 const zlib = require("node:zlib");
 const xml2js = require("xml2js");
 const smi = require("./sitemap-index");
@@ -114,7 +113,7 @@ function parse (options, document, callback) {
 
             if (process) {
               // if sitemap is malformed, just blow up
-              url = urlm.parse(urlNode.loc[0]);
+              url = common.parseUrl(urlNode.loc[0]);
               if (!base.input(
                 { ...options,
                   ...{

package/lib/input-generators/_base.js

@@ -153,7 +153,7 @@ function prepOptions (options, listener) {
  * @returns {String} The 'path' part of the file output path.
  */
 function getOutputPath (options, page, parse) {
-  const pagePart = urlm.parse(page);
+  const pagePart = common.parseUrl(page);
   // if outputPath was normalized with an object, let the key passthru
   let outputPath = options.outputPath(page, true);
 
@@ -164,7 +164,7 @@ function getOutputPath (options, page, parse) {
 
   // if the outputPath is really still a url, fix it to path+hash
   if (common.isUrl(outputPath)) {
-    outputPath = pagePart.path + (pagePart.hash ? pagePart.hash : "");
+    outputPath = `${pagePart.pathname}${pagePart.search}${pagePart.hash ? pagePart.hash : ""}`;
   }
 
   // if the caller wants the url parse output, return it

package/lib/input-generators/array.js

@@ -8,7 +8,6 @@
  * Licensed under the MIT license.
  */
 
-const urlm = require("node:url");
 const common = require("../common");
 const base = require("./_base");
 
@@ -38,7 +37,7 @@ function generateInput (options) {
   const result = new Promise((resolve, reject) => {
     if (Array.isArray(options.source)) {
       const all = options.source.every(sourceUrl => {
-        const url = urlm.parse(sourceUrl);
+        const url = common.parseUrl(sourceUrl);
         const opts = Object.assign({}, options, {
           protocol: url.protocol,
           auth: url.auth,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "html-snapshots",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "author": {
     "name": "Alex Grant",
     "email": "alex@localnerve.com",
@@ -41,6 +41,16 @@
     "type": "git",
     "url": "https://github.com/localnerve/html-snapshots.git"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/localnerve"
+    },
+    {
+      "type": "paypal",
+      "url": "https://www.paypal.com/ncp/payment/DHCB5GUYMGX5U"
+    }
+  ],
   "keywords": [
     "SEO",
     "html",
@@ -54,13 +64,14 @@
   "dependencies": {
     "async": "3.2.6",
     "async-lock": "1.4.1",
-    "playwright": "1.60.0",
+    "playwright": "1.61.0",
     "puppeteer": "25.1.0",
     "xml2js": "0.6.2"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.4.1",
+    "eslint": "^10.5.0",
+    "eslint-plugin-n": "18.1.0",
     "express": "^5.2.1",
     "globals": "^17.6.0",
     "server-destroy": "^1.0.1",

package/.nvmrc

@@ -1 +0,0 @@
-24.16

package/eslint.config.js

@@ -1,24 +0,0 @@
-const js = require("@eslint/js");
-const globals = require("globals");
-
-module.exports = [{
-  ignores: [
-    "tmp/**",
-    "coverage/**",
-    "examples/**",
-    "test/suites/html-snapshots/server/**"
-  ]
-}, {
-  languageOptions: {
-    sourceType: "commonjs",
-    globals: {
-      ...globals.node
-    }
-  },
-  files: ["**/*.js"],
-  rules: {
-    ...js.configs.recommended.rules,
-    "no-console": 0,
-    "quotes": ["error", "double"]
-  }
-}];