Skip to content

Commit 92ad6b5

Browse files
authored
Revert "[eas-cli][build-tools][worker] bump @expo/config and @expo/config-plugins (#3527)" (#3534)
This reverts commit d63d51f.
1 parent d63d51f commit 92ad6b5

8 files changed

Lines changed: 111 additions & 290 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ This is the log of notable changes to EAS CLI and related packages.
1414

1515
### 🧹 Chores
1616

17-
- [eas-cli][build-tools][worker] Bump `@expo/config` and `@expo/config-plugins`. ([#3527](https://github.com/expo/eas-cli/pull/3527) by [@quinlanj](https://github.com/quinlanj))
18-
1917
## [18.4.0](https://github.com/expo/eas-cli/releases/tag/v18.4.0) - 2026-03-16
2018

2119
### 🎉 New features

packages/build-tools/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"test": "yarn jest-unit"
3636
},
3737
"dependencies": {
38-
"@expo/config": "55.0.10",
39-
"@expo/config-plugins": "55.0.7",
38+
"@expo/config": "10.0.6",
39+
"@expo/config-plugins": "9.0.12",
4040
"@expo/downloader": "18.0.1",
4141
"@expo/eas-build-job": "18.4.0",
4242
"@expo/env": "^0.4.0",

packages/eas-cli/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"dependencies": {
4646
"@expo/apple-utils": "2.1.13",
4747
"@expo/code-signing-certificates": "0.0.5",
48-
"@expo/config": "55.0.10",
49-
"@expo/config-plugins": "55.0.7",
48+
"@expo/config": "10.0.6",
49+
"@expo/config-plugins": "9.0.12",
5050
"@expo/eas-build-job": "18.4.0",
5151
"@expo/eas-json": "18.4.0",
5252
"@expo/env": "^1.0.0",

packages/eas-cli/src/build/validate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async function validateAndroidPNGsAsync(ctx: CommonContext<Platform.ANDROID>): P
107107
},
108108
{
109109
configPath: 'exp.notification.icon',
110-
pngPath: (ctx.exp as Record<string, any>).notification?.icon,
110+
pngPath: ctx.exp.notification?.icon,
111111
},
112112
];
113113
await validatePNGsAsync(pngs);

packages/eas-cli/src/project/ios/__tests__/exemptEncryption-test.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@ import { ensureNonExemptEncryptionIsDefinedForManagedProjectAsync } from '../exe
77
jest.mock('fs');
88
jest.mock('../../../prompts');
99

10-
// @expo/require-utils uses require() to load JS configs, which bypasses the
11-
// mocked fs. Override loadModuleSync to read from the mocked fs and evaluate.
12-
jest.mock('@expo/require-utils', () => {
13-
const actual = jest.requireActual('@expo/require-utils');
14-
return {
15-
...actual,
16-
loadModuleSync: (filename: string) => {
17-
const fs = require('fs');
18-
const content = fs.readFileSync(filename, 'utf-8');
19-
const mod = { exports: {} as any };
20-
// eslint-disable-next-line no-new-func
21-
new Function('module', 'exports', content)(mod, mod.exports);
22-
return mod.exports;
23-
},
24-
};
25-
});
26-
2710
beforeEach(async () => {
2811
jest.resetAllMocks();
2912
vol.reset();

packages/worker/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"dependencies": {
2121
"@babel/core": "7.24.7",
2222
"@expo/build-tools": "18.4.0",
23-
"@expo/config-plugins": "55.0.7",
24-
"@expo/config-types": "55.0.5",
23+
"@expo/config-plugins": "8.0.8",
24+
"@expo/config-types": "52.0.1",
2525
"@expo/downloader": "18.0.1",
2626
"@expo/eas-build-job": "18.4.0",
2727
"@expo/logger": "18.0.1",

packages/worker/src/external/analytics.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,10 @@ async function resolveNewArchEnabled(
131131
}
132132

133133
if (
134-
(appConfig?.[job.platform] as unknown as Record<string, unknown>)?.newArchEnabled !==
135-
undefined ||
136-
(appConfig as unknown as Record<string, unknown>).newArchEnabled !== undefined
134+
appConfig?.[job.platform]?.newArchEnabled !== undefined ||
135+
appConfig.newArchEnabled !== undefined
137136
) {
138-
return (
139-
((appConfig?.[job.platform] as unknown as Record<string, unknown>)
140-
?.newArchEnabled as boolean) ??
141-
((appConfig as unknown as Record<string, unknown>).newArchEnabled as boolean)
142-
);
137+
return appConfig?.[job.platform]?.newArchEnabled ?? appConfig.newArchEnabled;
143138
}
144139

145140
if (job.type === Workflow.GENERIC) {
@@ -223,10 +218,7 @@ async function getPackageManagerVersion(
223218
}
224219
): Promise<string | undefined> {
225220
try {
226-
const { stdout } = await spawnAsync(packageManager, ['--version'], {
227-
cwd,
228-
env,
229-
});
221+
const { stdout } = await spawnAsync(packageManager, ['--version'], { cwd, env });
230222
return stdout.toString().trim();
231223
} catch {
232224
// Some package managers can fail version checks in project dirs with mismatched packageManager fields.

0 commit comments

Comments
 (0)