Compare commits

...
2 changed files with 16 additions and 1 deletions

No files matched your search

+1
View File
@@ -14,6 +14,7 @@ This is the log of notable changes to EAS CLI and related packages.
### 🐛 Bug fixes
- Fix suggested application identifier to match owning account name. ([#1670](https://github.com/expo/eas-cli/pull/1670) by [@wschurman](https://github.com/wschurman))
- Modify update:configure to add possibly missing EAS update config properties. ([#1686](https://github.com/expo/eas-cli/pull/1686) by [@douglowder](https://github.com/douglowder))
### 🧹 Chores
+15 -1
View File
@@ -61,7 +61,11 @@ function replaceUndefinedObjectValues(
function mergeExpoConfig(exp: ExpoConfig, modifyExp: Partial<ExpoConfig>): Partial<ExpoConfig> {
return {
runtimeVersion: modifyExp.runtimeVersion ?? exp.runtimeVersion,
updates: { ...exp.updates, ...modifyExp.updates },
assetBundlePatterns: modifyExp.assetBundlePatterns ?? exp.assetBundlePatterns,
updates: {
...exp.updates,
url: modifyExp?.updates?.url || exp.updates?.url,
},
android: {
...exp.android,
...modifyExp.android,
@@ -99,6 +103,10 @@ async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({
modifyConfig.updates = { url: getEASUpdateURL(projectId) };
}
if (!exp.assetBundlePatterns) {
modifyConfig.assetBundlePatterns = ['*/**'];
}
let androidRuntimeVersion = exp.android?.runtimeVersion ?? exp.runtimeVersion;
let iosRuntimeVersion = exp.ios?.runtimeVersion ?? exp.runtimeVersion;
@@ -185,6 +193,12 @@ function logEasUpdatesAutoConfig({
} with "${JSON.stringify(modifyConfig.ios?.runtimeVersion ?? modifyConfig.runtimeVersion)}"`
);
}
if (modifyConfig?.assetBundlePatterns) {
Log.withTick(
`Configured assetBundlePatterns to ${JSON.stringify(modifyConfig.assetBundlePatterns)}`
);
}
}
function warnEASUpdatesManualConfig({