fetch-css 3.1.12 → 4.0.1

package/README.md

@@ -8,7 +8,7 @@
 npm i fetch-css
 ```
 ```js
-const fetchCss = require("fetch-css");
+import fetchCss from "fetch-css";
 
 // retrieve CSS of a website
 const [{css}] = await fetchCss([{url: "https://example.com"}]);

package/crx-to-zip.js

@@ -1,9 +1,9 @@
 // based on https://github.com/Rob--W/crxviewer/blob/master/src/lib/crx-to-zip.js
 // (c) 2013 Rob Wu <rob@robwu.nl>
-"use strict";
 
-const encLatin1 = require("crypto-js/enc-latin1");
-const sha256 = require("crypto-js/sha256");
+import encLatin1 from "crypto-js/enc-latin1";
+import sha256 from "crypto-js/sha256";
+
 const btoa = require("base-64").encode;
 
 function calcLength(a, b, c, d) {
@@ -23,7 +23,7 @@ function getBinaryString(bytesView, startOffset, endOffset) {
 }
 
 // Strips CRX headers from zip
-module.exports = function CRXtoZIP(arraybuffer) {
+export default function CRXtoZIP(arraybuffer) {
   // Definition of crx format: http://developer.chrome.com/extensions/crx.html
   const view = new Uint8Array(arraybuffer);
 
@@ -66,7 +66,7 @@ module.exports = function CRXtoZIP(arraybuffer) {
   }
 
   return arraybuffer.slice(zipStartOffset);
-};
+}
 
 function getPublicKeyFromProtoBuf(bytesView, startOffset, endOffset) {
   // Protobuf definition: https://cs.chromium.org/chromium/src/components/crx_file/crx3.proto

package/index.js

@@ -1,14 +1,15 @@
-"use strict";
-
-const acorn = require("acorn");
-const clone = require("rfdc")();
-const postcss = require("postcss");
-const fetch = require("fetch-enhanced")(require("node-fetch"));
-const parse5 = require("parse5");
-const unzipper = require("unzipper");
-const urlToolkit = require("url-toolkit");
-const {name} = require("./package.json");
-const crxToZip = require("./crx-to-zip");
+import acorn from "acorn";
+import cloner from "rfdc";
+import postcss from "postcss";
+import {parseFragment} from "parse5";
+import unzipper from "unzipper";
+import urlToolkit from "url-toolkit";
+import crxToZip from "./crx-to-zip.js";
+import nodeFetch from "node-fetch";
+import fetchEnhanced from "fetch-enhanced";
+
+const fetch = fetchEnhanced(nodeFetch);
+const clone = cloner();
 
 async function extract(res) {
   const styleUrls = [];
@@ -31,24 +32,25 @@ function validateStatus(res, url, strict) {
   if (strict) {
     throw new Error(msg);
   } else {
-    console.warn(`(${name}) Warning: ${msg}`);
+    console.warn(`(fetch-css) Warning: ${msg}`);
   }
 }
 
 function extractStyleHrefs(html) {
   return (html.match(/<link.+?>/g) || []).map(link => {
     const attrs = {};
-    for (const attr of parse5.parseFragment(link).childNodes[0].attrs) {
+    for (const attr of parseFragment(link).childNodes[0].attrs) {
       attrs[attr.name] = attr.value;
     }
     if (attrs.href && attrs.rel === "stylesheet") return attrs.href;
     if (attrs.href && /\.css$/i.test(attrs.href.replace(/\?.+/))) return attrs.href;
-  }).filter(link => !!link);
+    return null;
+  }).filter(Boolean);
 }
 
 function extractStyleTags(html) {
   const matches = Array.from((html || "").matchAll(/<style.*?>([\s\S]*?)<\/style>/g) || []);
-  return matches.map(match => match[1]).map(css => css.trim()).filter(css => !!css);
+  return matches.map(match => match[1]).map(css => css.trim()).filter(Boolean);
 }
 
 function isValidCSS(string) {
@@ -147,7 +149,7 @@ async function extensionCss({crx, contentScriptsOnly, strict}) {
   return css;
 }
 
-module.exports = async function fetchCss(sources) {
+export default async function fetchCss(sources) { // eslint-disable-line import/no-unused-modules
   sources = clone(sources);
 
   const expandedSources = [];
@@ -203,4 +205,4 @@ module.exports = async function fetchCss(sources) {
   }
 
   return sources;
-};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetch-css",
-  "version": "3.1.12",
+  "version": "4.0.1",
   "description": "Extract CSS from websites and browser extensions",
   "author": "silverwind",
   "repository": "silverwind/fetch-css",
@@ -20,21 +20,21 @@
     "crx-to-zip.js"
   ],
   "dependencies": {
-    "acorn": "8.2.4",
+    "acorn": "8.8.1",
     "base-64": "1.0.0",
-    "crypto-js": "4.0.0",
-    "fetch-enhanced": "6.0.0",
-    "node-fetch": "2.6.1",
-    "parse5": "6.0.1",
-    "postcss": "8.2.15",
+    "crypto-js": "4.1.1",
+    "fetch-enhanced": "10.1.0",
+    "node-fetch": "3.3.0",
+    "parse5": "7.1.1",
+    "postcss": "8.4.19",
     "rfdc": "1.3.0",
     "unzipper": "0.10.11",
-    "url-toolkit": "2.2.2"
+    "url-toolkit": "2.2.5"
   },
   "devDependencies": {
-    "eslint": "7.26.0",
-    "eslint-config-silverwind": "33.0.0",
-    "updates": "12.1.0",
-    "versions": "8.4.7"
+    "eslint": "8.28.0",
+    "eslint-config-silverwind": "62.0.1",
+    "updates": "13.2.1",
+    "versions": "10.2.4"
   }
 }