Merge abd5abb550 into 6044e13b5d

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

dist/cache-save/index.js

@@ -44463,6 +44463,17 @@ function getNodeVersionFromFile(versionFilePath) {
             if (manifest.volta?.node) {
                 return manifest.volta.node;
             }
+            // support devEngines from npm 11
+            if (manifest.devEngines?.runtime) {
+                // find an entry with name set to node and having set a version.
+                // the devEngines.runtime can either be an object or an array of objects
+                const nodeEntry = [manifest.devEngines.runtime]
+                    .flat()
+                    .find(({ name, version }) => name?.toLowerCase() === 'node' && version);
+                if (nodeEntry) {
+                    return nodeEntry.version;
+                }
+            }
             if (manifest.engines?.node) {
                 return manifest.engines.node;
             }

dist/setup/index.js

@@ -55001,6 +55001,17 @@ function getNodeVersionFromFile(versionFilePath) {
             if (manifest.volta?.node) {
                 return manifest.volta.node;
             }
+            // support devEngines from npm 11
+            if (manifest.devEngines?.runtime) {
+                // find an entry with name set to node and having set a version.
+                // the devEngines.runtime can either be an object or an array of objects
+                const nodeEntry = [manifest.devEngines.runtime]
+                    .flat()
+                    .find(({ name, version }) => name?.toLowerCase() === 'node' && version);
+                if (nodeEntry) {
+                    return nodeEntry.version;
+                }
+            }
             if (manifest.engines?.node) {
                 return manifest.engines.node;
             }

docs/advanced-usage.md

@@ -90,16 +90,16 @@ steps:
 - run: npm test
 ```
 
-When using the `package.json` input, the action will look in following field for a specified Node version:
+When using the `package.json` input, the action will look in the following fields for a specified Node version:
 1. It checks `volta.node` first.
 2. Then it checks `devEngines.runtime`.
 3. Then it will look for `engines.node`.
 4. Otherwise it tries to resolve the file defined by [`volta.extends`](https://docs.volta.sh/advanced/workspaces)
-   and look for `volta.node` or `engines.node` recursively.
+   and look for `volta.node`, `devEngines.runtime`, or `engines.node` recursively.
 
 ### Example with `devEngines`
 
-When a runtime engine (`engines.node`) is defined but also a development engine (`devEngines.runtime`) then the `devEngine` runtime version is used.
+When a runtime engine (`engines.node`) is defined but also a development engine (`devEngines.runtime`) then the `devEngines.runtime` version is used.
 This example will install a Node version based on the `^20.10` pattern.
 
 ```json

src/util.ts

@@ -32,7 +32,7 @@ export function getNodeVersionFromFile(versionFilePath: string): string | null {
         // the devEngines.runtime can either be an object or an array of objects
         const nodeEntry = [manifest.devEngines.runtime]
           .flat()
-          .find(({name, version}) => name.toLowerCase() === 'node' && version);
+          .find(({name, version}) => name?.toLowerCase() === 'node' && version);
         if (nodeEntry) {
           return nodeEntry.version;
         }