Merge branch 'main' into @kadikraman/bun-support

expo · Sep 20, 2023 · 1934a15 · 1934a15
2 parents 376ef8e + 52f54fc
commit 1934a15
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
+- Support node aliases in .nvmrc. ([#2052](https://github.com/expo/eas-cli/pull/2052) by [@khamilowicz](https://github.com/khamilowicz))
+
 ### 🧹 Chores
 
 - Rollouts: more robust printing function. ([#2047](https://github.com/expo/eas-cli/pull/2047) by [@quinlanj](https://github.com/quinlanj))

diff --git a/packages/eas-cli/src/channel/__tests__/print-utils-test.ts b/packages/eas-cli/src/channel/__tests__/print-utils-test.ts
@@ -1,3 +1,5 @@
+import { format } from '@expo/timeago.js';
+
 import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
 import { getDescriptionByBranchId } from '../print-utils';
 import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
@@ -13,19 +15,20 @@ describe(getDescriptionByBranchId, () => {
         codeSigningKey: undefined,
         group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
         isRollBackToEmbedded: false,
-        message: '"fix bug" (1 month ago by quintest113)',
+        message: `"fix bug" (${format('2023-07-17T22:48:59.278Z', 'en_US')} by quintest113)`,
         platforms: 'android, ios',
         runtimeVersion: 'exposdk:48.0.0',
       },
     });
+
     expect(descriptionByBranchId[testUpdateBranch2.id]).toEqual({
       branch: 'production',
       branchRolloutPercentage: 85,
       update: {
         codeSigningKey: undefined,
         group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
         isRollBackToEmbedded: false,
-        message: '"fix bug" (2 months ago by quintest113)',
+        message: `"fix bug" (${format('2023-06-23T23:37:10.004Z', 'en_US')} by quintest113)`,
         platforms: 'android, ios',
         runtimeVersion: 'exposdk:48.0.0',
       },

diff --git a/packages/eas-cli/src/utils/profiles.ts b/packages/eas-cli/src/utils/profiles.ts
@@ -8,7 +8,6 @@ import {
 } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';
-import semver from 'semver';
 
 import Log, { learnMore } from '../log';
 
@@ -83,9 +82,6 @@ async function getNodeVersionFromFileAsync(projectDir: string): Promise<string |
   } catch {
     return undefined;
   }
-  if (!semver.valid(semver.coerce(nodeVersion))) {
-    throw new Error(`Invalid node version in .nvmrc: ${nodeVersion}`);
-  }
   return nodeVersion;
 }