Merge f89df17cc9 into d82f92a0eb

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

__tests__/data/.node-version

@@ -0,0 +1 @@
+v16

__tests__/main.test.ts

@@ -155,14 +155,6 @@ describe('main tests', () => {
       expect(parseNodeVersionSpy).toHaveBeenCalledTimes(0);
     }, 10000);
 
-    it('not used if node-version-file not provided', async () => {
-      // Act
-      await main.run();
-
-      // Assert
-      expect(parseNodeVersionSpy).toHaveBeenCalledTimes(0);
-    });
-
     it('reads node-version-file if provided', async () => {
       // Arrange
       const versionSpec = 'v14';
@@ -215,6 +207,53 @@ describe('main tests', () => {
       );
     }, 10000);
 
+    it('reads .node-version if node-version and node-version-file were not provided', async () => {
+      // Arrange
+      const versionSpec = 'v16';
+      const versionFile = '.node-version';
+      const expectedVersionSpec = '16';
+      process.env['GITHUB_WORKSPACE'] = path.join(__dirname, 'data');
+
+      parseNodeVersionSpy.mockImplementation(() => expectedVersionSpec);
+      existsSpy.mockImplementationOnce(
+        input => input === path.join(__dirname, 'data', versionFile)
+      );
+
+      // Act
+      await main.run();
+
+      // Assert
+      expect(existsSpy).toHaveBeenCalledTimes(1);
+      expect(existsSpy).toHaveReturnedWith(true);
+      expect(parseNodeVersionSpy).toHaveBeenCalledWith(versionSpec);
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Resolved ${versionFile} as ${expectedVersionSpec}`
+      );
+    }, 10000);
+
+    it('reads .nvmrc if node-version and node-version-file were not provided', async () => {
+      // Arrange
+      const versionSpec = 'v14';
+      const versionFile = '.nvmrc';
+      const expectedVersionSpec = '14';
+      process.env['GITHUB_WORKSPACE'] = path.join(__dirname, 'data');
+
+      parseNodeVersionSpy.mockImplementation(() => expectedVersionSpec);
+      existsSpy.mockImplementation(
+        input => input === path.join(__dirname, 'data', versionFile)
+      );
+
+      // Act
+      await main.run();
+
+      // Assert
+      expect(existsSpy).toHaveBeenCalledTimes(2);
+      expect(parseNodeVersionSpy).toHaveBeenCalledWith(versionSpec);
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Resolved ${versionFile} as ${expectedVersionSpec}`
+      );
+    }, 10000);
+
     it('both node-version-file and node-version are provided', async () => {
       inputs['node-version'] = '12';
       const versionSpec = 'v14';

dist/setup/index.js

@@ -72274,11 +72274,22 @@ function resolveVersionInput() {
     }
     if (versionFileInput) {
         const versionFilePath = path.join(process.env.GITHUB_WORKSPACE, versionFileInput);
-        if (!fs_1.default.existsSync(versionFilePath)) {
+        if (fs_1.default.existsSync(versionFilePath)) {
+            version = util_1.parseNodeVersionFile(fs_1.default.readFileSync(versionFilePath, 'utf8'));
+            core.info(`Resolved ${versionFileInput} as ${version}`);
+            return version;
+        }
+        else {
             throw new Error(`The specified node version file at: ${versionFilePath} does not exist`);
         }
-        version = util_1.parseNodeVersionFile(fs_1.default.readFileSync(versionFilePath, 'utf8'));
-        core.info(`Resolved ${versionFileInput} as ${version}`);
+    }
+    for (const versionFile of ['.node-version', '.nvmrc']) {
+        const versionFilePath = path.join(process.env.GITHUB_WORKSPACE, versionFile);
+        if (fs_1.default.existsSync(versionFilePath)) {
+            version = util_1.parseNodeVersionFile(fs_1.default.readFileSync(versionFilePath, 'utf8'));
+            core.info(`Resolved ${versionFile} as ${version}`);
+            return version;
+        }
     }
     return version;
 }

package-lock.json

@@ -6291,9 +6291,9 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true,
       "engines": {
         "node": ">=0.10.0"
@@ -11213,9 +11213,9 @@
       }
     },
     "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
       "dev": true
     },
     "wrap-ansi": {

src/main.ts

@@ -97,15 +97,32 @@ function resolveVersionInput(): string {
       versionFileInput
     );
 
-    if (!fs.existsSync(versionFilePath)) {
+    if (fs.existsSync(versionFilePath)) {
+      version = parseNodeVersionFile(fs.readFileSync(versionFilePath, 'utf8'));
+
+      core.info(`Resolved ${versionFileInput} as ${version}`);
+
+      return version;
+    } else {
       throw new Error(
         `The specified node version file at: ${versionFilePath} does not exist`
       );
     }
+  }
 
-    version = parseNodeVersionFile(fs.readFileSync(versionFilePath, 'utf8'));
+  for (const versionFile of ['.node-version', '.nvmrc']) {
+    const versionFilePath = path.join(
+      process.env.GITHUB_WORKSPACE!,
+      versionFile
+    );
 
-    core.info(`Resolved ${versionFileInput} as ${version}`);
+    if (fs.existsSync(versionFilePath)) {
+      version = parseNodeVersionFile(fs.readFileSync(versionFilePath, 'utf8'));
+
+      core.info(`Resolved ${versionFile} as ${version}`);
+
+      return version;
+    }
   }
 
   return version;