Merge 094c1c12f4 into ca2d4e0cdd

.github/workflows/versions.yml

@@ -158,7 +158,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version-file: [.nvmrc, .tool-versions, package.json]
+        node-version-file:
+          [.nvmrc, .tool-versions, .tool-versions-node, package.json]
     steps:
       - uses: actions/checkout@v3
       - name: Remove volta from package.json

__tests__/data/.tool-versions-node

@@ -0,0 +1 @@
+node 14.0.0

dist/cache-save/index.js

@@ -60754,7 +60754,7 @@ function parseNodeVersionFile(contents) {
         core.info('Node version file is not JSON file');
     }
     if (!nodeVersion) {
-        const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+        const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
         nodeVersion = (_c = found === null || found === void 0 ? void 0 : found.groups) === null || _c === void 0 ? void 0 : _c.version;
     }
     // In the case of an unknown format,

dist/setup/index.js

@@ -72336,7 +72336,7 @@ function parseNodeVersionFile(contents) {
         core.info('Node version file is not JSON file');
     }
     if (!nodeVersion) {
-        const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+        const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
         nodeVersion = (_c = found === null || found === void 0 ? void 0 : found.groups) === null || _c === void 0 ? void 0 : _c.version;
     }
     // In the case of an unknown format,

src/authutil.ts

@@ -25,6 +25,12 @@ function writeRegistryToFile(
   if (!scope && registryUrl.indexOf('npm.pkg.github.com') > -1) {
     scope = github.context.repo.owner;
   }
+  if (!scope) {
+    let namePrefix = require('./package').name.match('@[^/]+');
+    if (namePrefix) {
+      scope = namePrefix[0];
+    }
+  }
   if (scope && scope[0] != '@') {
     scope = '@' + scope;
   }

src/util.ts

@@ -13,7 +13,7 @@ export function parseNodeVersionFile(contents: string): string {
   }
 
   if (!nodeVersion) {
-    const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+    const found = contents.match(/^(?:node(js)?\s+)?v?(?<version>[^\s]+)$/m);
     nodeVersion = found?.groups?.version;
   }