Merge remote-tracking branch 'upstream/main'

actions · marko-zivic-93 · Sep 12, 2022 · Jun 29, 2022 · Jun 29, 2022 · Jun 29, 2022
commit 94f88d78c4057b5883734ba04b3299da3c8955c7
@@ -1,6 +1,6 @@
 {
   "engines": {
-    "node": ">=14.0.0"
+    "node": "^14.0.0"
   },
   "volta": {
     "node": "14.0.0"

@@ -71770,20 +71770,19 @@ function translateArchToDistUrl(arch) {
 function parseNodeVersionFile(contents) {
     var _a, _b, _c;
     let nodeVersion;
-    // Try parsing the file as an NPM `package.json`
-    // file.
+    // Try parsing the file as an NPM `package.json` file.
     try {
-        nodeVersion = (_a = JSON.parse(contents).engines) === null || _a === void 0 ? void 0 : _a.node;
+        nodeVersion = (_a = JSON.parse(contents).volta) === null || _a === void 0 ? void 0 : _a.node;
+        if (!nodeVersion)
+            nodeVersion = (_b = JSON.parse(contents).engines) === null || _b === void 0 ? void 0 : _b.node;
     }
-    catch (_c) {
+    catch (_d) {
         core.warning('Node version file is not JSON file');
     }
     if (!nodeVersion) {
         try {
-            // Try parsing the file as an NPM `package.json` file.
-            nodeVersion = (_b = JSON.parse(contents).volta) === null || _b === void 0 ? void 0 : _b.node;
-            if (!nodeVersion)
-                nodeVersion = (_c = JSON.parse(contents).engines) === null || _c === void 0 ? void 0 : _c.node;
+            const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+            nodeVersion = (_c = found === null || found === void 0 ? void 0 : found.groups) === null || _c === void 0 ? void 0 : _c.version;
             if (!nodeVersion)
                 throw new Error();
         }

@@ -497,19 +497,19 @@ function translateArchToDistUrl(arch: string): string {
 export function parseNodeVersionFile(contents: string): string {
   let nodeVersion: string | undefined;
 
-  // Try parsing the file as an NPM `package.json`
-  // file.
+  // Try parsing the file as an NPM `package.json` file.
   try {
-    nodeVersion = JSON.parse(contents).engines?.node;
+    nodeVersion = JSON.parse(contents).volta?.node;
+    if (!nodeVersion) nodeVersion = JSON.parse(contents).engines?.node;
   } catch {
     core.warning('Node version file is not JSON file');
   }
 
   if (!nodeVersion) {
     try {
-      // Try parsing the file as an NPM `package.json` file.
-      nodeVersion = JSON.parse(contents).volta?.node;
-      if (!nodeVersion) nodeVersion = JSON.parse(contents).engines?.node;
+      const found = contents.match(/^(?:nodejs\s+)?v?(?<version>[^\s]+)$/m);
+      nodeVersion = found?.groups?.version;
+
       if (!nodeVersion) throw new Error();
     } catch (err) {
       // In the case of an unknown format,