jsdom - npm Package Compare versions

Comparing version 14.1.0 to 15.0.0

lib/api.js

@@ -19,5 +19,2 @@ "use strict";
 
-// This symbol allows us to smuggle a non-public option through to the JSDOM constructor, for use by JSDOM.fromURL.
-const transportLayerEncodingLabelHiddenOption = Symbol("transportLayerEncodingLabel");
-
 class CookieJar extends toughCookie.CookieJar {
@@ -36,3 +33,3 @@ constructor(store, options) {
     const mimeType = new MIMEType(options.contentType === undefined ? "text/html" : options.contentType);
-    const { html, encoding } = normalizeHTML(input, options[transportLayerEncodingLabelHiddenOption], mimeType);
+    const { html, encoding } = normalizeHTML(input, mimeType);
 
@@ -136,13 +133,6 @@ options = transformOptions(options, encoding, mimeType);
 
-        let transportLayerEncodingLabel;
-        if ("content-type" in res.headers) {
-          const mimeType = new MIMEType(res.headers["content-type"]);
-          transportLayerEncodingLabel = mimeType.parameters.get("charset");
-        }
-
         options = Object.assign(options, {
           url: req.href + parsedURL.hash,
           contentType: res.headers["content-type"],
-          referrer: req.getHeader("referer"),
-          [transportLayerEncodingLabelHiddenOption]: transportLayerEncodingLabel
+          referrer: req.getHeader("referer")
         });
@@ -198,3 +188,3 @@
     const extname = path.extname(filename);
-    if (extname === ".xhtml" || extname === ".xml") {
+    if (extname === ".xhtml" || extname === ".xht" || extname === ".xml") {
       normalized.contentType = "application/xhtml+xml";
@@ -298,3 +288,3 @@ }
 
-function normalizeHTML(html = "", transportLayerEncodingLabel, mimeType) {
+function normalizeHTML(html = "", mimeType) {
   let encoding = "UTF-8";
@@ -311,3 +301,3 @@
       defaultEncoding: mimeType.isXML() ? "UTF-8" : "windows-1252",
-      transportLayerEncodingLabel
+      transportLayerEncodingLabel: mimeType.parameters.get("charset")
     });
@@ -314,0 +304,0 @@ html = whatwgEncoding.decode(html, encoding);

lib/jsdom/living/file-api/Blob-impl.js

 "use strict";
-const { EOL } = require("os");
 const Blob = require("../generated/Blob");
 
 function convertLineEndingsToNative(s) {
-  return s.replace(/\r\n|\r|\n/g, EOL);
+  // jsdom always pretends to be *nix, for consistency.
+  // See also https://github.com/jsdom/jsdom/issues/2396.
+  return s.replace(/\r\n|\r|\n/g, "\n");
 }
@@ -8,0 +9,0 @@

package.json

 {
   "name": "jsdom",
-  "version": "14.1.0",
+  "version": "15.0.0",
   "description": "A JavaScript implementation of many web standards",
@@ -5,0 +5,0 @@ "keywords": [

README.md

@@ -56,3 +56,3 @@ <h1 align="center">
 - `referrer` just affects the value read from `document.referrer`. It defaults to no referrer (which reflects as the empty string).
-- `contentType` affects the value read from `document.contentType`, and how the document is parsed: as HTML or as XML. Values that are not `"text/html"` or an [XML mime type](https://html.spec.whatwg.org/multipage/infrastructure.html#xml-mime-type) will throw. It defaults to `"text/html"`.
+- `contentType` affects the value read from `document.contentType`, as well as how the document is parsed: as HTML or as XML. Values that are not a [HTML mime type](https://mimesniff.spec.whatwg.org/#html-mime-type) or an [XML mime type](https://mimesniff.spec.whatwg.org/#xml-mime-type) will throw. It defaults to `"text/html"`. If a `charset` parameter is present, it can affect [binary data processing](#encoding-sniffing).
 - `includeNodeLocations` preserves the location info produced by the HTML parser, allowing you to retrieve it with the `nodeLocation()` method (described below). It also ensures that line numbers reported in exception stack traces for code running inside `<script>` elements are correct. It defaults to `false` to give the best performance, and cannot be used with an XML content type since our XML parser does not support location info.
@@ -399,3 +399,3 @@ - `storageQuota` is the maximum size in code units for the separate storage areas used by `localStorage` and `sessionStorage`. Attempts to store data larger than this limit will cause a `DOMException` to be thrown. By default, it is set to 5,000,000 code units per origin, as inspired by the HTML specification.
 - The `url` option will default to a file URL corresponding to the given filename, instead of to `"about:blank"`.
-- The `contentType` option will default to `"application/xhtml+xml"` if the given filename ends in `.xhtml` or `.xml`; otherwise it will continue to default to `"text/html"`.
+- The `contentType` option will default to `"application/xhtml+xml"` if the given filename ends in `.xht`, `.xhtml`, or `.xml`; otherwise it will continue to default to `"text/html"`.
 
@@ -435,4 +435,6 @@ ### `fragment()`
 
-This encoding sniffing also applies to `JSDOM.fromFile()` and `JSDOM.fromURL()`. In the latter case, just as in a browser, any `Content-Type` headers sent with the response will take priority.
+If the supplied `contentType` option contains a `charset` parameter, that encoding will override the sniffed encoding—unless a UTF-8 or UTF-16 BOM is present, in which case those take precedence. (Again, this is just like a browser.)
 
+This encoding sniffing also applies to `JSDOM.fromFile()` and `JSDOM.fromURL()`. In the latter case, any `Content-Type` headers sent with the response will take priority, in the same fashion as the constructor's `contentType` option.
+
 Note that in many cases supplying bytes in this fashion can be better than supplying a string. For example, if you attempt to use Node.js's `buffer.toString("utf-8")` API, Node.js will not strip any leading BOMs. If you then give this string to jsdom, it will interpret it verbatim, leaving the BOM intact. But jsdom's binary data decoding code will strip leading BOMs, just like a browser; in such cases, supplying `buffer` directly will give the desired result.
@@ -439,0 +441,0 @@

No alert changes

Improved metrics

Total package byte prevSize

2069776

increased by0.04%

Number of lines in readme file

526

increased by0.38%

Worsened metrics

Lines of code

58575

decreased by-0.01%

No dependency changes