eas-cli 0.33.1 → 0.34.0

package/build/graphql/queries/EnvironmentSecretsQuery.js

@@ -27,7 +27,9 @@ exports.EnvironmentSecretsQuery = {
               }
             }
             ${(0, graphql_1.print)(EnvironmentSecret_1.EnvironmentSecretFragmentNode)}
-          `, { accountName })
+          `, { accountName }, {
+            additionalTypenames: ['EnvironmentSecret'],
+        })
             .toPromise());
         return data.account.byName.environmentSecrets;
     },
@@ -47,7 +49,7 @@ exports.EnvironmentSecretsQuery = {
               }
             }
             ${(0, graphql_1.print)(EnvironmentSecret_1.EnvironmentSecretFragmentNode)}
-          `, { appId })
+          `, { appId }, { additionalTypenames: ['EnvironmentSecret'] })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.environmentSecrets) !== null && _b !== void 0 ? _b : [];
     },

package/build/graphql/queries/ProjectQuery.js

@@ -15,7 +15,9 @@ exports.ProjectQuery = {
                 }
               }
             }
-          `, { username, slug })
+          `, { username, slug }, {
+            additionalTypenames: ['App', 'Snack'] /* typenames that use the Project type*/,
+        })
             .toPromise());
         return data.project.byUsernameAndSlug;
     },

package/build/graphql/queries/PublishQuery.js

@@ -18,7 +18,10 @@ exports.PublishQuery = {
             }
           `, {
             storageKeys,
-        }, { requestPolicy: 'network-only' } // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
+        }, {
+            requestPolicy: 'network-only',
+            additionalTypenames: ['AssetMetadataResult'],
+        } // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
         )
             .toPromise());
         return data.asset.metadata;

package/build/graphql/queries/SubmissionQuery.js

@@ -19,7 +19,10 @@ exports.SubmissionQuery = {
               }
             }
             ${(0, graphql_1.print)(Submission_1.SubmissionFragmentNode)}
-          `, { submissionId }, { requestPolicy: useCache ? 'cache-first' : 'network-only' })
+          `, { submissionId }, {
+            requestPolicy: useCache ? 'cache-first' : 'network-only',
+            additionalTypenames: ['Submission'],
+        })
             .toPromise());
         return data.submissions.byId;
     },
@@ -49,7 +52,7 @@ exports.SubmissionQuery = {
               }
             }
             ${(0, graphql_1.print)(Submission_1.SubmissionFragmentNode)}
-          `, { appId, offset, limit, status, platform })
+          `, { appId, offset, limit, status, platform }, { additionalTypenames: ['Submission'] })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.submissions) !== null && _b !== void 0 ? _b : [];
     },

package/build/graphql/queries/UserQuery.js

@@ -25,7 +25,10 @@ exports.UserQuery = {
                 isExpoAdmin
               }
             }
-          `)
+          `, 
+        /* variables */ undefined, {
+            additionalTypenames: ['User'],
+        })
             .toPromise());
         return data.meActor;
     },

package/build/graphql/queries/WebhookQuery.js

@@ -23,7 +23,9 @@ exports.WebhookQuery = {
               }
             }
             ${(0, graphql_1.print)(Webhook_1.WebhookFragmentNode)}
-          `, { appId, webhookFilter })
+          `, { appId, webhookFilter }, {
+            additionalTypenames: ['Webhook'],
+        })
             .toPromise());
         return (_b = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.webhooks) !== null && _b !== void 0 ? _b : [];
     },
@@ -39,7 +41,9 @@ exports.WebhookQuery = {
               }
             }
             ${(0, graphql_1.print)(Webhook_1.WebhookFragmentNode)}
-          `, { webhookId })
+          `, { webhookId }, {
+            additionalTypenames: ['Webhook'],
+        })
             .toPromise());
         return data.webhook.byId;
     },

package/build/log.d.ts

@@ -11,8 +11,6 @@ export default class Log {
     static succeed(message: string): void;
     static withTick(...args: any[]): void;
     private static consoleLog;
-    private static consoleWarn;
-    private static consoleError;
     private static withTextColor;
     private static isLastLineNewLine;
     private static updateIsLastLineNewLine;

package/build/log.js

@@ -20,10 +20,10 @@ class Log {
         }
     }
     static error(...args) {
-        Log.consoleError(...Log.withTextColor(args, chalk_1.default.red));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.red));
     }
     static warn(...args) {
-        Log.consoleWarn(...Log.withTextColor(args, chalk_1.default.yellow));
+        Log.consoleLog(...Log.withTextColor(args, chalk_1.default.yellow));
     }
     static debug(...args) {
         if (Log.isDebug) {
@@ -47,16 +47,6 @@ class Log {
         // eslint-disable-next-line no-console
         console.log(...args);
     }
-    static consoleWarn(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.warn(...args);
-    }
-    static consoleError(...args) {
-        Log.updateIsLastLineNewLine(args);
-        // eslint-disable-next-line no-console
-        console.error(...args);
-    }
     static withTextColor(args, chalkColor) {
         return args.map(arg => chalkColor(arg));
     }

package/build/project/projectUtils.js

@@ -184,7 +184,7 @@ async function getBranchByNameAsync({ appId, name, }) {
         `, {
         appId,
         name,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return data.app.byId.updateBranchByName;
 }

package/build/project/publish.js

@@ -13,7 +13,7 @@ const PublishMutation_1 = require("../graphql/mutations/PublishMutation");
 const PublishQuery_1 = require("../graphql/queries/PublishQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const uploads_1 = require("../uploads");
-const expoCommand_1 = require("../utils/expoCommand");
+const expoCli_1 = require("../utils/expoCli");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../utils/expodash/uniqBy"));
 exports.TIMEOUT_LIMIT = 60000; // 1 minute
 const fileMetadataJoi = joi_1.default.object({
@@ -108,7 +108,7 @@ async function buildBundlesAsync({ projectDir, inputDir, }) {
         throw new Error('Could not locate package.json');
     }
     log_1.default.withTick(`Building bundle with expo-cli...`);
-    await (0, expoCommand_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle']);
+    await (0, expoCli_1.expoCommandAsync)(projectDir, ['export', '--output-dir', inputDir, '--experimental-bundle']);
 }
 exports.buildBundlesAsync = buildBundlesAsync;
 async function resolveInputDirectoryAsync(customInputDirectory) {

package/build/project/workflow.js

@@ -6,7 +6,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const vcs_1 = require("../vcs");
 async function resolveWorkflowAsync(projectDir, platform) {
     let platformWorkflowMarker;
     try {
@@ -19,7 +19,7 @@ async function resolveWorkflowAsync(projectDir, platform) {
         return eas_build_job_1.Workflow.MANAGED;
     }
     if (await fs_extra_1.default.pathExists(platformWorkflowMarker)) {
-        return (await vcs_1.default.isFileIgnoredAsync(path_1.default.relative(projectDir, platformWorkflowMarker)))
+        return (await (0, vcs_1.getVcsClient)().isFileIgnoredAsync(path_1.default.relative(projectDir, platformWorkflowMarker)))
             ? eas_build_job_1.Workflow.MANAGED
             : eas_build_job_1.Workflow.GENERIC;
     }

package/build/submit/ios/IosSubmitter.js

@@ -65,7 +65,7 @@ class IosSubmitter extends BaseSubmitter_1.default {
         // structuring order affects table rows order
         return {
             ascAppIdentifier,
-            appleIdUsername,
+            appleIdUsername: appleIdUsername !== null && appleIdUsername !== void 0 ? appleIdUsername : undefined,
             projectId,
             ...(ascApiKeyResult
                 ? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }

package/build/user/User.js

@@ -61,6 +61,7 @@ async function loginAsync({ username, password, otp, }) {
                 'expo-session': sessionSecret,
             },
         },
+        additionalTypenames: [] /* UserQuery has immutable fields */,
     })
         .toPromise();
     const { data } = result;

package/build/utils/easCli.d.ts

@@ -0,0 +1 @@
+export declare const easCliVersion: string;

package/build/utils/easCli.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.easCliVersion = void 0;
+const packageJSON = require('../../package.json');
+exports.easCliVersion = packageJSON.version;

package/build/utils/profiles.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProfilesAsync = void 0;
 const tslib_1 = require("tslib");
+const eas_json_1 = require("@expo/eas-json");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 async function getProfilesAsync({ platforms, profileName: profileNameArg, 
 // eslint-disable-next-line async-protect/async-suffix
@@ -14,13 +15,19 @@ readProfileAsync, }) {
                 profile = await readProfileAsync(platform, 'production');
                 profileName = 'production';
             }
-            catch (error) {
+            catch (errorOuter) {
+                if (errorOuter instanceof eas_json_1.errors.InvalidEasJsonError) {
+                    throw errorOuter;
+                }
                 try {
                     profile = await readProfileAsync(platform, 'release');
                     profileName = 'release';
                     log_1.default.warn('The default profile changed from "release" to "production". We detected that you still have a "release" build profile, so we are using it. Update eas.json to have a profile named "production" under the `build` key, or specify which profile you\'d like to use with the --profile flag. This fallback behavior will be removed in the next major version of EAS CLI.');
                 }
-                catch (error) {
+                catch (errorInner) {
+                    if (errorInner instanceof eas_json_1.errors.InvalidEasJsonError) {
+                        throw errorInner;
+                    }
                     throw new Error('There is no profile named "production" in eas.json');
                 }
             }

package/build/vcs/clients/git.d.ts

@@ -0,0 +1,26 @@
+import { Client } from '../vcs';
+export default class GitClient extends Client {
+    ensureRepoExistsAsync(): Promise<void>;
+    commitAsync({ commitMessage, commitAllFiles, }: {
+        commitMessage: string;
+        commitAllFiles?: boolean;
+    }): Promise<void>;
+    isCommitRequiredAsync(): Promise<boolean>;
+    hasUncommittedChangesAsync(): Promise<boolean>;
+    getRootPathAsync(): Promise<string>;
+    makeShallowCopyAsync(destinationPath: string): Promise<void>;
+    getCommitHashAsync(): Promise<string | undefined>;
+    trackFileAsync(file: string): Promise<void>;
+    getBranchNameAsync(): Promise<string | null>;
+    getLastCommitMessageAsync(): Promise<string | null>;
+    showDiffAsync(): Promise<void>;
+    isFileUntrackedAsync(path: string): Promise<boolean>;
+    isFileIgnoredAsync(filePath: string): Promise<boolean>;
+}
+/**
+ * Checks if git is configured to be case sensitive
+ * @returns {boolean | undefined}
+ *    - boolean - is git case sensitive
+ *    - undefined - case sensitivity is not configured and git is using default behavior
+ */
+export declare function isGitCaseSensitiveAsync(): Promise<boolean | undefined>;

package/build/vcs/clients/git.js

@@ -0,0 +1,184 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isGitCaseSensitiveAsync = void 0;
+const tslib_1 = require("tslib");
+const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
+const log_1 = (0, tslib_1.__importStar)(require("../../log"));
+const prompts_1 = require("../../prompts");
+const git_1 = require("../git");
+const vcs_1 = require("../vcs");
+class GitClient extends vcs_1.Client {
+    async ensureRepoExistsAsync() {
+        if (!(await (0, git_1.isGitInstalledAsync)())) {
+            throw new Error('git command not found, install it before proceeding');
+        }
+        if (await (0, git_1.doesGitRepoExistAsync)()) {
+            return;
+        }
+        log_1.default.warn("It looks like you haven't initialized the git repository yet.");
+        log_1.default.warn('EAS Build requires you to use a git repository for your project.');
+        const confirmInit = await (0, prompts_1.confirmAsync)({
+            message: `Would you like us to run 'git init' in the current directory for you?`,
+        });
+        if (!confirmInit) {
+            throw new Error('A git repository is required for building your project. Initialize it and run this command again.');
+        }
+        await (0, spawn_async_1.default)('git', ['init']);
+        log_1.default.log("We're going to make an initial commit for your repository.");
+        const { message } = await (0, prompts_1.promptAsync)({
+            type: 'text',
+            name: 'message',
+            message: 'Commit message:',
+            initial: 'Initial commit',
+            validate: (input) => input !== '',
+        });
+        await this.commitAsync({ commitAllFiles: true, commitMessage: message });
+    }
+    async commitAsync({ commitMessage, commitAllFiles, }) {
+        if (commitAllFiles) {
+            await (0, spawn_async_1.default)('git', ['add', '-A']);
+        }
+        await (0, spawn_async_1.default)('git', ['add', '-u']);
+        await (0, spawn_async_1.default)('git', ['commit', '-m', commitMessage]);
+    }
+    async isCommitRequiredAsync() {
+        return await this.hasUncommittedChangesAsync();
+    }
+    async hasUncommittedChangesAsync() {
+        const changes = await (0, git_1.gitStatusAsync)({ showUntracked: true });
+        return changes.length > 0;
+    }
+    async getRootPathAsync() {
+        return (await (0, spawn_async_1.default)('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
+    }
+    async makeShallowCopyAsync(destinationPath) {
+        if (await this.hasUncommittedChangesAsync()) {
+            // it should already be checked before this function is called, but in case it wasn't
+            // we want to ensure that any changes were introduced by call to `setGitCaseSensitivityAsync`
+            throw new Error('You have some uncommitted changes in your repository.');
+        }
+        let gitRepoUri;
+        if (process.platform === 'win32') {
+            // getRootDirectoryAsync() will return C:/path/to/repo on Windows and path
+            // prefix should be file:///
+            gitRepoUri = `file:///${await this.getRootPathAsync()}`;
+        }
+        else {
+            // getRootDirectoryAsync() will /path/to/repo, and path prefix should be
+            // file:/// so only file:// needs to be prepended
+            gitRepoUri = `file://${await this.getRootPathAsync()}`;
+        }
+        const isCaseSensitive = await isGitCaseSensitiveAsync();
+        await setGitCaseSensitivityAsync(true);
+        try {
+            if (await this.hasUncommittedChangesAsync()) {
+                log_1.default.error('Detected inconsistent filename casing between your local filesystem and git.');
+                log_1.default.error('This will likely cause your build to fail. Impacted files:');
+                await (0, spawn_async_1.default)('git', ['status', '--short'], { stdio: 'inherit' });
+                log_1.default.newLine();
+                log_1.default.error(`Error: Resolve filename casing inconsistencies before proceeding. ${(0, log_1.learnMore)('https://expo.fyi/macos-ignorecase')}`);
+                throw new Error('You have some uncommitted changes in your repository.');
+            }
+            await (0, spawn_async_1.default)('git', [
+                'clone',
+                '--no-hardlinks',
+                '--depth',
+                '1',
+                gitRepoUri,
+                destinationPath,
+            ]);
+        }
+        finally {
+            await setGitCaseSensitivityAsync(isCaseSensitive);
+        }
+    }
+    async getCommitHashAsync() {
+        try {
+            return (await (0, spawn_async_1.default)('git', ['rev-parse', 'HEAD'])).stdout.trim();
+        }
+        catch (err) {
+            return undefined;
+        }
+    }
+    async trackFileAsync(file) {
+        await (0, spawn_async_1.default)('git', ['add', '--intent-to-add', file]);
+    }
+    async getBranchNameAsync() {
+        try {
+            return (await (0, spawn_async_1.default)('git', ['rev-parse', '--abbrev-ref', 'HEAD'])).stdout.trim();
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    async getLastCommitMessageAsync() {
+        try {
+            return (await (0, spawn_async_1.default)('git', ['--no-pager', 'log', '-1', '--pretty=%B'])).stdout.trim();
+        }
+        catch (e) {
+            return null;
+        }
+    }
+    async showDiffAsync() {
+        const outputTooLarge = (await (0, git_1.getGitDiffOutputAsync)()).split(/\r\n|\r|\n/).length > 100;
+        await (0, git_1.gitDiffAsync)({ withPager: outputTooLarge });
+    }
+    async isFileUntrackedAsync(path) {
+        const withUntrackedFiles = await (0, git_1.gitStatusAsync)({ showUntracked: true });
+        const trackedFiles = await (0, git_1.gitStatusAsync)({ showUntracked: false });
+        const pathWithoutLeadingDot = path.replace(/^\.\//, ''); // remove leading './' from path
+        return (withUntrackedFiles.includes(pathWithoutLeadingDot) &&
+            !trackedFiles.includes(pathWithoutLeadingDot));
+    }
+    async isFileIgnoredAsync(filePath) {
+        try {
+            await (0, spawn_async_1.default)('git', ['check-ignore', '-q', filePath]);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+}
+exports.default = GitClient;
+/**
+ * Checks if git is configured to be case sensitive
+ * @returns {boolean | undefined}
+ *    - boolean - is git case sensitive
+ *    - undefined - case sensitivity is not configured and git is using default behavior
+ */
+async function isGitCaseSensitiveAsync() {
+    if (process.platform !== 'darwin') {
+        return undefined;
+    }
+    try {
+        const result = await (0, spawn_async_1.default)('git', ['config', '--get', 'core.ignorecase']);
+        const isIgnoreCaseEnabled = result.stdout.trim();
+        if (isIgnoreCaseEnabled === '') {
+            return undefined;
+        }
+        else if (isIgnoreCaseEnabled === 'true') {
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    catch (e) {
+        return undefined;
+    }
+}
+exports.isGitCaseSensitiveAsync = isGitCaseSensitiveAsync;
+async function setGitCaseSensitivityAsync(enable) {
+    // we are assuming that if someone sets that on non-macos device then
+    // they know what they are doing
+    if (process.platform !== 'darwin') {
+        return;
+    }
+    if (enable === undefined) {
+        await (0, spawn_async_1.default)('git', ['config', '--unset', 'core.ignorecase']);
+    }
+    else {
+        await (0, spawn_async_1.default)('git', ['config', 'core.ignorecase', String(!enable)]);
+    }
+}

package/build/vcs/clients/gitNoCommit.d.ts

@@ -0,0 +1,7 @@
+import GitClient from './git';
+export default class GitNoCommitClient extends GitClient {
+    isCommitRequiredAsync(): Promise<boolean>;
+    getRootPathAsync(): Promise<string>;
+    makeShallowCopyAsync(destinationPath: string): Promise<void>;
+    isFileIgnoredAsync(filePath: string): Promise<boolean>;
+}

package/build/vcs/clients/gitNoCommit.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
+const path_1 = (0, tslib_1.__importDefault)(require("path"));
+const local_1 = require("../local");
+const git_1 = (0, tslib_1.__importDefault)(require("./git"));
+class GitNoCommitClient extends git_1.default {
+    async isCommitRequiredAsync() {
+        return false;
+    }
+    async getRootPathAsync() {
+        return (await (0, spawn_async_1.default)('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
+    }
+    async makeShallowCopyAsync(destinationPath) {
+        // normalize converts C:/some/path to C:\some\path on windows
+        const srcPath = path_1.default.normalize(await this.getRootPathAsync());
+        await (0, local_1.makeShallowCopyAsync)(srcPath, destinationPath);
+    }
+    async isFileIgnoredAsync(filePath) {
+        // normalize converts C:/some/path to C:\some\path on windows
+        const ignore = new local_1.Ignore(await this.getRootPathAsync());
+        await ignore.initIgnoreAsync();
+        return ignore.ignores(filePath);
+    }
+}
+exports.default = GitNoCommitClient;

package/build/vcs/clients/noVcs.d.ts

@@ -0,0 +1,6 @@
+import { Client } from '../vcs';
+export default class NoVcsClient extends Client {
+    getRootPathAsync(): Promise<string>;
+    makeShallowCopyAsync(destinationPath: string): Promise<void>;
+    isFileIgnoredAsync(filePath: string): Promise<boolean>;
+}

package/build/vcs/clients/noVcs.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const local_1 = require("../local");
+const vcs_1 = require("../vcs");
+class NoVcsClient extends vcs_1.Client {
+    async getRootPathAsync() {
+        return (0, local_1.getRootPath)();
+    }
+    async makeShallowCopyAsync(destinationPath) {
+        const srcPath = (0, local_1.getRootPath)();
+        await (0, local_1.makeShallowCopyAsync)(srcPath, destinationPath);
+    }
+    async isFileIgnoredAsync(filePath) {
+        const ignore = new local_1.Ignore((0, local_1.getRootPath)());
+        await ignore.initIgnoreAsync();
+        return ignore.ignores(filePath);
+    }
+}
+exports.default = NoVcsClient;

package/build/vcs/git.d.ts

@@ -1,18 +1,11 @@
-import { Client } from './vcs';
-export default class GitClient extends Client {
-    ensureRepoExistsAsync(): Promise<void>;
-    commitAsync({ commitMessage, commitAllFiles, }: {
-        commitMessage: string;
-        commitAllFiles?: boolean;
-    }): Promise<void>;
-    hasUncommittedChangesAsync(): Promise<boolean>;
-    getRootPathAsync(): Promise<string>;
-    makeShallowCopyAsync(destinationPath: string): Promise<void>;
-    getCommitHashAsync(): Promise<string | undefined>;
-    trackFileAsync(file: string): Promise<void>;
-    getBranchNameAsync(): Promise<string | null>;
-    getLastCommitMessageAsync(): Promise<string | null>;
-    showDiffAsync(): Promise<void>;
-    isFileUntrackedAsync(path: string): Promise<boolean>;
-    isFileIgnoredAsync(filePath: string): Promise<boolean>;
+export declare function isGitInstalledAsync(): Promise<boolean>;
+export declare function doesGitRepoExistAsync(): Promise<boolean>;
+interface GitStatusOptions {
+    showUntracked?: boolean;
 }
+export declare function gitStatusAsync({ showUntracked }?: GitStatusOptions): Promise<string>;
+export declare function getGitDiffOutputAsync(): Promise<string>;
+export declare function gitDiffAsync({ withPager, }?: {
+    withPager?: boolean;
+}): Promise<void>;
+export {};