Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[eas-cli] don't allow to specify custom global version of deprecated expo-cli #2361

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ This is the log of notable changes to EAS CLI and related packages.

- Remove more classic updates code. ([#2357](https://github.com/expo/eas-cli/pull/2357) by [@wschurman](https://github.com/wschurman))
- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2360](https://github.com/expo/eas-cli/pull/2360) by [@expo-bot](https://github.com/expo-bot))
- Don't pass custom global `"expoCli"` version set in `eas.json` to EAS Build process and warn users when setting it. ([#2361](https://github.com/expo/eas-cli/pull/2361) by [@szdziedzic](https://github.com/szdziedzic))

## [8.0.0](https://github.com/expo/eas-cli/releases/tag/v8.0.0) - 2024-05-01

Expand Down
4 changes: 2 additions & 2 deletions packages/eas-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@expo/config": "8.5.4",
"@expo/config-plugins": "7.8.4",
"@expo/config-types": "50.0.0",
"@expo/eas-build-job": "1.0.106",
"@expo/eas-build-job": "1.0.107",
"@expo/eas-json": "8.0.0",
"@expo/json-file": "8.2.37",
"@expo/logger": "1.0.57",
Expand All @@ -28,7 +28,7 @@
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/spawn-async": "1.7.0",
"@expo/steps": "1.0.106",
"@expo/steps": "1.0.107",
"@expo/timeago.js": "1.0.0",
"@oclif/core": "^1.26.2",
"@oclif/plugin-autocomplete": "^2.3.10",
Expand Down
1 change: 0 additions & 1 deletion packages/eas-cli/src/build/android/prepareJob.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export async function prepareJobAsync(
bun: buildProfile.bun,
yarn: buildProfile.yarn,
ndk: buildProfile.ndk,
expoCli: buildProfile.expoCli,
env: buildProfile.env,
},
cache: {
Expand Down
1 change: 0 additions & 1 deletion packages/eas-cli/src/build/ios/prepareJob.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export async function prepareJobAsync(
bundler: buildProfile.bundler,
cocoapods: buildProfile.cocoapods,
fastlane: buildProfile.fastlane,
expoCli: buildProfile.expoCli,
env: buildProfile.env,
},
cache: {
Expand Down
2 changes: 1 addition & 1 deletion packages/eas-json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
"@babel/code-frame": "7.23.5",
"@expo/eas-build-job": "1.0.106",
"@expo/eas-build-job": "1.0.107",
"chalk": "4.1.2",
"env-string": "1.0.1",
"fs-extra": "11.2.0",
Expand Down
5 changes: 0 additions & 5 deletions packages/eas-json/schema/eas.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@
"description": "The version of Bun to use for the build. See: https://bun.sh/",
"markdownDescription": "The exact version of [Bun](https://bun.sh/) to use for the build."
},
"expoCli": {
"type": "string",
"description": "The version of `expo-cli` used to `prebuild` your app.",
"markdownDescription": "Version of [expo-cli](https://www.npmjs.com/package/expo-cli) used to [prebuild](https://docs.expo.dev/workflow/expo-cli/#expo-prebuild) your app. It does not have any effect on bare projects."
},
"env": {
"type": "object",
"description": "Environment variables that should be set during the build process.\n\nShould only be used for values that you would commit to your git repository, i.e. not passwords or secrets.",
Expand Down
3 changes: 3 additions & 0 deletions packages/eas-json/src/build/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ export interface CommonBuildProfile {
pnpm?: string;
bun?: string;
yarn?: string;
/**
* @deprecated
*/
expoCli?: string;

// credentials
Expand Down
10 changes: 10 additions & 0 deletions packages/eas-json/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ export class EasJsonUtils {
});
}

if (buildProfile.expoCli) {
warnings.push({
message: [
`The "build.${profileName}.expoCli" field in eas.json is deprecated and will be removed in the future.`,
`Global Expo CLI is deprecated. Since Expo SDK 46 local Expo CLI shipped with "expo" package is used. Remove this field from eas.json.`,
`Using this field has no effect on EAS Build process.`,
],
});
}

warnings.push(...EasJsonUtils.getCustomPathsDeprecationWarnings(rawEasJson, profileName));

return warnings;
Expand Down
49 changes: 12 additions & 37 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading