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..e5d290dd --- /dev/null +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc @@ -0,0 +1 @@ +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 new file mode 100644 index 00000000..e5d290dd --- /dev/null +++ b/bin/nodejs26.3.0/node_modules/npm/npmrc.ber @@ -0,0 +1 @@ +prefix = ~BEARSAMPP_WIN_PATH~\bin\nodejs\nodejs26.3.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