Remove outdated Node <18 checks

node-red · Feb 19, 2024 · 30c936d · 30c936d
1 parent bac71ee
commit 30c936d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/packages/node_modules/@node-red/registry/lib/externalModules.js b/packages/node_modules/@node-red/registry/lib/externalModules.js
@@ -28,11 +28,6 @@ let installEnabled = true;
 let installAllowList = ['*'];
 let installDenyList = [];
 
-let IMPORT_SUPPORTED = true;
-const nodeVersionParts = process.versions.node.split(".").map(v => parseInt(v));
-if (nodeVersionParts[0] < 12 || (nodeVersionParts[0] === 12 && nodeVersionParts[1] < 17)) {
-    IMPORT_SUPPORTED = false;
-}
 
 function getInstallDir() {
     return path.resolve(settings.userDir || process.env.NODE_RED_HOME || ".");
@@ -110,18 +105,6 @@ function requireModule(module) {
     return require(moduleDir);
 }
 function importModule(module) {
-    if (!IMPORT_SUPPORTED) {
-        // On Node < 12.17 - fall back to try a require
-        return new Promise((resolve, reject) => {
-            try {
-                const mod = requireModule(module);
-                resolve(mod);
-            } catch(err) {
-                reject(err);
-            }
-        });
-    }
-
     if (!registryUtil.checkModuleAllowed( module, null,installAllowList,installDenyList)) {
         const e = new Error("Module not allowed");
         e.code = "module_not_allowed";

diff --git a/packages/node_modules/node-red/lib/red.js b/packages/node_modules/node-red/lib/red.js
@@ -25,11 +25,8 @@ var api = require("@node-red/editor-api");
 var server = null;
 var apiEnabled = false;
 
-const NODE_MAJOR_VERSION = process.versions.node.split('.')[0];
-if (NODE_MAJOR_VERSION >= 16) {
-    const dns = require('dns');
-    dns.setDefaultResultOrder('ipv4first');
-}
+const dns = require('dns');
+dns.setDefaultResultOrder('ipv4first');
 
 function checkVersion(userSettings) {
     var semver = require('semver');

diff --git a/test/nodes/core/network/21-httprequest_spec.js b/test/nodes/core/network/21-httprequest_spec.js
@@ -2476,9 +2476,7 @@ describe('HTTP Request Node', function() {
 
         const versions = process.versions.node.split('.')
 
-        if (( versions[0] == 14 && versions[1] >= 20 ) ||
-            ( versions[0] == 16 && versions[1] >= 16 ) ||
-            ( versions[0] == 18 && versions[1] >= 5 ) ||
+        if (( versions[0] == 18 && versions[1] >= 5 ) ||
             ( versions[0] > 18)) {
             // only test if on new enough NodeJS version