mirror of
https://github.com/expo/eas-cli.git
synced 2026-11-13 20:28:08 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4ca87aa9f | ||
|
|
5e5b55f9e4 | ||
|
|
a1d086ffc6 | ||
|
|
2a96d04be3 | ||
|
|
d126ee988a |
No files matched your search
+5
-2
@@ -8,14 +8,17 @@ This is the log of notable changes to EAS CLI and related packages.
|
||||
|
||||
### 🎉 New features
|
||||
|
||||
- Added support to read platform version from `app.json`. ([#2778](https://github.com/expo/eas-cli/pull/2778) by [@kudo](https://github.com/kudo))
|
||||
|
||||
### 🐛 Bug fixes
|
||||
|
||||
- Show `eas deploy` upload error messages. ([#2771](https://github.com/expo/eas-cli/pull/2771) by [@kadikraman](https://github.com/kadikraman))
|
||||
- Prevent EAS CLI dependencies check from running repeatedly. ([#2781](https://github.com/expo/eas-cli/pull/2781) by [@kitten](https://github.com/kitten))
|
||||
- Prevent optimistic request body parsing for `eas deploy`. ([#2784](https://github.com/expo/eas-cli/pull/2784) by [@kadikraman](https://github.com/kadikraman))
|
||||
|
||||
### 🧹 Chores
|
||||
|
||||
- Update log output for `worker` deploy and alias commands. ([#2780](https://github.com/expo/eas-cli/pull/2780) by [@kitten](https://github.com/kitten))
|
||||
- Update various messages wording. ([#2790](https://github.com/expo/eas-cli/pull/2790) by [@simek](https://github.com/simek))
|
||||
|
||||
## [14.2.0](https://github.com/expo/eas-cli/releases/tag/v14.2.0) - 2024-12-13
|
||||
|
||||
### 🎉 New features
|
||||
|
||||
@@ -20,11 +20,7 @@ import { getNextVersionCode } from '../../project/android/versions';
|
||||
import { resolveWorkflowAsync } from '../../project/workflow';
|
||||
import { Client } from '../../vcs/vcs';
|
||||
import { updateAppJsonConfigAsync } from '../utils/appJson';
|
||||
import {
|
||||
bumpAppVersionAsync,
|
||||
ensureStaticConfigExists,
|
||||
getVersionConfigTarget,
|
||||
} from '../utils/version';
|
||||
import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
|
||||
|
||||
export enum BumpStrategy {
|
||||
APP_VERSION,
|
||||
@@ -57,11 +53,9 @@ export async function bumpVersionAsync({
|
||||
|
||||
await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
|
||||
Log.log('Updated versions in app.json');
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
|
||||
const version = versionGetter(exp);
|
||||
await updateNativeVersionsAsync({
|
||||
projectDir,
|
||||
version,
|
||||
version: exp.version,
|
||||
versionCode: exp.android?.versionCode,
|
||||
});
|
||||
Log.log('Synchronized versions with build gradle');
|
||||
@@ -85,7 +79,7 @@ export async function bumpVersionInAppJsonAsync({
|
||||
|
||||
if (bumpStrategy === BumpStrategy.APP_VERSION) {
|
||||
const appVersion = AndroidConfig.Version.getVersionName(exp) ?? '1.0.0';
|
||||
await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.ANDROID });
|
||||
await bumpAppVersionAsync({ appVersion, projectDir, exp });
|
||||
} else {
|
||||
const versionCode = AndroidConfig.Version.getVersionCode(exp);
|
||||
const bumpedVersionCode = getNextVersionCode(versionCode);
|
||||
@@ -124,11 +118,9 @@ export async function maybeResolveVersionsAsync(
|
||||
return {};
|
||||
}
|
||||
} else {
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
|
||||
const appVersion = versionGetter(exp);
|
||||
return {
|
||||
appBuildVersion: String(AndroidConfig.Version.getVersionCode(exp)),
|
||||
appVersion,
|
||||
appVersion: exp.version,
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -210,7 +202,6 @@ export async function resolveRemoteVersionCodeAsync(
|
||||
applicationId
|
||||
);
|
||||
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
|
||||
const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
|
||||
let currentBuildVersion: string;
|
||||
if (remoteVersions?.buildVersion) {
|
||||
@@ -239,7 +230,7 @@ export async function resolveRemoteVersionCodeAsync(
|
||||
appId: projectId,
|
||||
platform: AppPlatform.Android,
|
||||
applicationIdentifier: applicationId,
|
||||
storeVersion: localVersions.appVersion ?? versionGetter(exp) ?? '1.0.0',
|
||||
storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
|
||||
buildVersion: currentBuildVersion,
|
||||
runtimeVersion:
|
||||
(await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
|
||||
@@ -263,7 +254,7 @@ export async function resolveRemoteVersionCodeAsync(
|
||||
appId: projectId,
|
||||
platform: AppPlatform.Android,
|
||||
applicationIdentifier: applicationId,
|
||||
storeVersion: localVersions.appVersion ?? versionGetter(exp) ?? '1.0.0',
|
||||
storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
|
||||
buildVersion: String(nextBuildVersion),
|
||||
runtimeVersion:
|
||||
(await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
|
||||
|
||||
@@ -672,7 +672,9 @@ async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends
|
||||
const runtimeAndFingerprintMetadata =
|
||||
await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
|
||||
if (!runtimeAndFingerprintMetadata?.fingerprintHash) {
|
||||
const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
|
||||
const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx, {
|
||||
debug: true,
|
||||
});
|
||||
return {
|
||||
...runtimeAndFingerprintMetadata,
|
||||
...fingerprint,
|
||||
@@ -739,6 +741,7 @@ async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends
|
||||
workflow: ctx.workflow,
|
||||
platforms: [ctx.platform],
|
||||
env: ctx.env,
|
||||
debug,
|
||||
});
|
||||
if (!fingerprint) {
|
||||
return {};
|
||||
|
||||
@@ -21,11 +21,7 @@ import uniqBy from '../../utils/expodash/uniqBy';
|
||||
import { readPlistAsync, writePlistAsync } from '../../utils/plist';
|
||||
import { Client } from '../../vcs/vcs';
|
||||
import { updateAppJsonConfigAsync } from '../utils/appJson';
|
||||
import {
|
||||
bumpAppVersionAsync,
|
||||
ensureStaticConfigExists,
|
||||
getVersionConfigTarget,
|
||||
} from '../utils/version';
|
||||
import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
|
||||
|
||||
const SHORT_VERSION_REGEX = /^\d+(\.\d+){0,2}$/;
|
||||
|
||||
@@ -52,11 +48,9 @@ export async function bumpVersionAsync({
|
||||
ensureStaticConfigExists(projectDir);
|
||||
await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
|
||||
Log.log('Updated versions in app.json');
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.IOS });
|
||||
const version = versionGetter(exp);
|
||||
await updateNativeVersionsAsync({
|
||||
projectDir,
|
||||
version,
|
||||
version: exp.version,
|
||||
buildNumber: exp.ios?.buildNumber,
|
||||
targets,
|
||||
});
|
||||
@@ -79,7 +73,7 @@ export async function bumpVersionInAppJsonAsync({
|
||||
Log.addNewLineIfNone();
|
||||
if (bumpStrategy === BumpStrategy.APP_VERSION) {
|
||||
const appVersion = IOSConfig.Version.getVersion(exp);
|
||||
await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.IOS });
|
||||
await bumpAppVersionAsync({ appVersion, projectDir, exp });
|
||||
} else {
|
||||
const buildNumber = IOSConfig.Version.getBuildNumber(exp);
|
||||
if (isValidBuildNumber(buildNumber)) {
|
||||
@@ -147,10 +141,8 @@ export async function readShortVersionAsync(
|
||||
validateShortVersion({ shortVersion, workflow });
|
||||
return shortVersion;
|
||||
} else {
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.IOS });
|
||||
const shortVersion = versionGetter(exp);
|
||||
validateShortVersion({ shortVersion, workflow });
|
||||
return shortVersion;
|
||||
validateShortVersion({ shortVersion: exp.version, workflow });
|
||||
return exp.version;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,148 +0,0 @@
|
||||
import { ExpoConfig } from '@expo/config';
|
||||
import { Platform } from '@expo/eas-build-job';
|
||||
|
||||
import { updateAppJsonConfigAsync } from '../appJson';
|
||||
import { bumpAppVersionAsync, getVersionConfigTarget } from '../version';
|
||||
|
||||
jest.mock('../appJson', () => ({
|
||||
__esModule: true,
|
||||
updateAppJsonConfigAsync: jest.fn().mockImplementation(
|
||||
async (
|
||||
{
|
||||
exp,
|
||||
}: {
|
||||
projectDir: string;
|
||||
exp: ExpoConfig;
|
||||
},
|
||||
modifyConfig: (config: any) => void
|
||||
) => {
|
||||
// a mocked implementation that only mutates the config object without writing to disk
|
||||
modifyConfig(exp);
|
||||
}
|
||||
),
|
||||
}));
|
||||
|
||||
describe(bumpAppVersionAsync, () => {
|
||||
const name = 'test';
|
||||
const slug = 'test';
|
||||
const projectDir = '/app';
|
||||
const mockUpdateAppJsonConfigAsync = updateAppJsonConfigAsync as jest.MockedFunction<
|
||||
typeof updateAppJsonConfigAsync
|
||||
>;
|
||||
|
||||
it('should bump expo.version for valid semver', async () => {
|
||||
const appVersion = '1.0.0';
|
||||
const exp: ExpoConfig = {
|
||||
name,
|
||||
slug,
|
||||
version: appVersion,
|
||||
};
|
||||
|
||||
await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.IOS });
|
||||
expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
|
||||
expect(exp.version).toBe('1.0.1');
|
||||
});
|
||||
|
||||
it('should bump expo.android.version if the expo.android.version exists', async () => {
|
||||
const exp: ExpoConfig = {
|
||||
name,
|
||||
slug,
|
||||
version: '0.0.0',
|
||||
android: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '1.0.0',
|
||||
},
|
||||
ios: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '2.0.0',
|
||||
},
|
||||
};
|
||||
|
||||
await bumpAppVersionAsync({ appVersion: '1.0.0', projectDir, exp, platform: Platform.ANDROID });
|
||||
expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
|
||||
expect(exp.version).toBe('0.0.0');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(exp.android.version).toBe('1.0.1');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(exp.ios.version).toBe('2.0.0');
|
||||
});
|
||||
|
||||
it('should bump expo.ios.version if the expo.ios.version exists', async () => {
|
||||
const exp: ExpoConfig = {
|
||||
name,
|
||||
slug,
|
||||
version: '0.0.0',
|
||||
android: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '1.0.0',
|
||||
},
|
||||
ios: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '2.0.0',
|
||||
},
|
||||
};
|
||||
|
||||
await bumpAppVersionAsync({ appVersion: '2.0.0', projectDir, exp, platform: Platform.IOS });
|
||||
expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
|
||||
expect(exp.version).toBe('0.0.0');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(exp.android.version).toBe('1.0.0');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(exp.ios.version).toBe('2.0.1');
|
||||
});
|
||||
});
|
||||
|
||||
describe(getVersionConfigTarget, () => {
|
||||
const exp: ExpoConfig = {
|
||||
name: 'test',
|
||||
slug: 'test',
|
||||
version: '0.0.0',
|
||||
android: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '1.0.0',
|
||||
},
|
||||
ios: {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
version: '2.0.0',
|
||||
},
|
||||
};
|
||||
|
||||
it('should return the correct config target for the android platform', () => {
|
||||
const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
|
||||
exp,
|
||||
platform: Platform.ANDROID,
|
||||
});
|
||||
expect(fieldName).toBe('expo.android.version');
|
||||
expect(versionGetter(exp)).toBe('1.0.0');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(versionUpdater(exp, '3.3.3').android.version).toBe('3.3.3');
|
||||
expect(versionUpdater(exp, '0.0.0').version).toBe('0.0.0');
|
||||
});
|
||||
|
||||
it('should return the correct config target for the ios platform', () => {
|
||||
const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
|
||||
exp,
|
||||
platform: Platform.IOS,
|
||||
});
|
||||
expect(fieldName).toBe('expo.ios.version');
|
||||
expect(versionGetter(exp)).toBe('2.0.0');
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
expect(versionUpdater(exp, '3.3.3').ios.version).toBe('3.3.3');
|
||||
expect(versionUpdater(exp, '0.0.0').version).toBe('0.0.0');
|
||||
});
|
||||
|
||||
it('should return the correct config target for common version', () => {
|
||||
const exp: ExpoConfig = {
|
||||
name: 'test',
|
||||
slug: 'test',
|
||||
version: '0.0.0',
|
||||
};
|
||||
const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
|
||||
exp,
|
||||
platform: Platform.IOS,
|
||||
});
|
||||
expect(fieldName).toBe('expo.version');
|
||||
expect(versionGetter(exp)).toBe('0.0.0');
|
||||
expect(versionUpdater(exp, '3.3.3').version).toBe('3.3.3');
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,4 @@
|
||||
import { ExpoConfig, getConfigFilePaths } from '@expo/config';
|
||||
import { Platform } from '@expo/eas-build-job';
|
||||
import chalk from 'chalk';
|
||||
import nullthrows from 'nullthrows';
|
||||
import semver from 'semver';
|
||||
@@ -19,25 +18,21 @@ export async function bumpAppVersionAsync({
|
||||
appVersion,
|
||||
projectDir,
|
||||
exp,
|
||||
platform,
|
||||
}: {
|
||||
appVersion: string;
|
||||
projectDir: string;
|
||||
exp: ExpoConfig;
|
||||
platform: Platform;
|
||||
}): Promise<void> {
|
||||
const { fieldName, versionUpdater } = getVersionConfigTarget({ exp, platform });
|
||||
|
||||
let bumpedAppVersion: string;
|
||||
if (semver.valid(appVersion)) {
|
||||
bumpedAppVersion = nullthrows(semver.inc(appVersion, 'patch'));
|
||||
Log.log(
|
||||
`Bumping ${chalk.bold(fieldName)} from ${chalk.bold(appVersion)} to ${chalk.bold(
|
||||
`Bumping ${chalk.bold('expo.version')} from ${chalk.bold(appVersion)} to ${chalk.bold(
|
||||
bumpedAppVersion
|
||||
)}`
|
||||
);
|
||||
} else {
|
||||
Log.log(`${chalk.bold(fieldName)} = ${chalk.bold(appVersion)} is not a valid semver`);
|
||||
Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(appVersion)} is not a valid semver`);
|
||||
bumpedAppVersion = (
|
||||
await promptAsync({
|
||||
type: 'text',
|
||||
@@ -47,56 +42,6 @@ export async function bumpAppVersionAsync({
|
||||
).bumpedAppVersion;
|
||||
}
|
||||
await updateAppJsonConfigAsync({ projectDir, exp }, config => {
|
||||
versionUpdater(config, bumpedAppVersion);
|
||||
config.version = bumpedAppVersion;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the target version field from ExpoConfig based on the platform.
|
||||
*/
|
||||
export function getVersionConfigTarget({
|
||||
exp,
|
||||
platform,
|
||||
}: {
|
||||
exp: ExpoConfig;
|
||||
platform: Platform;
|
||||
}): {
|
||||
fieldName: string;
|
||||
versionGetter: (config: ExpoConfig) => string | undefined;
|
||||
versionUpdater: (config: ExpoConfig, version: string) => ExpoConfig;
|
||||
} {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
if (platform === Platform.ANDROID && typeof exp.android?.version === 'string') {
|
||||
return {
|
||||
fieldName: 'expo.android.version',
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
versionGetter: config => config.android?.version,
|
||||
versionUpdater: (config, version) => {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
config.android = { ...config.android, version };
|
||||
return config;
|
||||
},
|
||||
};
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
} else if (platform === Platform.IOS && typeof exp.ios?.version === 'string') {
|
||||
return {
|
||||
fieldName: 'expo.ios.version',
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
versionGetter: config => config.ios?.version,
|
||||
versionUpdater: (config, version) => {
|
||||
// @ts-expect-error: Resolve type errors after upgrading `@expo/config`
|
||||
config.ios = { ...config.ios, version };
|
||||
return config;
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
fieldName: 'expo.version',
|
||||
versionGetter: config => config.version,
|
||||
versionUpdater: (config, version) => {
|
||||
config.version = version;
|
||||
return config;
|
||||
},
|
||||
};
|
||||
}
|
||||
+6
-1
@@ -103,6 +103,8 @@ export async function findProjectRootAsync({
|
||||
}
|
||||
}
|
||||
|
||||
let ranEnsureEasCliIsNotInDependencies = false;
|
||||
|
||||
/**
|
||||
* Determine the project root directory and ensure some constraints about the project setup
|
||||
* like CLI version and dependencies.
|
||||
@@ -113,6 +115,9 @@ export async function findProjectRootAsync({
|
||||
export async function findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
|
||||
const projectDir = await findProjectRootAsync();
|
||||
await applyCliConfigAsync(projectDir);
|
||||
await ensureEasCliIsNotInDependenciesAsync(projectDir);
|
||||
if (!ranEnsureEasCliIsNotInDependencies) {
|
||||
ranEnsureEasCliIsNotInDependencies = true;
|
||||
await ensureEasCliIsNotInDependenciesAsync(projectDir);
|
||||
}
|
||||
return projectDir;
|
||||
}
|
||||
+2
-2
@@ -42,13 +42,13 @@ export async function loadServerSideEnvironmentVariablesAsync({
|
||||
|
||||
if (Object.keys(serverEnvVars).length > 0) {
|
||||
Log.log(
|
||||
`Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
|
||||
`Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
|
||||
serverEnvVars
|
||||
).join(', ')}.`
|
||||
);
|
||||
} else {
|
||||
Log.log(
|
||||
`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
|
||||
`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
|
||||
);
|
||||
}
|
||||
Log.newLine();
|
||||
|
||||
@@ -5,7 +5,6 @@ import { Flags } from '@oclif/core';
|
||||
import chalk from 'chalk';
|
||||
|
||||
import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
|
||||
import { getVersionConfigTarget } from '../../../build/utils/version';
|
||||
import EasCommand from '../../../commandUtils/EasCommand';
|
||||
import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
|
||||
import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
|
||||
@@ -112,7 +111,6 @@ export default class BuildVersionSetView extends EasCommand {
|
||||
: `What version would you like to initialize it with?`;
|
||||
Log.log(currentStateMessage);
|
||||
|
||||
const { versionGetter } = getVersionConfigTarget({ exp, platform });
|
||||
const { version } = await promptAsync({
|
||||
type: platform === Platform.ANDROID ? 'number' : 'text',
|
||||
name: 'version',
|
||||
@@ -126,7 +124,7 @@ export default class BuildVersionSetView extends EasCommand {
|
||||
appId: projectId,
|
||||
platform: toAppPlatform(platform),
|
||||
applicationIdentifier,
|
||||
storeVersion: versionGetter(exp) ?? '1.0.0',
|
||||
storeVersion: exp.version ?? '1.0.0',
|
||||
buildVersion: String(version),
|
||||
runtimeVersion:
|
||||
(await getRuntimeVersionNullableAsync(projectDir, exp, platform)) ?? undefined,
|
||||
|
||||
@@ -120,7 +120,7 @@ export default class BuildVersionSyncView extends EasCommand {
|
||||
const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
|
||||
if (!remoteVersions?.buildVersion) {
|
||||
Log.warn(
|
||||
`Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
|
||||
`Skipping versions sync for ${platformDisplayName}. There are no versions configured on EAS, use "eas build:version:set" or run a build to initialize it.`
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -147,10 +147,10 @@ export default class DeviceDelete extends EasCommand {
|
||||
graphqlClient: ExpoGraphqlClient,
|
||||
chosenDevice: AppleDevice | AppleDeviceQueryResult
|
||||
): Promise<void> {
|
||||
const removalSpinner = ora(`Removing Apple device on Expo`).start();
|
||||
const removalSpinner = ora(`Removing Apple device on EAS`).start();
|
||||
try {
|
||||
await AppleDeviceMutation.deleteAppleDeviceAsync(graphqlClient, chosenDevice.id);
|
||||
removalSpinner.succeed('Removed Apple device from Expo');
|
||||
removalSpinner.succeed('Removed Apple device from EAS');
|
||||
} catch (err) {
|
||||
removalSpinner.fail();
|
||||
throw err;
|
||||
|
||||
@@ -105,12 +105,12 @@ export default class DeviceRename extends EasCommand {
|
||||
chosenDevice: AppleDevice | AppleDeviceQueryResult,
|
||||
newDeviceName: string
|
||||
): Promise<void> {
|
||||
const removalSpinner = ora(`Renaming Apple device on Expo`).start();
|
||||
const removalSpinner = ora(`Renaming Apple device on EAS`).start();
|
||||
try {
|
||||
await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
|
||||
name: newDeviceName,
|
||||
});
|
||||
removalSpinner.succeed('Renamed Apple device on Expo');
|
||||
removalSpinner.succeed('Renamed Apple device on EAS');
|
||||
} catch (err) {
|
||||
removalSpinner.fail();
|
||||
throw err;
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ export default class EnvExec extends EasCommand {
|
||||
);
|
||||
} else {
|
||||
Log.log(
|
||||
`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
|
||||
`No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
|
||||
);
|
||||
}
|
||||
Log.newLine();
|
||||
|
||||
@@ -83,11 +83,12 @@ export default class FingerprintCompare extends EasCommand {
|
||||
const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
|
||||
const buildPlatform = buildWithFingerprint.platform;
|
||||
const workflow = workflows[appPlatformToPlatform(buildPlatform)];
|
||||
const isDebug = true;
|
||||
|
||||
const projectFingerprint = await createFingerprintAsync(projectDir, {
|
||||
workflow,
|
||||
platforms: [appPlatformToString(buildPlatform)],
|
||||
debug: true,
|
||||
debug: isDebug,
|
||||
env: undefined,
|
||||
});
|
||||
if (!projectFingerprint) {
|
||||
|
||||
@@ -73,7 +73,7 @@ export default class WorkerAlias extends EasCommand {
|
||||
enableJsonOutput();
|
||||
}
|
||||
|
||||
Log.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
|
||||
Log.warn('EAS Hosting is still in beta and subject to changes.');
|
||||
|
||||
const {
|
||||
getDynamicPrivateProjectConfigAsync,
|
||||
|
||||
@@ -114,7 +114,7 @@ export default class WorkerDeploy extends EasCommand {
|
||||
enableJsonOutput();
|
||||
}
|
||||
|
||||
Log.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
|
||||
Log.warn('EAS Hosting is still in beta and subject to changes.');
|
||||
|
||||
const {
|
||||
getDynamicPrivateProjectConfigAsync,
|
||||
@@ -426,7 +426,7 @@ async function resolveExportedProjectAsync(
|
||||
|
||||
if (!exportDirStat?.isDirectory()) {
|
||||
throw new Error(
|
||||
`No "${flags.exportDir}/" folder found. Prepare your project for deployment with "npx expo export --platform web"`
|
||||
`No "${flags.exportDir}/" folder found. Export your app with "npx expo export --platform web"`
|
||||
);
|
||||
}
|
||||
|
||||
@@ -451,7 +451,8 @@ function logExportedProjectInfo(
|
||||
// Only show the timestamp for exports older than 1 minute
|
||||
if (project.modifiedAt && Date.now() - project.modifiedAt.getTime() > 60_000) {
|
||||
modifiedAgo = ` - exported ${formatTimeAgo(project.modifiedAt)}`;
|
||||
Log.warn(`> Project export: ${project.type}${modifiedAgo}}`);
|
||||
} else {
|
||||
Log.log(chalk`{dim > Project export: ${project.type}}`);
|
||||
}
|
||||
|
||||
Log.log(chalk`{dim > Project export: ${project.type}${modifiedAgo}}`);
|
||||
}
|
||||
@@ -48,7 +48,7 @@ async function collectDataAndRegisterDeviceAsync(
|
||||
}
|
||||
|
||||
const { udid, deviceClass, name } = deviceData;
|
||||
const spinner = ora(`Registering Apple device on Expo`).start();
|
||||
const spinner = ora(`Registering Apple device on EAS`).start();
|
||||
try {
|
||||
await AppleDeviceMutation.createAppleDeviceAsync(
|
||||
graphqlClient,
|
||||
|
||||
@@ -45,7 +45,7 @@ async function collectDataAndRegisterDeviceAsync(
|
||||
): Promise<void> {
|
||||
const { udid, deviceClass, name } = await collectDeviceDataAsync(appleTeam);
|
||||
|
||||
const spinner = ora(`Registering Apple device on Expo`).start();
|
||||
const spinner = ora(`Registering Apple device on EAS`).start();
|
||||
try {
|
||||
await AppleDeviceMutation.createAppleDeviceAsync(
|
||||
graphqlClient,
|
||||
|
||||
+2
-2
@@ -84,13 +84,13 @@ export async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsyn
|
||||
const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
|
||||
const projectLink = link(projectDashboardUrl, { text: projectFullName });
|
||||
|
||||
const spinner = ora(`Creating ${chalk.bold(projectFullName)} on Expo`).start();
|
||||
const spinner = ora(`Creating ${chalk.bold(projectFullName)} on EAS`).start();
|
||||
try {
|
||||
const id = await AppMutation.createAppAsync(graphqlClient, {
|
||||
accountId: account.id,
|
||||
projectName,
|
||||
});
|
||||
spinner.succeed(`Created ${chalk.bold(projectLink)} on Expo`);
|
||||
spinner.succeed(`Created ${chalk.bold(projectLink)} on EAS`);
|
||||
return id;
|
||||
} catch (err) {
|
||||
spinner.fail();
|
||||
|
||||
@@ -923,6 +923,7 @@ export async function maybeCalculateFingerprintForRuntimeVersionInfoObjectsWitho
|
||||
workflow: workflowsByPlatform[platform],
|
||||
projectDir,
|
||||
env,
|
||||
debug: true,
|
||||
};
|
||||
fingerprintOptionsByRuntimeAndPlatform.set(runtimeAndPlatform, options);
|
||||
}
|
||||
|
||||
@@ -42,13 +42,13 @@ function warnAboutServiceOutage(service: StatuspageServiceFragment): void {
|
||||
|
||||
if (service.incidents.length > 0) {
|
||||
const [currentIncident] = service.incidents;
|
||||
Log.warn(`Reason: ${currentIncident.name}`);
|
||||
Log.warn(`Reason: ${currentIncident.name}.`);
|
||||
}
|
||||
|
||||
Log.warn(
|
||||
`All information on service status and incidents available at ${link(
|
||||
'https://status.expo.dev/'
|
||||
)}.`
|
||||
)}`
|
||||
);
|
||||
Log.newLine();
|
||||
}
|
||||
|
||||
@@ -109,8 +109,10 @@ export async function uploadAsync(params: UploadParams): Promise<UploadResult> {
|
||||
return retry(error);
|
||||
}
|
||||
|
||||
const body = await response.json().catch(() => null);
|
||||
const errorMessage = body?.error ?? `Upload of "${filePath}" failed: ${response.statusText}`;
|
||||
const getErrorMessageAsync = async (): Promise<string> => {
|
||||
const body = await response.json().catch(() => null);
|
||||
return body?.error ?? `Upload of "${filePath}" failed: ${response.statusText}`;
|
||||
};
|
||||
|
||||
if (
|
||||
response.status === 408 ||
|
||||
@@ -118,12 +120,12 @@ export async function uploadAsync(params: UploadParams): Promise<UploadResult> {
|
||||
response.status === 429 ||
|
||||
(response.status >= 500 && response.status <= 599)
|
||||
) {
|
||||
return retry(new Error(errorMessage));
|
||||
return retry(new Error(await getErrorMessageAsync()));
|
||||
} else if (response.status === 413) {
|
||||
const message = `Upload of "${filePath}" failed: File size exceeded the upload limit`;
|
||||
throw new Error(message);
|
||||
} else if (!response.ok) {
|
||||
throw new Error(errorMessage);
|
||||
throw new Error(await getErrorMessageAsync());
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
Reference in new issue
Block a user