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".

---
 test/node/loader/es_modules_http/app.mjs           |  6 +++++
 test/node/loader/es_modules_http_indirect/app.js   |  1 +
 .../loader/es_modules_http_indirect/module.mjs     |  6 +++++
 test/node/loader/es_modules_websocket/app.mjs      | 30 ++++++++++++++++++++++
 .../loader/es_modules_websocket_indirect/app.js    |  1 +
 .../es_modules_websocket_indirect/module.mjs       | 30 ++++++++++++++++++++++
 test/node/loader/transitive_dependency/app.js      |  1 +
 .../transitive_dependency/transitive_http.js       |  8 ++++++
 test/node/loader/unit_http/app.js                  |  4 +++
 test/node/require_shim/es_modules_http/app.mjs     |  6 -----
 .../require_shim/es_modules_http_indirect/app.js   |  1 -
 .../es_modules_http_indirect/module.mjs            |  6 -----
 .../node/require_shim/es_modules_websocket/app.mjs | 30 ----------------------
 .../es_modules_websocket_indirect/app.js           |  1 -
 .../es_modules_websocket_indirect/module.mjs       | 30 ----------------------
 .../node/require_shim/transitive_dependency/app.js |  1 -
 .../transitive_dependency/transitive_http.js       |  8 ------
 test/node/require_shim/unit_http/app.js            |  4 ---
 18 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 test/node/loader/es_modules_http/app.mjs
 create mode 100644 test/node/loader/es_modules_http_indirect/app.js
 create mode 100644 test/node/loader/es_modules_http_indirect/module.mjs
 create mode 100644 test/node/loader/es_modules_websocket/app.mjs
 create mode 100644 test/node/loader/es_modules_websocket_indirect/app.js
 create mode 100644 test/node/loader/es_modules_websocket_indirect/module.mjs
 create mode 100644 test/node/loader/transitive_dependency/app.js
 create mode 100644 test/node/loader/transitive_dependency/transitive_http.js
 create mode 100644 test/node/loader/unit_http/app.js
 delete mode 100644 test/node/require_shim/es_modules_http/app.mjs
 delete mode 100644 test/node/require_shim/es_modules_http_indirect/app.js
 delete mode 100644 test/node/require_shim/es_modules_http_indirect/module.mjs
 delete mode 100644 test/node/require_shim/es_modules_websocket/app.mjs
 delete mode 100644 test/node/require_shim/es_modules_websocket_indirect/app.js
 delete mode 100644 test/node/require_shim/es_modules_websocket_indirect/module.mjs
 delete mode 100644 test/node/require_shim/transitive_dependency/app.js
 delete mode 100644 test/node/require_shim/transitive_dependency/transitive_http.js
 delete mode 100644 test/node/require_shim/unit_http/app.js

(limited to 'test/node')

diff --git a/test/node/loader/es_modules_http/app.mjs b/test/node/loader/es_modules_http/app.mjs
new file mode 100644
index 00000000..c7bcfe49
--- /dev/null
+++ b/test/node/loader/es_modules_http/app.mjs
@@ -0,0 +1,6 @@
+import http from "http"
+
+http.createServer(function (req, res) {
+    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
+       .end('Hello World\n');
+}).listen(7080);
diff --git a/test/node/loader/es_modules_http_indirect/app.js b/test/node/loader/es_modules_http_indirect/app.js
new file mode 100644
index 00000000..535befba
--- /dev/null
+++ b/test/node/loader/es_modules_http_indirect/app.js
@@ -0,0 +1 @@
+import("./module.mjs")
diff --git a/test/node/loader/es_modules_http_indirect/module.mjs b/test/node/loader/es_modules_http_indirect/module.mjs
new file mode 100644
index 00000000..c7bcfe49
--- /dev/null
+++ b/test/node/loader/es_modules_http_indirect/module.mjs
@@ -0,0 +1,6 @@
+import http from "http"
+
+http.createServer(function (req, res) {
+    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
+       .end('Hello World\n');
+}).listen(7080);
diff --git a/test/node/loader/es_modules_websocket/app.mjs b/test/node/loader/es_modules_websocket/app.mjs
new file mode 100644
index 00000000..a71ffa9d
--- /dev/null
+++ b/test/node/loader/es_modules_websocket/app.mjs
@@ -0,0 +1,30 @@
+import http from "http"
+import websocket from "websocket"
+
+let server = http.createServer(function() {});
+let webSocketServer = websocket.server;
+
+server.listen(7080, function() {});
+
+var wsServer = new webSocketServer({
+    maxReceivedMessageSize: 0x1000000000,
+    maxReceivedFrameSize: 0x1000000000,
+    fragmentOutgoingMessages: false,
+    fragmentationThreshold: 0x1000000000,
+    httpServer: server,
+});
+
+wsServer.on('request', function(request) {
+    var connection = request.accept(null);
+
+    connection.on('message', function(message) {
+        if (message.type === 'utf8') {
+            connection.send(message.utf8Data);
+        } else if (message.type === 'binary') {
+            connection.send(message.binaryData);
+        }
+
+  });
+
+  connection.on('close', function(r) {});
+});
diff --git a/test/node/loader/es_modules_websocket_indirect/app.js b/test/node/loader/es_modules_websocket_indirect/app.js
new file mode 100644
index 00000000..535befba
--- /dev/null
+++ b/test/node/loader/es_modules_websocket_indirect/app.js
@@ -0,0 +1 @@
+import("./module.mjs")
diff --git a/test/node/loader/es_modules_websocket_indirect/module.mjs b/test/node/loader/es_modules_websocket_indirect/module.mjs
new file mode 100644
index 00000000..a71ffa9d
--- /dev/null
+++ b/test/node/loader/es_modules_websocket_indirect/module.mjs
@@ -0,0 +1,30 @@
+import http from "http"
+import websocket from "websocket"
+
+let server = http.createServer(function() {});
+let webSocketServer = websocket.server;
+
+server.listen(7080, function() {});
+
+var wsServer = new webSocketServer({
+    maxReceivedMessageSize: 0x1000000000,
+    maxReceivedFrameSize: 0x1000000000,
+    fragmentOutgoingMessages: false,
+    fragmentationThreshold: 0x1000000000,
+    httpServer: server,
+});
+
+wsServer.on('request', function(request) {
+    var connection = request.accept(null);
+
+    connection.on('message', function(message) {
+        if (message.type === 'utf8') {
+            connection.send(message.utf8Data);
+        } else if (message.type === 'binary') {
+            connection.send(message.binaryData);
+        }
+
+  });
+
+  connection.on('close', function(r) {});
+});
diff --git a/test/node/loader/transitive_dependency/app.js b/test/node/loader/transitive_dependency/app.js
new file mode 100644
index 00000000..aaca5216
--- /dev/null
+++ b/test/node/loader/transitive_dependency/app.js
@@ -0,0 +1 @@
+require("./transitive_http")
diff --git a/test/node/loader/transitive_dependency/transitive_http.js b/test/node/loader/transitive_dependency/transitive_http.js
new file mode 100644
index 00000000..f1eb98e5
--- /dev/null
+++ b/test/node/loader/transitive_dependency/transitive_http.js
@@ -0,0 +1,8 @@
+const http = require("http");
+
+http.createServer(function (req, res) {
+    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
+       .end('Hello World\n');
+}).listen(7080);
+
+module.exports = http;
diff --git a/test/node/loader/unit_http/app.js b/test/node/loader/unit_http/app.js
new file mode 100644
index 00000000..9172e44f
--- /dev/null
+++ b/test/node/loader/unit_http/app.js
@@ -0,0 +1,4 @@
+require("unit-http").createServer(function (req, res) {
+    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
+       .end('Hello World\n');
+}).listen(7080);
diff --git a/test/node/require_shim/es_modules_http/app.mjs b/test/node/require_shim/es_modules_http/app.mjs
deleted file mode 100644
index c7bcfe49..00000000
--- a/test/node/require_shim/es_modules_http/app.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-import http from "http"
-
-http.createServer(function (req, res) {
-    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
-       .end('Hello World\n');
-}).listen(7080);
diff --git a/test/node/require_shim/es_modules_http_indirect/app.js b/test/node/require_shim/es_modules_http_indirect/app.js
deleted file mode 100644
index 535befba..00000000
--- a/test/node/require_shim/es_modules_http_indirect/app.js
+++ /dev/null
@@ -1 +0,0 @@
-import("./module.mjs")
diff --git a/test/node/require_shim/es_modules_http_indirect/module.mjs b/test/node/require_shim/es_modules_http_indirect/module.mjs
deleted file mode 100644
index c7bcfe49..00000000
--- a/test/node/require_shim/es_modules_http_indirect/module.mjs
+++ /dev/null
@@ -1,6 +0,0 @@
-import http from "http"
-
-http.createServer(function (req, res) {
-    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
-       .end('Hello World\n');
-}).listen(7080);
diff --git a/test/node/require_shim/es_modules_websocket/app.mjs b/test/node/require_shim/es_modules_websocket/app.mjs
deleted file mode 100644
index a71ffa9d..00000000
--- a/test/node/require_shim/es_modules_websocket/app.mjs
+++ /dev/null
@@ -1,30 +0,0 @@
-import http from "http"
-import websocket from "websocket"
-
-let server = http.createServer(function() {});
-let webSocketServer = websocket.server;
-
-server.listen(7080, function() {});
-
-var wsServer = new webSocketServer({
-    maxReceivedMessageSize: 0x1000000000,
-    maxReceivedFrameSize: 0x1000000000,
-    fragmentOutgoingMessages: false,
-    fragmentationThreshold: 0x1000000000,
-    httpServer: server,
-});
-
-wsServer.on('request', function(request) {
-    var connection = request.accept(null);
-
-    connection.on('message', function(message) {
-        if (message.type === 'utf8') {
-            connection.send(message.utf8Data);
-        } else if (message.type === 'binary') {
-            connection.send(message.binaryData);
-        }
-
-  });
-
-  connection.on('close', function(r) {});
-});
diff --git a/test/node/require_shim/es_modules_websocket_indirect/app.js b/test/node/require_shim/es_modules_websocket_indirect/app.js
deleted file mode 100644
index 535befba..00000000
--- a/test/node/require_shim/es_modules_websocket_indirect/app.js
+++ /dev/null
@@ -1 +0,0 @@
-import("./module.mjs")
diff --git a/test/node/require_shim/es_modules_websocket_indirect/module.mjs b/test/node/require_shim/es_modules_websocket_indirect/module.mjs
deleted file mode 100644
index a71ffa9d..00000000
--- a/test/node/require_shim/es_modules_websocket_indirect/module.mjs
+++ /dev/null
@@ -1,30 +0,0 @@
-import http from "http"
-import websocket from "websocket"
-
-let server = http.createServer(function() {});
-let webSocketServer = websocket.server;
-
-server.listen(7080, function() {});
-
-var wsServer = new webSocketServer({
-    maxReceivedMessageSize: 0x1000000000,
-    maxReceivedFrameSize: 0x1000000000,
-    fragmentOutgoingMessages: false,
-    fragmentationThreshold: 0x1000000000,
-    httpServer: server,
-});
-
-wsServer.on('request', function(request) {
-    var connection = request.accept(null);
-
-    connection.on('message', function(message) {
-        if (message.type === 'utf8') {
-            connection.send(message.utf8Data);
-        } else if (message.type === 'binary') {
-            connection.send(message.binaryData);
-        }
-
-  });
-
-  connection.on('close', function(r) {});
-});
diff --git a/test/node/require_shim/transitive_dependency/app.js b/test/node/require_shim/transitive_dependency/app.js
deleted file mode 100644
index aaca5216..00000000
--- a/test/node/require_shim/transitive_dependency/app.js
+++ /dev/null
@@ -1 +0,0 @@
-require("./transitive_http")
diff --git a/test/node/require_shim/transitive_dependency/transitive_http.js b/test/node/require_shim/transitive_dependency/transitive_http.js
deleted file mode 100644
index f1eb98e5..00000000
--- a/test/node/require_shim/transitive_dependency/transitive_http.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const http = require("http");
-
-http.createServer(function (req, res) {
-    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
-       .end('Hello World\n');
-}).listen(7080);
-
-module.exports = http;
diff --git a/test/node/require_shim/unit_http/app.js b/test/node/require_shim/unit_http/app.js
deleted file mode 100644
index 9172e44f..00000000
--- a/test/node/require_shim/unit_http/app.js
+++ /dev/null
@@ -1,4 +0,0 @@
-require("unit-http").createServer(function (req, res) {
-    res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
-       .end('Hello World\n');
-}).listen(7080);
-- 
cgit