Merge pull request #108 from willofindie/fix/issue-107

fix: remote (@import) fetch redirects
willofindie · Jul 2, 2023 · 1d583c6 · 1d583c6
2 parents 93c6879 + 73d50f0
commit 1d583c6
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 7 deletions.
diff --git a/@types/follow-redirects.d.ts b/@types/follow-redirects.d.ts
@@ -0,0 +1,6 @@
+declare module "follow-redirects" {
+  const http: typeof import("http");
+  const https: typeof import("https");
+
+  export { http, https };
+}
diff --git a/examples/css-imports/.vscode/settings.json b/examples/css-imports/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
   "cssvar.files": [
     "*.css",
-    "https://unpkg.com/[email protected]/violet.min.css"
+    "https://unpkg.com/[email protected]/violet.min.css",
+    "https://unpkg.com/[email protected]"
   ]
 }
diff --git a/examples/css-imports/index.css b/examples/css-imports/index.css
@@ -21,6 +21,7 @@
 /* @import 'pollen-css/pollen.css'; */
 
 @import url(https://unpkg.com/[email protected]/pollen.css);
+@import "https://unpkg.com/pollen-css";
 
 body {
   color: var(--red-2);

diff --git a/examples/with-plugins/src/testing.js b/examples/with-plugins/src/testing.js
diff --git a/package.json b/package.json
@@ -462,6 +462,7 @@
 	"dependencies": {
 		"culori": "^2.0.3",
 		"fast-glob": "^3.2.12",
+		"follow-redirects": "^1.15.2",
 		"postcss": "^8.4.12",
 		"postcss-less": "^6.0.0"
 	},

diff --git a/src/remote-paths.ts b/src/remote-paths.ts
@@ -1,7 +1,7 @@
 import { createWriteStream, existsSync, mkdirSync, unlink } from "fs";
 import { Readable } from "stream";
-import { get, IncomingMessage } from "http";
-import { get as sGet } from "https";
+import { http, https } from "follow-redirects";
+import { IncomingMessage } from "http";
 import { URL } from "url";
 import {
   createUnzip,
@@ -22,8 +22,10 @@ const CSSGetError = class extends Error {
     super(overrideMsg || response.statusMessage || "CSSGetError: ");
 
     this.name = "CSSGetError";
-    this.message = overrideMsg || response.statusMessage || "";
-    this.code = response.statusCode || 200;
+    this.code = response.statusCode ?? 200;
+    this.message =
+      `Response Status Code: ${this.code}, Message: ` +
+      (overrideMsg ?? response.statusMessage ?? "");
   }
 };
 
@@ -38,10 +40,10 @@ const CSSGetError = class extends Error {
 export const fetchAndCacheAsset = (url: string) =>
   new Promise<void>((res, rej) => {
     const _url = new URL(url);
-    let httpGet = sGet;
+    let httpGet = https.get;
 
     if (_url.protocol === "http:") {
-      httpGet = get;
+      httpGet = http.get;
     }
 
     httpGet(

diff --git a/yarn.lock b/yarn.lock
@@ -2755,6 +2755,11 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
+follow-redirects@^1.15.2:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"