fix: remove http dep to fix app dir support (#768)

supertokens · Dec 18, 2023 · 564e273 · 564e273
1 parent a7f94b1
commit 564e273
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 55 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [16.6.8] - 2023-12-18
+
+-   Fix App dir support by removing the import of the "http" module
+
 ## [16.6.7] - 2023-12-18
 
 -   Adds facebook user data by checking the scopes provided in the config

diff --git a/lib/build/framework/custom/nodeHeaders.js b/lib/build/framework/custom/nodeHeaders.js
@@ -1,10 +1,5 @@
 "use strict";
 // @ts-nocheck This is basically plain JS from another lib
-var __importDefault =
-    (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: mod };
-    };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromRawHeaders = void 0;
 /* From https://github.com/lquixada/node-fetch/blob/master/src/headers.js */
@@ -21,27 +16,20 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 */
 const util_1 = require("util");
-const http_1 = __importDefault(require("http"));
-const validateHeaderName =
-    typeof http_1.default.validateHeaderName === "function"
-        ? http_1.default.validateHeaderName
-        : (name) => {
-              if (!/^[\^`\-\w!#$%&'*+.|~]+$/.test(name)) {
-                  const err = new TypeError(`Header name must be a valid HTTP token [${name}]`);
-                  Object.defineProperty(err, "code", { value: "ERR_INVALID_HTTP_TOKEN" });
-                  throw err;
-              }
-          };
-const validateHeaderValue =
-    typeof http_1.default.validateHeaderValue === "function"
-        ? http_1.default.validateHeaderValue
-        : (name, value) => {
-              if (/[^\t\u0020-\u007E\u0080-\u00FF]/.test(value)) {
-                  const err = new TypeError(`Invalid character in header content ["${name}"]`);
-                  Object.defineProperty(err, "code", { value: "ERR_INVALID_CHAR" });
-                  throw err;
-              }
-          };
+const validateHeaderName = (name) => {
+    if (!/^[\^`\-\w!#$%&'*+.|~]+$/.test(name)) {
+        const err = new TypeError(`Header name must be a valid HTTP token [${name}]`);
+        Object.defineProperty(err, "code", { value: "ERR_INVALID_HTTP_TOKEN" });
+        throw err;
+    }
+};
+const validateHeaderValue = (name, value) => {
+    if (/[^\t\u0020-\u007E\u0080-\u00FF]/.test(value)) {
+        const err = new TypeError(`Invalid character in header content ["${name}"]`);
+        Object.defineProperty(err, "code", { value: "ERR_INVALID_CHAR" });
+        throw err;
+    }
+};
 /**
  * @typedef {Headers | Record<string, string> | Iterable<readonly [string, string]> | Iterable<Iterable<string>>} HeadersInit
  */

diff --git a/lib/build/version.d.ts b/lib/build/version.d.ts
diff --git a/lib/build/version.js b/lib/build/version.js
diff --git a/lib/ts/framework/custom/nodeHeaders.ts b/lib/ts/framework/custom/nodeHeaders.ts
@@ -16,29 +16,22 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 */
 
 import { types } from "util";
-import http from "http";
-
-const validateHeaderName =
-    typeof http.validateHeaderName === "function"
-        ? http.validateHeaderName
-        : (name) => {
-              if (!/^[\^`\-\w!#$%&'*+.|~]+$/.test(name)) {
-                  const err = new TypeError(`Header name must be a valid HTTP token [${name}]`);
-                  Object.defineProperty(err, "code", { value: "ERR_INVALID_HTTP_TOKEN" });
-                  throw err;
-              }
-          };
-
-const validateHeaderValue =
-    typeof http.validateHeaderValue === "function"
-        ? http.validateHeaderValue
-        : (name, value) => {
-              if (/[^\t\u0020-\u007E\u0080-\u00FF]/.test(value)) {
-                  const err = new TypeError(`Invalid character in header content ["${name}"]`);
-                  Object.defineProperty(err, "code", { value: "ERR_INVALID_CHAR" });
-                  throw err;
-              }
-          };
+
+const validateHeaderName = (name) => {
+    if (!/^[\^`\-\w!#$%&'*+.|~]+$/.test(name)) {
+        const err = new TypeError(`Header name must be a valid HTTP token [${name}]`);
+        Object.defineProperty(err, "code", { value: "ERR_INVALID_HTTP_TOKEN" });
+        throw err;
+    }
+};
+
+const validateHeaderValue = (name, value) => {
+    if (/[^\t\u0020-\u007E\u0080-\u00FF]/.test(value)) {
+        const err = new TypeError(`Invalid character in header content ["${name}"]`);
+        Object.defineProperty(err, "code", { value: "ERR_INVALID_CHAR" });
+        throw err;
+    }
+};
 
 /**
  * @typedef {Headers | Record<string, string> | Iterable<readonly [string, string]> | Iterable<Iterable<string>>} HeadersInit

diff --git a/lib/ts/version.ts b/lib/ts/version.ts
@@ -12,7 +12,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-export const version = "16.6.7";
+export const version = "16.6.8";
 
 export const cdiSupported = ["4.0"];
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "supertokens-node",
-    "version": "16.6.7",
+    "version": "16.6.8",
     "description": "NodeJS driver for SuperTokens core",
     "main": "index.js",
     "scripts": {