Update packages/eas-cli/src/project/projectUtils.ts

Co-authored-by: Will Schurman <[email protected]>

CHANGELOG.md

@@ -9,16 +9,15 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features
 
 - Show build profile when selecting a build for eas build:run. ([#1901](https://github.com/expo/eas-cli/pull/1901) by [@keith-kurak](https://github.com/keith-kurak))
-
 - Adds -m alias to --message in update/republish and removed README comment. ([#1905](https://github.com/expo/eas-cli/pull/1905) by [@pusongqi](https://github.com/pusongqi))
 
-
 ### 🐛 Bug fixes
 
 ### 🧹 Chores
 
 - Better runtimeVersion output. ([#1894](https://github.com/expo/eas-cli/pull/1894) by [@quinlanj](https://github.com/quinlanj))
 - Print better error message when uploading project archive tarball fails. ([#1897](https://github.com/expo/eas-cli/pull/1897) by [@szdziedzic](https://github.com/szdziedzic))
+- Set useClassicUpdates to false on `eas update` and `eas update:configure`. ([#1914](https://github.com/expo/eas-cli/pull/1914) by [@quinlanj](https://github.com/quinlanj))
 
 ## [3.14.0](https://github.com/expo/eas-cli/releases/tag/v3.14.0) - 2023-06-20
 

packages/eas-cli/package.json

@@ -10,9 +10,9 @@
   "dependencies": {
     "@expo/apple-utils": "1.3.1",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "7.0.3",
+    "@expo/config": "8.1.2",
-    "@expo/config-plugins": "6.0.2",
+    "@expo/config-plugins": "7.2.3",
-    "@expo/config-types": "47.0.0",
+    "@expo/config-types": "49.0.0",
     "@expo/eas-build-job": "1.0.13",
     "@expo/eas-json": "3.13.0",
     "@expo/json-file": "8.2.37",

packages/eas-cli/src/project/projectUtils.ts

@@ -84,6 +84,13 @@ export function isExpoUpdatesInstalledOrAvailable(
   return isExpoUpdatesInstalled(projectDir);
 }
 
+/**
+ * Projects on SDK 49 are required to set `updates.useClassicUpdates` to `true` to use Classic Updates.
+ */
+export function isDefinitelyUsingClassicUpdates(exp: ExpoConfig): boolean {
+  return !!exp.updates?.useClassicUpdates;
+}
+
 export function isUsingEASUpdate(exp: ExpoConfig, projectId: string): boolean {
   return exp.updates?.url === getEASUpdateURL(projectId);
 }

packages/eas-cli/src/update/configure.ts

@@ -12,6 +12,7 @@ import { RequestedPlatform, appPlatformDisplayNames } from '../platform';
 import { createOrModifyExpoConfigAsync } from '../project/expoConfig';
 import {
   installExpoUpdatesAsync,
+  isDefinitelyUsingClassicUpdates,
   isExpoUpdatesInstalledAsDevDependency,
   isExpoUpdatesInstalledOrAvailable,
 } from '../project/projectUtils';
@@ -96,6 +97,10 @@ async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({
 }): Promise<{ projectChanged: boolean; exp: ExpoConfig }> {
   const modifyConfig: Partial<ExpoConfig> = {};
 
+  if (isDefinitelyUsingClassicUpdates(exp)) {
+    modifyConfig.updates = { useClassicUpdates: false };
+  }
+
   if (exp.updates?.url !== getEASUpdateURL(projectId)) {
     modifyConfig.updates = { url: getEASUpdateURL(projectId) };
   }
@@ -161,6 +166,12 @@ function logEasUpdatesAutoConfig({
   modifyConfig: Partial<ExpoConfig>;
   exp: ExpoConfig;
 }): void {
+  if (modifyConfig.updates?.useClassicUpdates === false) {
+    Log.withTick(
+      `Configured updates.useClassicUpdates to "${modifyConfig.updates?.useClassicUpdates}". You cannot use EAS Update and Classic Updates at the same time.`
+    );
+  }
+
   if (modifyConfig.updates?.url) {
     Log.withTick(
       exp.updates?.url
@@ -326,6 +337,7 @@ export async function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir: stri
  * This goes over a checklist and performs the following checks or changes:
  *   - Enure the `expo-updates` package is currently installed.
  *   - Ensure `app.json` is configured for EAS Updates
+ *     - Sets `useClassicUpdates` to false if set
  *     - Sets `runtimeVersion` if not set
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any

yarn.lock

@@ -1347,12 +1347,12 @@
     node-forge "^1.2.1"
     nullthrows "^1.1.1"
 
-"@expo/config-plugins@6.0.2":
+"@expo/config-plugins@7.2.3":
-  version "6.0.2"
+  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-6.0.2.tgz#cf07319515022ba94d9aa9fa30e0cff43a14256f"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-7.2.3.tgz#982800bf1aec3811f3e087a1e8784c82f0853672"
-  integrity sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==
+  integrity sha512-8wBR4HH2PhPbupUNXCB1aslMD4vNYEnew26os1nCZ4vaUwcp0LeI9Zl2ycOCBVwGSdd5RNHFzK2R/OFE9P13tA==
   dependencies:
-    "@expo/config-types" "^48.0.0"
+    "@expo/config-types" "^49.0.0-alpha.1"
     "@expo/json-file" "~8.2.37"
     "@expo/plist" "^0.0.20"
     "@expo/sdk-runtime-versions" "^1.0.0"
@@ -1363,10 +1363,10 @@
     getenv "^1.0.0"
     glob "7.1.6"
     resolve-from "^5.0.0"
-    semver "^7.3.5"
+    semver "^7.5.3"
     slash "^3.0.0"
     xcode "^3.0.1"
-    xml2js "0.4.23"
+    xml2js "0.6.0"
 
 "@expo/config-plugins@~5.0.3":
   version "5.0.4"
@@ -1389,17 +1389,55 @@
     xcode "^3.0.1"
     xml2js "0.4.23"
 
-"@expo/config-[email protected]", "@expo/config-types@^47.0.0":
+"@expo/config-plugins@~7.2.0":
+  version "7.2.4"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-7.2.4.tgz#c8d354348b746e53d70224f0bf7b87994f7c2936"
+  integrity sha512-TItGwmKH1GDjA5GlMkXo1A8pqeqppSK40aSVRVQaGZraUj+nuvtpWxNgEWZxWFumiatP2ocWwyWVjfmH+rJY6g==
+  dependencies:
+    "@expo/config-types" "^49.0.0-alpha.1"
+    "@expo/json-file" "~8.2.37"
+    "@expo/plist" "^0.0.20"
+    "@expo/sdk-runtime-versions" "^1.0.0"
+    "@react-native/normalize-color" "^2.0.0"
+    chalk "^4.1.2"
+    debug "^4.3.1"
+    find-up "~5.0.0"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    resolve-from "^5.0.0"
+    semver "^7.5.3"
+    slash "^3.0.0"
+    xcode "^3.0.1"
+    xml2js "0.6.0"
+
+"@expo/[email protected]", "@expo/config-types@^49.0.0-alpha.1":
+  version "49.0.0"
+  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-49.0.0.tgz#15ffef715285c06703f6fb7ec0cda853f645cc09"
+  integrity sha512-8eyREVi+K2acnMBe/rTIu1dOfyR2+AMnTLHlut+YpMV9OZPdeKV0Bs9BxAewGqBA2slslbQ9N39IS2CuTKpXkA==
+
+"@expo/config-types@^47.0.0":
   version "47.0.0"
   resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-47.0.0.tgz#99eeabe0bba7a776e0f252b78beb0c574692c38d"
   integrity sha512-r0pWfuhkv7KIcXMUiNACJmJKKwlTBGMw9VZHNdppS8/0Nve8HZMTkNRFQzTHW1uH3pBj8jEXpyw/2vSWDHex9g==
 
-"@expo/config-types@^48.0.0":
+"@expo/config@8.1.2":
-  version "48.0.0"
+  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-48.0.0.tgz#15a46921565ffeda3c3ba010701398f05193d5b3"
+  resolved "https://registry.yarnpkg.com/@expo/config/-/config-8.1.2.tgz#7fff28b3acefe39702e9f3ce1c9fd896a52caa80"
-  integrity sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A==
+  integrity sha512-4e7hzPj50mQIlsrzOH6XZ36O094mPfPTIDIH4yv49bWNMc7GFLTofB/lcT+QyxiLaJuC0Wlk9yOLB8DIqmtwug==
+  dependencies:
+    "@babel/code-frame" "~7.10.4"
+    "@expo/config-plugins" "~7.2.0"
+    "@expo/config-types" "^49.0.0-alpha.1"
+    "@expo/json-file" "^8.2.37"
+    getenv "^1.0.0"
+    glob "7.1.6"
+    require-from-string "^2.0.2"
+    resolve-from "^5.0.0"
+    semver "7.5.3"
+    slugify "^1.3.4"
+    sucrase "^3.20.0"
 
-"@expo/[email protected]", "@expo/config@~7.0.2":
+"@expo/config@~7.0.2":
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/@expo/config/-/config-7.0.3.tgz#c9c634e76186de25e296485e51418f1e52966e6e"
   integrity sha512-joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA==
@@ -1450,7 +1488,7 @@
     json5 "^1.0.1"
     write-file-atomic "^2.3.0"
 
-"@expo/[email protected]", "@expo/json-file@~8.2.37":
+"@expo/[email protected]", "@expo/json-file@^8.2.37", "@expo/json-file@~8.2.37":
   version "8.2.37"
   resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.37.tgz#9c02d3b42134907c69cc0a027b18671b69344049"
   integrity sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==
@@ -12113,6 +12151,13 @@ [email protected], semver@^7.0.0, semver@^7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
+[email protected], semver@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 [email protected], semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
@@ -13815,6 +13860,14 @@ [email protected]:
     sax ">=0.6.0"
     xmlbuilder "~11.0.0"
 
+[email protected]:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.0.tgz#07afc447a97d2bd6507a1f76eeadddb09f7a8282"
+  integrity sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~11.0.0"
+
 xmlbuilder@^14.0.0:
   version "14.0.0"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-14.0.0.tgz#876b5aec4f05ffd5feb97b0a871c855d16fbeb8c"