Merge cae2eb71a2d7edd13a16b86d1bc0f749b25fd290 into 1d39e35bd3db9249508dc45e9fdd5fc8b58f6b96

Fixes #3499

.github/workflows/latest-npm.yml

@@ -37,6 +37,11 @@ jobs:
       matrix:
         node-version: ${{ fromJson(needs.matrix.outputs.latest) }}
         include:
+          - node-version: "21"
+          - node-version: "20.5"
+          - node-version: "20.4"
+          - node-version: "14.17"
+          - node-version: "14.16"
           - node-version: "9.2"
           - node-version: "9.1"
           - node-version: "9.0"

.github/workflows/toc.yml

@@ -20,6 +20,7 @@ jobs:
         allowed-endpoints:
           github.com:443
           registry.npmjs.org:443
+          api.github.com:443
     - uses: actions/checkout@v4
       with:
         # https://github.com/actions/checkout/issues/217#issue-599945005
@@ -30,7 +31,7 @@ jobs:
     - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
     - uses: actions/setup-node@v4
       with:
-        node-version: '16'
+        node-version: 'lts/*'
     - run: npm install
     - run: npm run doctoc
     - name: commit changes

install.sh

@@ -163,7 +163,8 @@ install_nvm_from_git() {
       }
     else
       # Cloning repo
-      command git clone "$(nvm_source)" --depth=1 "${INSTALL_DIR}" || {
+      command git clone "$(nvm_source)" --depth=1 -o origin "${INSTALL_DIR}" 2> /dev/null \
+        || command git clone "$(nvm_source)" --depth=1 "${INSTALL_DIR}" || {
         nvm_echo >&2 'Failed to clone nvm repo. Please report this!'
         exit 2
       }

nvm.sh

@@ -354,6 +354,21 @@ nvm_install_latest_npm() {
     if [ $NVM_IS_19_OR_ABOVE -eq 1 ] && nvm_version_greater_than_or_equal_to "${NODE_VERSION}" 20.5.0; then
       NVM_IS_20_5_OR_ABOVE=1
     fi
+    local NVM_IS_20_17_or_ABOVE
+    NVM_IS_20_17_or_ABOVE=0
+    if [ $NVM_IS_20_5_OR_ABOVE -eq 1 ] && nvm_version_greater 20.17.0 "${NODE_VERSION}"; then
+      NVM_IS_20_17_or_ABOVE=1
+    fi
+    local NVM_IS_21_OR_ABOVE
+    NVM_IS_21_OR_ABOVE=0
+    if [ $NVM_IS_20_17_or_ABOVE -eq 1 ] && nvm_version_greater 21.0.0 "${NODE_VERSION}"; then
+      NVM_IS_21_OR_ABOVE=1
+    fi
+    local NVM_IS_22_9_OR_ABOVE
+    NVM_IS_22_9_OR_ABOVE=0
+    if [ $NVM_IS_21_OR_ABOVE -eq 1 ] && nvm_version_greater 22.9.0 "${NODE_VERSION}"; then
+      NVM_IS_22_9_OR_ABOVE=1
+    fi
 
     if [ $NVM_IS_4_4_OR_BELOW -eq 1 ] || {
       [ $NVM_IS_5_OR_ABOVE -eq 1 ] && nvm_version_greater 5.10.0 "${NODE_VERSION}"; \
@@ -399,8 +414,15 @@ nvm_install_latest_npm() {
       [ $NVM_IS_18_17_OR_ABOVE -eq 0 ] \
       || { [ $NVM_IS_19_OR_ABOVE -eq 1 ] && [ $NVM_IS_20_5_OR_ABOVE -eq 0 ]; } \
     ; then
+      # TODO: 10.8.3 can run on 16.20.2?? https://github.com/nodejs/Release/issues/884#issuecomment-2558077691
       nvm_echo '* `npm` `v9.x` is the last version that works on `node` `< v18.17`, `v19`, or `v20.0` - `v20.4`'
       $NVM_NPM_CMD install -g npm@9
+    elif \
+      [ $NVM_IS_20_17_or_ABOVE -eq 0 ] \
+      || { [ $NVM_IS_21_OR_ABOVE -eq 1 ] && [ $NVM_IS_22_9_OR_ABOVE -eq 0 ]; } \
+    ; then
+      nvm_echo '* `npm` `v10.x` is the last version that works on `node` `< v20.17`, `v21`, or `v22.0` - `v22.8`'
+      $NVM_NPM_CMD install -g npm@10
     else
       nvm_echo '* Installing latest `npm`; if this does not work on your node version, please report a bug!'
       $NVM_NPM_CMD install -g npm
@@ -422,8 +444,7 @@ fi
 if [ -z "${NVM_DIR-}" ]; then
   # shellcheck disable=SC2128
   if [ -n "${BASH_SOURCE-}" ]; then
-    # shellcheck disable=SC2169,SC3054
-    NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
+    NVM_SCRIPT_SOURCE="${BASH_SOURCE}"
   fi
   # shellcheck disable=SC2086
   NVM_DIR="$(nvm_cd ${NVM_CD_FLAGS} "$(dirname "${NVM_SCRIPT_SOURCE:-$0}")" >/dev/null && \pwd)"