From b560882aa2ce1b280ce3034a2c51bfb46fd21032 Mon Sep 17 00:00:00 2001 From: Bear Date: Tue, 2 Jun 2026 21:06:42 -0500 Subject: [PATCH 1/3] Add Node.js version 26.3.0 with configuration and launch scripts --- bin/archived/nodejs20.19.5/etc/npmrc | 4 --- bin/archived/nodejs20.19.5/etc/npmrc.ber | 4 --- bin/archived/nodejs20.19.5/launch.bat | 12 ------- bin/archived/nodejs22.21.1/bearsampp.conf | 8 ----- bin/archived/nodejs22.21.1/etc/npmrc | 4 --- bin/archived/nodejs22.21.1/etc/npmrc.ber | 4 --- .../bearsampp.conf | 2 +- bin/nodejs26.3.0/etc/npmrc | 4 +++ bin/nodejs26.3.0/etc/npmrc.ber | 4 +++ .../nodejs22.21.1 => nodejs26.3.0}/launch.bat | 0 bin/nodejs26.3.0/node_modules/npm/npmrc | 1 + bin/nodejs26.3.0/node_modules/npm/npmrc.ber | 1 + build.gradle | 35 ++++++++++++++----- build.properties | 2 +- 14 files changed, 38 insertions(+), 47 deletions(-) delete mode 100644 bin/archived/nodejs20.19.5/etc/npmrc delete mode 100644 bin/archived/nodejs20.19.5/etc/npmrc.ber delete mode 100644 bin/archived/nodejs20.19.5/launch.bat delete mode 100644 bin/archived/nodejs22.21.1/bearsampp.conf delete mode 100644 bin/archived/nodejs22.21.1/etc/npmrc delete mode 100644 bin/archived/nodejs22.21.1/etc/npmrc.ber rename bin/{archived/nodejs20.19.5 => nodejs26.3.0}/bearsampp.conf (87%) create mode 100644 bin/nodejs26.3.0/etc/npmrc create mode 100644 bin/nodejs26.3.0/etc/npmrc.ber rename bin/{archived/nodejs22.21.1 => nodejs26.3.0}/launch.bat (100%) create mode 100644 bin/nodejs26.3.0/node_modules/npm/npmrc create mode 100644 bin/nodejs26.3.0/node_modules/npm/npmrc.ber diff --git a/bin/archived/nodejs20.19.5/etc/npmrc b/bin/archived/nodejs20.19.5/etc/npmrc deleted file mode 100644 index b6dae4d1..00000000 --- a/bin/archived/nodejs20.19.5/etc/npmrc +++ /dev/null @@ -1,4 +0,0 @@ -cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache -globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc -init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\.npm-init.js -userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc diff --git a/bin/archived/nodejs20.19.5/etc/npmrc.ber b/bin/archived/nodejs20.19.5/etc/npmrc.ber deleted file mode 100644 index b6dae4d1..00000000 --- a/bin/archived/nodejs20.19.5/etc/npmrc.ber +++ /dev/null @@ -1,4 +0,0 @@ -cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache -globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc -init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\.npm-init.js -userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc diff --git a/bin/archived/nodejs20.19.5/launch.bat b/bin/archived/nodejs20.19.5/launch.bat deleted file mode 100644 index c4158e79..00000000 --- a/bin/archived/nodejs20.19.5/launch.bat +++ /dev/null @@ -1,12 +0,0 @@ -@ECHO OFF -SETLOCAL EnableDelayedExpansion - -SET BEARSAMPP_NODEJS_PATH=%~dp0 -SET BEARSAMPP_NODEJS_PATH=!BEARSAMPP_NODEJS_PATH:~0,-1! -SET BEARSAMPP_NODEJS_NPM_PATH=%BEARSAMPP_NODEJS_PATH%\node_modules\npm -SET BEARSAMPP_NODEJS_CONFIG_PATH=%BEARSAMPP_NODEJS_NPM_PATH%\npmrc -(ECHO prefix = %BEARSAMPP_NODEJS_PATH%) > "%BEARSAMPP_NODEJS_CONFIG_PATH%" - -"%BEARSAMPP_NODEJS_PATH%\nodevars.bat" & "%BEARSAMPP_NODEJS_PATH%\npm" config set globalconfig "%BEARSAMPP_NODEJS_CONFIG_PATH%" --global - -ENDLOCAL diff --git a/bin/archived/nodejs22.21.1/bearsampp.conf b/bin/archived/nodejs22.21.1/bearsampp.conf deleted file mode 100644 index 0db4c491..00000000 --- a/bin/archived/nodejs22.21.1/bearsampp.conf +++ /dev/null @@ -1,8 +0,0 @@ -nodejsVersion = "22.21.1" -nodejsExe = "node.exe" -nodejsVars = "nodevars.bat" -nodejsNpm = "npm.cmd" -nodejsLaunch = "launch.bat" -nodejsConf = "node_modules/npm/npmrc" - -bundleRelease = "@RELEASE_VERSION@" diff --git a/bin/archived/nodejs22.21.1/etc/npmrc b/bin/archived/nodejs22.21.1/etc/npmrc deleted file mode 100644 index e6a49196..00000000 --- a/bin/archived/nodejs22.21.1/etc/npmrc +++ /dev/null @@ -1,4 +0,0 @@ -cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache -globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc -init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\.npm-init.js -userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc diff --git a/bin/archived/nodejs22.21.1/etc/npmrc.ber b/bin/archived/nodejs22.21.1/etc/npmrc.ber deleted file mode 100644 index e6a49196..00000000 --- a/bin/archived/nodejs22.21.1/etc/npmrc.ber +++ /dev/null @@ -1,4 +0,0 @@ -cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache -globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc -init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\.npm-init.js -userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc diff --git a/bin/archived/nodejs20.19.5/bearsampp.conf b/bin/nodejs26.3.0/bearsampp.conf similarity index 87% rename from bin/archived/nodejs20.19.5/bearsampp.conf rename to bin/nodejs26.3.0/bearsampp.conf index c0b9918e..2afed0cb 100644 --- a/bin/archived/nodejs20.19.5/bearsampp.conf +++ b/bin/nodejs26.3.0/bearsampp.conf @@ -1,4 +1,4 @@ -nodejsVersion = "20.19.5" +nodejsVersion = "26.3.0" nodejsExe = "node.exe" nodejsVars = "nodevars.bat" nodejsNpm = "npm.cmd" diff --git a/bin/nodejs26.3.0/etc/npmrc b/bin/nodejs26.3.0/etc/npmrc new file mode 100644 index 00000000..1cd518fa --- /dev/null +++ b/bin/nodejs26.3.0/etc/npmrc @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\npmrc diff --git a/bin/nodejs26.3.0/etc/npmrc.ber b/bin/nodejs26.3.0/etc/npmrc.ber new file mode 100644 index 00000000..1cd518fa --- /dev/null +++ b/bin/nodejs26.3.0/etc/npmrc.ber @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\etc\npmrc diff --git a/bin/archived/nodejs22.21.1/launch.bat b/bin/nodejs26.3.0/launch.bat similarity index 100% rename from bin/archived/nodejs22.21.1/launch.bat rename to bin/nodejs26.3.0/launch.bat diff --git a/bin/nodejs26.3.0/node_modules/npm/npmrc b/bin/nodejs26.3.0/node_modules/npm/npmrc new file mode 100644 index 00000000..b7c95e55 --- /dev/null +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc @@ -0,0 +1 @@ +prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs25.9.0\ diff --git a/bin/nodejs26.3.0/node_modules/npm/npmrc.ber b/bin/nodejs26.3.0/node_modules/npm/npmrc.ber new file mode 100644 index 00000000..b7c95e55 --- /dev/null +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc.ber @@ -0,0 +1 @@ +prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs25.9.0\ diff --git a/build.gradle b/build.gradle index a9b92e0e..644087c9 100644 --- a/build.gradle +++ b/build.gradle @@ -664,7 +664,21 @@ def getAvailableVersions() { versions.addAll(archivedVersions) } - return versions.unique().sort() + // Remove duplicates and sort semantically + return versions.unique().sort { a, b -> + def aParts = a.tokenize('.').collect { it.isInteger() ? it.toInteger() : it } + def bParts = b.tokenize('.').collect { it.isInteger() ? it.toInteger() : it } + for (int i = 0; i < Math.max(aParts.size(), bParts.size()); i++) { + def aVal = i < aParts.size() ? aParts[i] : 0 + def bVal = i < bParts.size() ? bParts[i] : 0 + if (aVal.getClass() != bVal.getClass()) { + aVal = aVal.toString() + bVal = bVal.toString() + } + if (aVal != bVal) return aVal <=> bVal + } + return 0 + } } // Build all available versions (prep only) @@ -892,16 +906,19 @@ tasks.register('checkModulesUntouched') { println "=".multiply(70) println "Available Versions in modules-untouched" println "=".multiply(70) - def sortedVersions = untouchedProps.sort { a, b -> - def aParts = a.key.tokenize('.') - def bParts = b.key.tokenize('.') - for (int i = 0; i < Math.min(aParts.size(), bParts.size()); i++) { - def aNum = aParts[i].toInteger() - def bNum = bParts[i].toInteger() - if (aNum != bNum) return aNum <=> bNum + def aParts = a.key.tokenize('.').collect { it.isInteger() ? it.toInteger() : it } + def bParts = b.key.tokenize('.').collect { it.isInteger() ? it.toInteger() : it } + for (int i = 0; i < Math.max(aParts.size(), bParts.size()); i++) { + def aVal = i < aParts.size() ? aParts[i] : 0 + def bVal = i < bParts.size() ? bParts[i] : 0 + if (aVal.getClass() != bVal.getClass()) { + aVal = aVal.toString() + bVal = bVal.toString() + } + if (aVal != bVal) return aVal <=> bVal } - return aParts.size() <=> bParts.size() + return 0 } sortedVersions.each { version, url -> println " ${version.padRight(10)}" } diff --git a/build.properties b/build.properties index 22dd6207..48932f7a 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ bundle.name = nodejs -bundle.release = 2026.4.12 +bundle.release = 2026.6.2 bundle.type = bins bundle.format = 7z From c449d1a330862eabd59519718baa6ae4407d5db2 Mon Sep 17 00:00:00 2001 From: Bear Date: Tue, 2 Jun 2026 21:07:38 -0500 Subject: [PATCH 2/3] Add archived Node.js versions 20.19.5 and 22.21.1 with configuration and launch scripts --- bin/archived/nodejs20.19.5/etc/npmrc | 4 ++++ bin/archived/nodejs20.19.5/etc/npmrc.ber | 4 ++++ bin/archived/nodejs20.19.5/launch.bat | 12 ++++++++++++ bin/archived/nodejs22.21.1/bearsampp.conf | 8 ++++++++ bin/archived/nodejs22.21.1/etc/npmrc | 4 ++++ bin/archived/nodejs22.21.1/etc/npmrc.ber | 4 ++++ 6 files changed, 36 insertions(+) create mode 100644 bin/archived/nodejs20.19.5/etc/npmrc create mode 100644 bin/archived/nodejs20.19.5/etc/npmrc.ber create mode 100644 bin/archived/nodejs20.19.5/launch.bat create mode 100644 bin/archived/nodejs22.21.1/bearsampp.conf create mode 100644 bin/archived/nodejs22.21.1/etc/npmrc create mode 100644 bin/archived/nodejs22.21.1/etc/npmrc.ber diff --git a/bin/archived/nodejs20.19.5/etc/npmrc b/bin/archived/nodejs20.19.5/etc/npmrc new file mode 100644 index 00000000..b6dae4d1 --- /dev/null +++ b/bin/archived/nodejs20.19.5/etc/npmrc @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc diff --git a/bin/archived/nodejs20.19.5/etc/npmrc.ber b/bin/archived/nodejs20.19.5/etc/npmrc.ber new file mode 100644 index 00000000..b6dae4d1 --- /dev/null +++ b/bin/archived/nodejs20.19.5/etc/npmrc.ber @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs20.19.5\etc\npmrc diff --git a/bin/archived/nodejs20.19.5/launch.bat b/bin/archived/nodejs20.19.5/launch.bat new file mode 100644 index 00000000..c4158e79 --- /dev/null +++ b/bin/archived/nodejs20.19.5/launch.bat @@ -0,0 +1,12 @@ +@ECHO OFF +SETLOCAL EnableDelayedExpansion + +SET BEARSAMPP_NODEJS_PATH=%~dp0 +SET BEARSAMPP_NODEJS_PATH=!BEARSAMPP_NODEJS_PATH:~0,-1! +SET BEARSAMPP_NODEJS_NPM_PATH=%BEARSAMPP_NODEJS_PATH%\node_modules\npm +SET BEARSAMPP_NODEJS_CONFIG_PATH=%BEARSAMPP_NODEJS_NPM_PATH%\npmrc +(ECHO prefix = %BEARSAMPP_NODEJS_PATH%) > "%BEARSAMPP_NODEJS_CONFIG_PATH%" + +"%BEARSAMPP_NODEJS_PATH%\nodevars.bat" & "%BEARSAMPP_NODEJS_PATH%\npm" config set globalconfig "%BEARSAMPP_NODEJS_CONFIG_PATH%" --global + +ENDLOCAL diff --git a/bin/archived/nodejs22.21.1/bearsampp.conf b/bin/archived/nodejs22.21.1/bearsampp.conf new file mode 100644 index 00000000..0db4c491 --- /dev/null +++ b/bin/archived/nodejs22.21.1/bearsampp.conf @@ -0,0 +1,8 @@ +nodejsVersion = "22.21.1" +nodejsExe = "node.exe" +nodejsVars = "nodevars.bat" +nodejsNpm = "npm.cmd" +nodejsLaunch = "launch.bat" +nodejsConf = "node_modules/npm/npmrc" + +bundleRelease = "@RELEASE_VERSION@" diff --git a/bin/archived/nodejs22.21.1/etc/npmrc b/bin/archived/nodejs22.21.1/etc/npmrc new file mode 100644 index 00000000..e6a49196 --- /dev/null +++ b/bin/archived/nodejs22.21.1/etc/npmrc @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc diff --git a/bin/archived/nodejs22.21.1/etc/npmrc.ber b/bin/archived/nodejs22.21.1/etc/npmrc.ber new file mode 100644 index 00000000..e6a49196 --- /dev/null +++ b/bin/archived/nodejs22.21.1/etc/npmrc.ber @@ -0,0 +1,4 @@ +cache = ~BEARSAMPP_WIN_PATH~\tmp\npm-cache +globalconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc +init-module = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\.npm-init.js +userconfig = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs22.21.1\etc\npmrc From ca5c2b11faa4c448ee04bddf3815e2fbfec4a6d4 Mon Sep 17 00:00:00 2001 From: Bear Date: Tue, 2 Jun 2026 21:11:13 -0500 Subject: [PATCH 3/3] Update npmrc prefix configuration for Node.js 26.3.0 --- bin/nodejs26.3.0/node_modules/npm/npmrc | 2 +- bin/nodejs26.3.0/node_modules/npm/npmrc.ber | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/nodejs26.3.0/node_modules/npm/npmrc b/bin/nodejs26.3.0/node_modules/npm/npmrc index b7c95e55..e5d290dd 100644 --- a/bin/nodejs26.3.0/node_modules/npm/npmrc +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc @@ -1 +1 @@ -prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs25.9.0\ +prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\ diff --git a/bin/nodejs26.3.0/node_modules/npm/npmrc.ber b/bin/nodejs26.3.0/node_modules/npm/npmrc.ber index b7c95e55..e5d290dd 100644 --- a/bin/nodejs26.3.0/node_modules/npm/npmrc.ber +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc.ber @@ -1 +1 @@ -prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs25.9.0\ +prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.0\