From c160ea11e4ece4db52731ac8b83dd09ca2d1ef11 Mon Sep 17 00:00:00 2001
From: Oisin Canty <o.canty@f5.com>
Date: Mon, 24 May 2021 09:01:42 +0000
Subject: Node.js: renamed "require_shim" to "loader".

---
 src/nodejs/unit-http/loader.js        | 27 +++++++++++++++++++++++++++
 src/nodejs/unit-http/loader.mjs       | 18 ++++++++++++++++++
 src/nodejs/unit-http/require_shim.js  | 27 ---------------------------
 src/nodejs/unit-http/require_shim.mjs | 18 ------------------
 4 files changed, 45 insertions(+), 45 deletions(-)
 create mode 100644 src/nodejs/unit-http/loader.js
 create mode 100644 src/nodejs/unit-http/loader.mjs
 delete mode 100644 src/nodejs/unit-http/require_shim.js
 delete mode 100644 src/nodejs/unit-http/require_shim.mjs

(limited to 'src')

diff --git a/src/nodejs/unit-http/loader.js b/src/nodejs/unit-http/loader.js
new file mode 100644
index 00000000..e5aa3558
--- /dev/null
+++ b/src/nodejs/unit-http/loader.js
@@ -0,0 +1,27 @@
+// can only be ran as part of a --require param on the node process
+if (module.parent && module.parent.id === "internal/preload") {
+    const { Module } = require("module")
+
+    if (!Module.prototype.require.__unit_loader) {
+        const http = require("./http")
+        const websocket = require("./websocket")
+
+        const original = Module.prototype.require;
+
+        Module.prototype.require = function (id) {
+            switch(id) {
+                case "http":
+                case "unit-http":
+                    return http
+
+                case "websocket":
+                case "unit-http/websocket":
+                    return websocket
+            }
+
+            return original.apply(this, arguments);
+        }
+
+        Module.prototype.require.__unit_loader = true;
+    }
+}
diff --git a/src/nodejs/unit-http/loader.mjs b/src/nodejs/unit-http/loader.mjs
new file mode 100644
index 00000000..067d63d4
--- /dev/null
+++ b/src/nodejs/unit-http/loader.mjs
@@ -0,0 +1,18 @@
+// must be ran as part of a --loader or --experimental-loader param
+export async function resolve(specifier, context, defaultResolver) {
+    switch (specifier) {
+        case "websocket":
+            return {
+                url: new URL("./websocket.js", import.meta.url).href,
+                format: "cjs"
+            }
+
+        case "http":
+            return {
+                url: new URL("./http.js", import.meta.url).href,
+                format: "cjs"
+            }
+    }
+
+    return defaultResolver(specifier, context, defaultResolver)
+}
diff --git a/src/nodejs/unit-http/require_shim.js b/src/nodejs/unit-http/require_shim.js
deleted file mode 100644
index 2b307629..00000000
--- a/src/nodejs/unit-http/require_shim.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// can only be ran as part of a --require param on the node process
-if (module.parent && module.parent.id === "internal/preload") {
-    const { Module } = require("module")
-
-    if (!Module.prototype.require.__unit_shim) {
-        const http = require("./http")
-        const websocket = require("./websocket")
-
-        const original = Module.prototype.require;
-
-        Module.prototype.require = function (id) {
-            switch(id) {
-                case "http":
-                case "unit-http":
-                    return http
-
-                case "websocket":
-                case "unit-http/websocket":
-                    return websocket
-            }
-
-            return original.apply(this, arguments);
-        }
-
-        Module.prototype.require.__unit_shim = true;
-    }
-}
diff --git a/src/nodejs/unit-http/require_shim.mjs b/src/nodejs/unit-http/require_shim.mjs
deleted file mode 100644
index 067d63d4..00000000
--- a/src/nodejs/unit-http/require_shim.mjs
+++ /dev/null
@@ -1,18 +0,0 @@
-// must be ran as part of a --loader or --experimental-loader param
-export async function resolve(specifier, context, defaultResolver) {
-    switch (specifier) {
-        case "websocket":
-            return {
-                url: new URL("./websocket.js", import.meta.url).href,
-                format: "cjs"
-            }
-
-        case "http":
-            return {
-                url: new URL("./http.js", import.meta.url).href,
-                format: "cjs"
-            }
-    }
-
-    return defaultResolver(specifier, context, defaultResolver)
-}
-- 
cgit