fetch-css 4.0.8 → 4.0.10

package/index.js

@@ -5,10 +5,10 @@ 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 {fetch as undiciFetch} from "undici";
 import fetchEnhanced from "fetch-enhanced";
 
-const fetch = fetchEnhanced(nodeFetch, {undici: false});
+const fetch = fetchEnhanced(undiciFetch, {undici: true});
 const clone = cloner();
 
 async function extract(res) {
@@ -63,6 +63,15 @@ function isValidCSS(string) {
   return false;
 }
 
+function arrayBufferToBufferCycle(ab) {
+  const buffer = new Buffer(ab.byteLength);
+  const view = new Uint8Array(ab);
+  for (let i = 0; i < buffer.length; ++i) {
+    buffer[i] = view[i];
+  }
+  return buffer;
+}
+
 function extractCssFromJs(js) {
   let css = "";
 
@@ -71,7 +80,7 @@ function extractCssFromJs(js) {
     onToken: token => {
       if (token.type.label === "string") {
         const str = token.value.trim()
-          .replace(/\n/gm, "")
+          .replace(/\n/g, "")
           .replace(/^\);}/, ""); // this is probably not universal to webpack's css-in-js strings
 
         if (str.length > 25 && isValidCSS(str)) { // hackish treshold to ignore short strings that may be valid CSS,
@@ -100,7 +109,7 @@ async function extensionCss({crx, contentScriptsOnly, strict}) {
   const res = await fetch(url);
   validateStatus(res, url, strict);
 
-  const crxBuffer = await res.buffer();
+  const crxBuffer = arrayBufferToBufferCycle(await res.arrayBuffer());
   const zipBuffer = Buffer.from(crxToZip(crxBuffer));
 
   const files = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetch-css",
-  "version": "4.0.8",
+  "version": "4.0.10",
   "description": "Extract CSS from websites and browser extensions",
   "author": "silverwind",
   "repository": "silverwind/fetch-css",
@@ -22,20 +22,20 @@
     "crx-to-zip.js"
   ],
   "dependencies": {
-    "acorn": "8.8.1",
+    "acorn": "8.8.2",
     "crypto-js": "4.1.1",
-    "fetch-enhanced": "11.1.0",
-    "node-fetch": "3.3.0",
+    "fetch-enhanced": "11.1.1",
     "parse5": "7.1.2",
-    "postcss": "8.4.20",
+    "postcss": "8.4.23",
     "rfdc": "1.3.0",
+    "undici": "5.22.0",
     "unzipper": "0.10.11",
     "url-toolkit": "2.2.5"
   },
   "devDependencies": {
-    "eslint": "8.30.0",
-    "eslint-config-silverwind": "65.0.0",
-    "updates": "13.2.6",
-    "versions": "10.4.1"
+    "eslint": "8.40.0",
+    "eslint-config-silverwind": "69.0.2",
+    "updates": "14.1.0",
+    "versions": "11.0.0"
   }
 }