Merge 88483fd687 into 08f58d1471

.github/workflows/versions.yml

@@ -183,21 +183,6 @@ jobs:
       - name: Verify node
         run: __tests__/verify-node.sh 20
 
-  version-file-dev-engines-array:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node from node version file
-        uses: ./
-        with:
-          node-version-file: '__tests__/data/package-dev-engines-array.json'
-      - name: Verify node
-        run: __tests__/verify-node.sh 20
-
   version-file-volta:
     runs-on: ${{ matrix.os }}
     strategy:

__tests__/data/package-dev-engines-array.json

@@ -1,17 +0,0 @@
-{
-  "engines": {
-    "node": "^19"
-  },
-  "devEngines": {
-    "runtime": [
-      {
-        "name": "bun",
-        "version": "^1"
-      },
-      {
-        "name": "node",
-        "version": "^20"
-      }
-    ]
-  }
-}

__tests__/data/package-dev-engines.json

@@ -1,6 +1,6 @@
 {
   "engines": {
-    "node": "^19"
+    "node": "^20 || ^22"
   },
   "devEngines": {
     "runtime": {

__tests__/main.test.ts

@@ -91,24 +91,23 @@ describe('main tests', () => {
 
   describe('getNodeVersionFromFile', () => {
     each`
-      contents                                                                                   | expected
+      contents                                                                | expected
-      ${'12'}                                                                                    | ${'12'}
+      ${'12'}                                                                 | ${'12'}
-      ${'12.3'}                                                                                  | ${'12.3'}
+      ${'12.3'}                                                               | ${'12.3'}
-      ${'12.3.4'}                                                                                | ${'12.3.4'}
+      ${'12.3.4'}                                                             | ${'12.3.4'}
-      ${'v12.3.4'}                                                                               | ${'12.3.4'}
+      ${'v12.3.4'}                                                            | ${'12.3.4'}
-      ${'lts/erbium'}                                                                            | ${'lts/erbium'}
+      ${'lts/erbium'}                                                         | ${'lts/erbium'}
-      ${'lts/*'}                                                                                 | ${'lts/*'}
+      ${'lts/*'}                                                              | ${'lts/*'}
-      ${'nodejs 12.3.4'}                                                                         | ${'12.3.4'}
+      ${'nodejs 12.3.4'}                                                      | ${'12.3.4'}
-      ${'ruby 2.3.4\nnodejs 12.3.4\npython 3.4.5'}                                               | ${'12.3.4'}
+      ${'ruby 2.3.4\nnodejs 12.3.4\npython 3.4.5'}                            | ${'12.3.4'}
-      ${''}                                                                                      | ${''}
+      ${''}                                                                   | ${''}
-      ${'unknown format'}                                                                        | ${'unknown format'}
+      ${'unknown format'}                                                     | ${'unknown format'}
-      ${'  14.1.0  '}                                                                            | ${'14.1.0'}
+      ${'  14.1.0  '}                                                         | ${'14.1.0'}
-      ${'{}'}                                                                                    | ${null}
+      ${'{"volta": {"node": ">=14.0.0 <=17.0.0"}}'}                           | ${'>=14.0.0 <=17.0.0'}
-      ${'{"volta": {"node": ">=14.0.0 <=17.0.0"}}'}                                              | ${'>=14.0.0 <=17.0.0'}
+      ${'{"volta": {"extends": "./package.json"}}'}                           | ${'18.0.0'}
-      ${'{"volta": {"extends": "./package.json"}}'}                                              | ${'18.0.0'}
+      ${'{"engines": {"node": "17.0.0"}}'}                                    | ${'17.0.0'}
-      ${'{"engines": {"node": "17.0.0"}}'}                                                       | ${'17.0.0'}
+      ${'{"devEngines": {"runtime": {"name": "node", "version": "22.0.0"}}}'} | ${'22.0.0'}
-      ${'{"devEngines": {"runtime": {"name": "node", "version": "22.0.0"}}}'}                    | ${'22.0.0'}
+      ${'{}'}                                                                 | ${null}
-      ${'{"devEngines": {"runtime": [{"name": "bun"}, {"name": "node", "version": "22.0.0"}]}}'} | ${'22.0.0'}
     `.it('parses "$contents"', ({contents, expected}) => {
       const existsSpy = jest.spyOn(fs, 'existsSync');
       existsSpy.mockImplementation(() => true);

docs/advanced-usage.md

@@ -86,7 +86,7 @@ This example will install a Node version based on the `^20.10` pattern.
 ```json
 {
   "engines": {
-    "node": "^19"
+    "node": "^20 || ^22"
   },
   "devEngines": {
     "runtime": {

src/util.ts

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