eas-cli 24.6.0 → 24.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +453 -244
- package/build/build/createContext.js +1 -2
- package/build/build/runBuildAndSubmit.js +4 -1
- package/build/commandUtils/supabase.d.ts +6 -1
- package/build/commandUtils/supabase.js +53 -0
- package/build/commandUtils/workflow/validation.d.ts +1 -0
- package/build/commandUtils/workflow/validation.js +8 -3
- package/build/commands/account/view.js +12 -0
- package/build/commands/integrations/asc/connect.js +3 -0
- package/build/commands/integrations/supabase/advisors.d.ts +16 -0
- package/build/commands/integrations/supabase/advisors.js +153 -0
- package/build/commands/simulator/availability.d.ts +0 -1
- package/build/commands/simulator/availability.js +0 -1
- package/build/commands/simulator/egress.d.ts +0 -1
- package/build/commands/simulator/egress.js +0 -1
- package/build/commands/simulator/events.d.ts +0 -1
- package/build/commands/simulator/events.js +0 -1
- package/build/commands/simulator/exec.d.ts +0 -1
- package/build/commands/simulator/exec.js +0 -1
- package/build/commands/simulator/get.d.ts +0 -1
- package/build/commands/simulator/get.js +0 -1
- package/build/commands/simulator/index.d.ts +2 -1
- package/build/commands/simulator/index.js +29 -11
- package/build/commands/simulator/list.d.ts +0 -1
- package/build/commands/simulator/list.js +0 -1
- package/build/commands/simulator/stop.d.ts +0 -1
- package/build/commands/simulator/stop.js +0 -1
- package/build/commands/submit/internal.d.ts +6 -0
- package/build/commands/submit/internal.js +6 -2
- package/build/credentials/context.js +7 -0
- package/build/credentials/ios/actions/AscApiKeyUtils.d.ts +2 -1
- package/build/credentials/ios/actions/AscApiKeyUtils.js +43 -4
- package/build/credentials/ios/appstore/AppStoreApi.d.ts +5 -0
- package/build/credentials/ios/appstore/AppStoreApi.js +18 -9
- package/build/credentials/ios/appstore/authenticate.d.ts +6 -0
- package/build/credentials/ios/appstore/authenticate.js +22 -1
- package/build/credentials/ios/appstore/resolveCredentials.js +16 -4
- package/build/devices/actions/create/developerPortalMethod.js +1 -1
- package/build/env.d.ts +4 -0
- package/build/env.js +4 -0
- package/build/fetch.js +2 -2
- package/build/graphql/generated.d.ts +178 -3
- package/build/graphql/generated.js +14 -2
- package/build/graphql/queries/DeviceRunSessionQuery.js +5 -0
- package/build/graphql/queries/SupabaseQuery.d.ts +2 -1
- package/build/graphql/queries/SupabaseQuery.js +42 -0
- package/build/graphql/queries/WorkflowJobSshQuery.d.ts +1 -0
- package/build/graphql/queries/WorkflowJobSshQuery.js +43 -0
- package/build/graphql/types/SupabaseConnection.d.ts +9 -2
- package/build/graphql/types/SupabaseConnection.js +16 -1
- package/build/integrations/asc/ascApiKey.js +2 -1
- package/build/integrations/shared/envFile.js +5 -3
- package/build/integrations/supabase/provision.d.ts +2 -2
- package/build/integrations/supabase/provision.js +6 -4
- package/build/metadata/auth.js +4 -4
- package/build/simulator/utils.d.ts +7 -6
- package/build/simulator/utils.js +34 -13
- package/build/submit/ios/AscApiKeySource.js +1 -1
- package/build/submit/ios/IosSubmitCommand.js +2 -2
- package/build/submit/ios/ensureTestFlightSetup.js +1 -4
- package/build/worker/upload.js +2 -2
- package/oclif.manifest.json +1166 -1062
- package/package.json +9 -8
- package/build/commandUtils/new/templates/CLAUDE.md +0 -1
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SupabaseProjectFragmentNode = exports.SupabaseConnectionFragmentNode = void 0;
|
|
3
|
+
exports.SupabaseAdvisorLintFragmentNode = exports.SupabaseProjectFragmentNode = exports.SupabaseConnectionFragmentNode = exports.SupabaseAdvisorType = exports.SupabaseAdvisorLintLevel = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
|
|
6
|
+
var generated_1 = require("../generated");
|
|
7
|
+
Object.defineProperty(exports, "SupabaseAdvisorLintLevel", { enumerable: true, get: function () { return generated_1.SupabaseAdvisorLintLevel; } });
|
|
8
|
+
Object.defineProperty(exports, "SupabaseAdvisorType", { enumerable: true, get: function () { return generated_1.SupabaseAdvisorType; } });
|
|
6
9
|
exports.SupabaseConnectionFragmentNode = (0, graphql_tag_1.default) `
|
|
7
10
|
fragment SupabaseConnectionFragment on SupabaseConnection {
|
|
8
11
|
id
|
|
@@ -23,3 +26,15 @@ exports.SupabaseProjectFragmentNode = (0, graphql_tag_1.default) `
|
|
|
23
26
|
updatedAt
|
|
24
27
|
}
|
|
25
28
|
`;
|
|
29
|
+
exports.SupabaseAdvisorLintFragmentNode = (0, graphql_tag_1.default) `
|
|
30
|
+
fragment SupabaseAdvisorLintFragment on SupabaseAdvisorLint {
|
|
31
|
+
name
|
|
32
|
+
title
|
|
33
|
+
level
|
|
34
|
+
description
|
|
35
|
+
detail
|
|
36
|
+
entity
|
|
37
|
+
remediation
|
|
38
|
+
cacheKey
|
|
39
|
+
}
|
|
40
|
+
`;
|
|
@@ -4,7 +4,8 @@ exports.selectOrCreateAscApiKeyIdAsync = selectOrCreateAscApiKeyIdAsync;
|
|
|
4
4
|
const prompts_1 = require("../../prompts");
|
|
5
5
|
const AscApiKeyUtils_1 = require("../../credentials/ios/actions/AscApiKeyUtils");
|
|
6
6
|
async function selectOrCreateAscApiKeyIdAsync({ credentialsContext, existingKeys, ownerAccount, }) {
|
|
7
|
-
|
|
7
|
+
// Individual API keys are not supported for the ASC connection yet.
|
|
8
|
+
const sortedKeys = (0, AscApiKeyUtils_1.sortAscApiKeysByUpdatedAtDesc)((0, AscApiKeyUtils_1.filterOutIndividualAscApiKeys)(existingKeys));
|
|
8
9
|
const createKeyOption = {
|
|
9
10
|
title: '[Create or upload a new API key]',
|
|
10
11
|
value: '__create_new_key__',
|
|
@@ -54,12 +54,14 @@ function mergeEnvContent(rawContent, newVars) {
|
|
|
54
54
|
let match;
|
|
55
55
|
while ((match = regex.exec(rawContent)) !== null) {
|
|
56
56
|
const key = match[1];
|
|
57
|
-
|
|
57
|
+
const indices = match.indices;
|
|
58
|
+
const keyRange = indices?.[1];
|
|
59
|
+
if (!Object.hasOwn(newVars, key) || !indices || !keyRange) {
|
|
58
60
|
continue;
|
|
59
61
|
}
|
|
60
62
|
// match[0] runs past the value onto a following comment line, so spans come from the groups.
|
|
61
|
-
const [keyStart, keyEnd] =
|
|
62
|
-
const valueRange =
|
|
63
|
+
const [keyStart, keyEnd] = keyRange;
|
|
64
|
+
const valueRange = indices[2];
|
|
63
65
|
const definitionEnd = valueRange
|
|
64
66
|
? valueRange[1] - (/\s+$/.exec(match[2])?.[0].length ?? 0)
|
|
65
67
|
: keyEnd + (/^[ \t]*(?:=[ \t]*|:[ \t]+)/.exec(rawContent.slice(keyEnd))?.[0].length ?? 0);
|
|
@@ -24,9 +24,9 @@ export declare function pollProvisionReceiptAsync(graphqlClient: ExpoGraphqlClie
|
|
|
24
24
|
export declare function authorizeViaBrowserAsync(graphqlClient: ExpoGraphqlClient, account: {
|
|
25
25
|
id: string;
|
|
26
26
|
name: string;
|
|
27
|
-
}, nonInteractive: boolean): Promise<SupabaseConnectionData>;
|
|
27
|
+
}, nonInteractive: boolean, previousUpdatedAt?: string): Promise<SupabaseConnectionData>;
|
|
28
28
|
export declare function loadOrganizationsBestEffortAsync(graphqlClient: ExpoGraphqlClient, accountId: string): Promise<SupabaseOrganizationData[] | null>;
|
|
29
|
-
export declare function pollForConnectionAsync(graphqlClient: ExpoGraphqlClient, accountId: string): Promise<SupabaseConnectionData>;
|
|
29
|
+
export declare function pollForConnectionAsync(graphqlClient: ExpoGraphqlClient, accountId: string, previousUpdatedAt?: string): Promise<SupabaseConnectionData>;
|
|
30
30
|
export declare function resolvePublishableKeyAsync(graphqlClient: ExpoGraphqlClient, appId: string, project: SupabaseProjectData): Promise<string>;
|
|
31
31
|
export declare function resolveRegionAsync(flagValue: string | undefined, nonInteractive: boolean): Promise<string>;
|
|
32
32
|
export declare function resolveOrganizationAsync(graphqlClient: ExpoGraphqlClient, accountId: string, connection: SupabaseConnectionData, organizationFlag: string | undefined, nonInteractive: boolean, preloadedOrganizations: SupabaseOrganizationData[] | null): Promise<SupabaseConnectionData>;
|
|
@@ -101,7 +101,7 @@ async function pollProvisionReceiptAsync(graphqlClient, receipt, { startMessage,
|
|
|
101
101
|
throw toProvisionPollError(error, { hint: failureHint });
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
async function authorizeViaBrowserAsync(graphqlClient, account, nonInteractive) {
|
|
104
|
+
async function authorizeViaBrowserAsync(graphqlClient, account, nonInteractive, previousUpdatedAt) {
|
|
105
105
|
if (nonInteractive) {
|
|
106
106
|
throw new Error(`Connecting Supabase requires approving access in a browser, which isn't possible in non-interactive mode. Re-run \`eas integrations:supabase:connect\` interactively.`);
|
|
107
107
|
}
|
|
@@ -114,7 +114,7 @@ async function authorizeViaBrowserAsync(graphqlClient, account, nonInteractive)
|
|
|
114
114
|
void (0, better_opn_1.default)(url).catch(() => false);
|
|
115
115
|
const spinner = (0, ora_1.ora)('Waiting for you to authorize in Supabase (up to 15 minutes; press Ctrl-C to cancel)').start();
|
|
116
116
|
try {
|
|
117
|
-
const connection = await pollForConnectionAsync(graphqlClient, account.id);
|
|
117
|
+
const connection = await pollForConnectionAsync(graphqlClient, account.id, previousUpdatedAt);
|
|
118
118
|
const organizations = await loadOrganizationsBestEffortAsync(graphqlClient, account.id);
|
|
119
119
|
spinner.succeed(`Connected Supabase organization ${chalk_1.default.bold((0, supabase_1.formatSupabaseOrganization)(connection, organizations ?? undefined))}`);
|
|
120
120
|
return connection;
|
|
@@ -132,7 +132,7 @@ async function loadOrganizationsBestEffortAsync(graphqlClient, accountId) {
|
|
|
132
132
|
return null;
|
|
133
133
|
}
|
|
134
134
|
}
|
|
135
|
-
async function pollForConnectionAsync(graphqlClient, accountId) {
|
|
135
|
+
async function pollForConnectionAsync(graphqlClient, accountId, previousUpdatedAt) {
|
|
136
136
|
const deadline = Date.now() + CONNECTION_POLL_TIMEOUT_MS;
|
|
137
137
|
let consecutiveErrors = 0;
|
|
138
138
|
for (;;) {
|
|
@@ -150,7 +150,9 @@ async function pollForConnectionAsync(graphqlClient, accountId) {
|
|
|
150
150
|
throw error;
|
|
151
151
|
}
|
|
152
152
|
}
|
|
153
|
-
|
|
153
|
+
// Reauthorization updates the existing connection; its presence alone is not completion.
|
|
154
|
+
if (connection &&
|
|
155
|
+
(previousUpdatedAt === undefined || connection.updatedAt !== previousUpdatedAt)) {
|
|
154
156
|
return connection;
|
|
155
157
|
}
|
|
156
158
|
if (Date.now() >= deadline) {
|
package/build/metadata/auth.js
CHANGED
|
@@ -28,9 +28,9 @@ async function resolveAppStoreBundleIdentifierAsync(projectDir, profile, exp, vc
|
|
|
28
28
|
*/
|
|
29
29
|
async function tryResolveAscApiKeyAsync({ profile, graphqlClient, projectId, exp, bundleId, }) {
|
|
30
30
|
// 1. Check submit profile for ASC API key fields
|
|
31
|
-
if ('ascApiKeyPath' in profile && '
|
|
31
|
+
if ('ascApiKeyPath' in profile && 'ascApiKeyId' in profile) {
|
|
32
32
|
const { ascApiKeyPath, ascApiKeyIssuerId, ascApiKeyId } = profile;
|
|
33
|
-
if (ascApiKeyPath &&
|
|
33
|
+
if (ascApiKeyPath && ascApiKeyId) {
|
|
34
34
|
const keyP8 = await fs_1.default.promises.readFile(ascApiKeyPath, 'utf-8');
|
|
35
35
|
// Also try to get teamId from the profile if available
|
|
36
36
|
const teamId = 'appleTeamId' in profile ? profile.appleTeamId : undefined;
|
|
@@ -112,8 +112,8 @@ async function getAppStoreAuthAsync({ projectDir, profile, exp, credentialsCtx,
|
|
|
112
112
|
}
|
|
113
113
|
if (nonInteractive) {
|
|
114
114
|
throw new Error('No App Store Connect API Key found. In non-interactive mode, provide one via:\n' +
|
|
115
|
-
' - Environment variables: EXPO_ASC_API_KEY_PATH, EXPO_ASC_KEY_ID, EXPO_ASC_ISSUER_ID\n' +
|
|
116
|
-
' - eas.json submit profile: ascApiKeyPath, ascApiKeyId, ascApiKeyIssuerId\n' +
|
|
115
|
+
' - Environment variables: EXPO_ASC_API_KEY_PATH, EXPO_ASC_KEY_ID, EXPO_ASC_ISSUER_ID (omit the issuer ID for individual API keys)\n' +
|
|
116
|
+
' - eas.json submit profile: ascApiKeyPath, ascApiKeyId, ascApiKeyIssuerId (omit the issuer ID for individual API keys)\n' +
|
|
117
117
|
' - EAS credentials service: run `eas credentials` to set up an API key');
|
|
118
118
|
}
|
|
119
119
|
// Fall back to interactive cookie auth
|
|
@@ -72,14 +72,15 @@ export declare function getLocalEgressEnvironmentVariables(egress: LocalEgressCo
|
|
|
72
72
|
export declare function getRemoteSessionEnvironmentVariables(remoteConfig: DeviceRunSessionRemoteConfig, { egressAllow }?: LocalEgressOptions): Record<string, string>;
|
|
73
73
|
type RemoteSessionInstructionsConfigType = 'env' | 'dotenv';
|
|
74
74
|
/**
|
|
75
|
-
* Preview link for a session. A gated
|
|
76
|
-
* a header on a page load
|
|
75
|
+
* Preview link for a session. A gated preview needs the session token, and a browser cannot send
|
|
76
|
+
* a header on a page load. The expo.dev preview page reads it from the fragment, which no request
|
|
77
|
+
* carries; a preview server reads it from the query and swaps it for a cookie on the first load.
|
|
77
78
|
*/
|
|
78
|
-
export declare function formatPreviewUrl(url: string, token: string | null | undefined): string;
|
|
79
|
+
export declare function formatPreviewUrl(remoteConfig: DeviceRunSessionRemoteConfig, url: string, token: string | null | undefined): string;
|
|
79
80
|
/**
|
|
80
|
-
* Remote config for `--json`.
|
|
81
|
-
*
|
|
82
|
-
*
|
|
81
|
+
* Remote config for `--json`. Both URLs carry the token and the standalone token field is dropped,
|
|
82
|
+
* so a consumer gets URLs that work rather than bare URLs that 401 next to a secret it has to know
|
|
83
|
+
* to combine.
|
|
83
84
|
*/
|
|
84
85
|
export declare function sanitizeRemoteConfigForJson(remoteConfig: DeviceRunSessionRemoteConfig): DeviceRunSessionRemoteConfig;
|
|
85
86
|
export declare function formatRemoteSessionInstructions(remoteConfig: DeviceRunSessionRemoteConfig, configType: RemoteSessionInstructionsConfigType, { egressAllow, egressClientRunsInline, sessionUrl }?: LocalEgressOptions): string;
|
package/build/simulator/utils.js
CHANGED
|
@@ -142,11 +142,23 @@ function getControllerEnvironmentVariables(remoteConfig) {
|
|
|
142
142
|
return {};
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
+
function previewUrlIsWebsitePage(remoteConfig) {
|
|
146
|
+
return remoteConfig.previewApiUrl != null;
|
|
147
|
+
}
|
|
145
148
|
/**
|
|
146
|
-
* Preview link for a session. A gated
|
|
147
|
-
* a header on a page load
|
|
149
|
+
* Preview link for a session. A gated preview needs the session token, and a browser cannot send
|
|
150
|
+
* a header on a page load. The expo.dev preview page reads it from the fragment, which no request
|
|
151
|
+
* carries; a preview server reads it from the query and swaps it for a cookie on the first load.
|
|
148
152
|
*/
|
|
149
|
-
function formatPreviewUrl(url, token) {
|
|
153
|
+
function formatPreviewUrl(remoteConfig, url, token) {
|
|
154
|
+
if (!token || !previewUrlIsWebsitePage(remoteConfig)) {
|
|
155
|
+
return formatPreviewApiUrl(url, token);
|
|
156
|
+
}
|
|
157
|
+
const withToken = new URL(url);
|
|
158
|
+
withToken.hash = new URLSearchParams({ token }).toString();
|
|
159
|
+
return withToken.toString();
|
|
160
|
+
}
|
|
161
|
+
function formatPreviewApiUrl(url, token) {
|
|
150
162
|
if (!token) {
|
|
151
163
|
return url;
|
|
152
164
|
}
|
|
@@ -155,16 +167,22 @@ function formatPreviewUrl(url, token) {
|
|
|
155
167
|
return withToken.toString();
|
|
156
168
|
}
|
|
157
169
|
/**
|
|
158
|
-
* Remote config for `--json`.
|
|
159
|
-
*
|
|
160
|
-
*
|
|
170
|
+
* Remote config for `--json`. Both URLs carry the token and the standalone token field is dropped,
|
|
171
|
+
* so a consumer gets URLs that work rather than bare URLs that 401 next to a secret it has to know
|
|
172
|
+
* to combine.
|
|
161
173
|
*/
|
|
162
174
|
function sanitizeRemoteConfigForJson(remoteConfig) {
|
|
163
175
|
switch (remoteConfig.__typename) {
|
|
164
176
|
case 'ServeSimRunSessionRemoteConfig':
|
|
165
177
|
case 'WebPreviewOnlyRunSessionRemoteConfig': {
|
|
166
178
|
const { previewToken, ...rest } = remoteConfig;
|
|
167
|
-
return {
|
|
179
|
+
return {
|
|
180
|
+
...rest,
|
|
181
|
+
previewUrl: formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, previewToken),
|
|
182
|
+
previewApiUrl: remoteConfig.previewApiUrl
|
|
183
|
+
? formatPreviewApiUrl(remoteConfig.previewApiUrl, previewToken)
|
|
184
|
+
: remoteConfig.previewApiUrl,
|
|
185
|
+
};
|
|
168
186
|
}
|
|
169
187
|
case 'AgentDeviceRunSessionRemoteConfig':
|
|
170
188
|
case 'ArgentRunSessionRemoteConfig':
|
|
@@ -173,8 +191,11 @@ function sanitizeRemoteConfigForJson(remoteConfig) {
|
|
|
173
191
|
return {
|
|
174
192
|
...rest,
|
|
175
193
|
webPreviewUrl: remoteConfig.webPreviewUrl
|
|
176
|
-
? formatPreviewUrl(remoteConfig.webPreviewUrl, webPreviewToken)
|
|
194
|
+
? formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, webPreviewToken)
|
|
177
195
|
: remoteConfig.webPreviewUrl,
|
|
196
|
+
previewApiUrl: remoteConfig.previewApiUrl
|
|
197
|
+
? formatPreviewApiUrl(remoteConfig.previewApiUrl, webPreviewToken)
|
|
198
|
+
: remoteConfig.previewApiUrl,
|
|
178
199
|
};
|
|
179
200
|
}
|
|
180
201
|
}
|
|
@@ -228,7 +249,7 @@ function formatControllerInstructions(remoteConfig, configType) {
|
|
|
228
249
|
...Object.entries(environmentVariables).map(([key, value]) => `export ${key}='${value}'`),
|
|
229
250
|
];
|
|
230
251
|
if (remoteConfig.webPreviewUrl) {
|
|
231
|
-
lines.push('', '🌐 Open the following URL in your browser to preview the simulator:', '', formatPreviewUrl(remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
252
|
+
lines.push('', '🌐 Open the following URL in your browser to preview the simulator:', '', formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
232
253
|
}
|
|
233
254
|
return lines.join('\n');
|
|
234
255
|
}
|
|
@@ -258,7 +279,7 @@ function formatControllerInstructions(remoteConfig, configType) {
|
|
|
258
279
|
...Object.entries(environmentVariables).map(([key, value]) => `export ${key}='${value}'`),
|
|
259
280
|
];
|
|
260
281
|
if (remoteConfig.webPreviewUrl) {
|
|
261
|
-
lines.push('', '🌐 Open the following URL in your browser to preview the simulator:', '', formatPreviewUrl(remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
282
|
+
lines.push('', '🌐 Open the following URL in your browser to preview the simulator:', '', formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
262
283
|
}
|
|
263
284
|
return lines.join('\n');
|
|
264
285
|
}
|
|
@@ -278,7 +299,7 @@ function formatControllerInstructions(remoteConfig, configType) {
|
|
|
278
299
|
'<appium-client> [args...]',
|
|
279
300
|
];
|
|
280
301
|
if (remoteConfig.webPreviewUrl) {
|
|
281
|
-
lines.push('', 'Open the simulator preview:', '', formatPreviewUrl(remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
302
|
+
lines.push('', 'Open the simulator preview:', '', formatPreviewUrl(remoteConfig, remoteConfig.webPreviewUrl, remoteConfig.webPreviewToken));
|
|
282
303
|
}
|
|
283
304
|
return lines.join('\n');
|
|
284
305
|
}
|
|
@@ -286,13 +307,13 @@ function formatControllerInstructions(remoteConfig, configType) {
|
|
|
286
307
|
return [
|
|
287
308
|
'🌐 Open the following URL in your browser to access the simulator:',
|
|
288
309
|
'',
|
|
289
|
-
formatPreviewUrl(remoteConfig.previewUrl, remoteConfig.previewToken),
|
|
310
|
+
formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, remoteConfig.previewToken),
|
|
290
311
|
].join('\n');
|
|
291
312
|
case 'WebPreviewOnlyRunSessionRemoteConfig':
|
|
292
313
|
return [
|
|
293
314
|
'🌐 Open the following URL in your browser to access the simulator:',
|
|
294
315
|
'',
|
|
295
|
-
formatPreviewUrl(remoteConfig.previewUrl, remoteConfig.previewToken),
|
|
316
|
+
formatPreviewUrl(remoteConfig, remoteConfig.previewUrl, remoteConfig.previewToken),
|
|
296
317
|
].join('\n');
|
|
297
318
|
}
|
|
298
319
|
}
|
|
@@ -107,7 +107,7 @@ async function handlePathSourceAsync(ctx, source) {
|
|
|
107
107
|
return source.path;
|
|
108
108
|
}
|
|
109
109
|
async function handlePromptSourceAsync(ctx, _source) {
|
|
110
|
-
const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyPathAsync)(ctx.credentialsCtx);
|
|
110
|
+
const ascApiKeyPath = await (0, AscApiKeyUtils_1.promptForAscApiKeyPathAsync)(ctx.credentialsCtx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
|
|
111
111
|
return await getAscApiKeyPathAsync(ctx, {
|
|
112
112
|
sourceType: AscApiKeySourceType.path,
|
|
113
113
|
path: ascApiKeyPath,
|
|
@@ -101,7 +101,7 @@ class IosSubmitCommand {
|
|
|
101
101
|
}
|
|
102
102
|
resolveAscApiKeySource() {
|
|
103
103
|
const { ascApiKeyPath, ascApiKeyIssuerId, ascApiKeyId } = this.ctx.profile;
|
|
104
|
-
if (ascApiKeyPath &&
|
|
104
|
+
if (ascApiKeyPath && ascApiKeyId) {
|
|
105
105
|
return (0, results_1.result)({
|
|
106
106
|
sourceType: AscApiKeySource_1.AscApiKeySourceType.path,
|
|
107
107
|
path: {
|
|
@@ -113,7 +113,7 @@ class IosSubmitCommand {
|
|
|
113
113
|
}
|
|
114
114
|
// interpret this to mean the user had some intention of passing in ASC Api key
|
|
115
115
|
if (ascApiKeyPath || ascApiKeyIssuerId || ascApiKeyId) {
|
|
116
|
-
const message = `ascApiKeyPath
|
|
116
|
+
const message = `ascApiKeyPath and ascApiKeyId must both be defined in eas.json (ascApiKeyIssuerId is also required unless the key is an individual API key)`;
|
|
117
117
|
// in non-interactive mode, we should fail
|
|
118
118
|
if (this.ctx.nonInteractive) {
|
|
119
119
|
throw new Error(message);
|
|
@@ -32,10 +32,7 @@ async function ensureTestFlightSetupForExistingAppAsync(ctx, ascAppIdentifier) {
|
|
|
32
32
|
const teamType = (0, resolveCredentials_1.resolveAppleTeamTypeFromEnvironment)() ?? authenticateTypes_1.AppleTeamType.COMPANY_OR_ORGANIZATION;
|
|
33
33
|
if ((0, resolveCredentials_1.hasAscEnvVars)()) {
|
|
34
34
|
const teamId = process.env.EXPO_APPLE_TEAM_ID;
|
|
35
|
-
if (!process.env.EXPO_ASC_API_KEY_PATH ||
|
|
36
|
-
!process.env.EXPO_ASC_KEY_ID ||
|
|
37
|
-
!process.env.EXPO_ASC_ISSUER_ID ||
|
|
38
|
-
!teamId) {
|
|
35
|
+
if (!process.env.EXPO_ASC_API_KEY_PATH || !process.env.EXPO_ASC_KEY_ID || !teamId) {
|
|
39
36
|
log_1.default.log('App Store Connect credentials are incomplete, skipping TestFlight setup');
|
|
40
37
|
return;
|
|
41
38
|
}
|
package/build/worker/upload.js
CHANGED
|
@@ -7,7 +7,7 @@ exports.createProgressBar = createProgressBar;
|
|
|
7
7
|
const tslib_1 = require("tslib");
|
|
8
8
|
const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
|
|
9
9
|
const https = tslib_1.__importStar(require("https"));
|
|
10
|
-
const https_proxy_agent_1 =
|
|
10
|
+
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
11
11
|
const node_fetch_1 = tslib_1.__importStar(require("node-fetch"));
|
|
12
12
|
const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
|
|
13
13
|
const node_os_1 = tslib_1.__importDefault(require("node:os"));
|
|
@@ -47,7 +47,7 @@ const getAgent = () => {
|
|
|
47
47
|
return sharedAgent;
|
|
48
48
|
}
|
|
49
49
|
else if (process.env.https_proxy) {
|
|
50
|
-
return (sharedAgent =
|
|
50
|
+
return (sharedAgent = new https_proxy_agent_1.HttpsProxyAgent(process.env.https_proxy));
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
53
|
return (sharedAgent = new https.Agent({
|