eas-cli 14.7.0 → 15.0.0

package/build/graphql/types/Update.js

@@ -41,6 +41,7 @@ exports.UpdateFragmentNode = (0, graphql_tag_1.default) `
     fingerprint {
       id
       hash
+      debugInfoUrl
       source {
         type
         bucketKey

package/build/project/ios/exemptEncryption.js

@@ -10,7 +10,8 @@ const prompts_1 = require("../../prompts");
 async function ensureNonExemptEncryptionIsDefinedForManagedProjectAsync({ projectDir, exp, nonInteractive, }) {
     // TODO: We could add bare workflow support in the future.
     // TODO: We could add wizard support for non-exempt encryption in the future.
-    if (exp.ios?.infoPlist?.ITSAppUsesNonExemptEncryption == null) {
+    const ITSAppUsesNonExemptEncryption = exp.ios?.infoPlist?.ITSAppUsesNonExemptEncryption ?? exp.ios?.config?.usesNonExemptEncryption;
+    if (ITSAppUsesNonExemptEncryption == null) {
         await configureNonExemptEncryptionAsync({
             projectDir,
             exp,

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

@@ -1,17 +1,21 @@
 import { Client } from '../vcs';
 export default class GitClient extends Client {
     private readonly maybeCwdOverride?;
-    constructor(maybeCwdOverride?: string | undefined);
+    requireCommit: boolean;
+    constructor(options: {
+        maybeCwdOverride?: string;
+        requireCommit: boolean;
+    });
     ensureRepoExistsAsync(): Promise<void>;
     commitAsync({ commitMessage, commitAllFiles, nonInteractive, }: {
         commitMessage: string;
         commitAllFiles?: boolean;
         nonInteractive: boolean;
     }): Promise<void>;
-    isCommitRequiredAsync(): Promise<boolean>;
     showChangedFilesAsync(): Promise<void>;
     hasUncommittedChangesAsync(): Promise<boolean>;
     getRootPathAsync(): Promise<string>;
+    isCommitRequiredAsync(): Promise<boolean>;
     makeShallowCopyAsync(destinationPath: string): Promise<void>;
     getCommitHashAsync(): Promise<string | undefined>;
     trackFileAsync(file: string): Promise<void>;

package/build/vcs/clients/git.js

@@ -6,17 +6,21 @@ const PackageManagerUtils = tslib_1.__importStar(require("@expo/package-manager"
 const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const prompts_1 = require("../../prompts");
 const git_1 = require("../git");
+const local_1 = require("../local");
 const vcs_1 = require("../vcs");
 class GitClient extends vcs_1.Client {
     maybeCwdOverride;
-    constructor(maybeCwdOverride) {
+    requireCommit;
+    constructor(options) {
         super();
-        this.maybeCwdOverride = maybeCwdOverride;
+        this.maybeCwdOverride = options.maybeCwdOverride;
+        this.requireCommit = options.requireCommit;
     }
     async ensureRepoExistsAsync() {
         try {
@@ -84,9 +88,6 @@ class GitClient extends vcs_1.Client {
             throw err;
         }
     }
-    async isCommitRequiredAsync() {
-        return await this.hasUncommittedChangesAsync();
-    }
     async showChangedFilesAsync() {
         const gitStatusOutput = await (0, git_1.gitStatusAsync)({
             showUntracked: true,
@@ -103,44 +104,61 @@ class GitClient extends vcs_1.Client {
             cwd: this.maybeCwdOverride,
         })).stdout.trim();
     }
+    async isCommitRequiredAsync() {
+        if (!this.requireCommit) {
+            return false;
+        }
+        return await this.hasUncommittedChangesAsync();
+    }
     async makeShallowCopyAsync(destinationPath) {
-        if (await this.hasUncommittedChangesAsync()) {
+        if (await this.isCommitRequiredAsync()) {
             // 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.');
         }
+        const rootPath = await this.getRootPathAsync();
         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()}`;
+            gitRepoUri = `file:///${rootPath}`;
         }
         else {
             // getRootDirectoryAsync() will /path/to/repo, and path prefix should be
             // file:/// so only file:// needs to be prepended
-            gitRepoUri = `file://${await this.getRootPathAsync()}`;
+            gitRepoUri = `file://${rootPath}`;
         }
-        const isCaseSensitive = await isGitCaseSensitiveAsync(this.maybeCwdOverride);
-        await setGitCaseSensitivityAsync(true, this.maybeCwdOverride);
+        await assertEnablingGitCaseSensitivityDoesNotCauseNewUncommittedChangesAsync(rootPath);
+        const isCaseSensitive = await isGitCaseSensitiveAsync(rootPath);
         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',
-                    cwd: this.maybeCwdOverride,
-                });
-                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 setGitCaseSensitivityAsync(true, rootPath);
+            await (0, spawn_async_1.default)('git', ['clone', '--no-hardlinks', '--depth', '1', gitRepoUri, destinationPath], { cwd: rootPath });
+            const sourceEasignorePath = path_1.default.join(rootPath, local_1.EASIGNORE_FILENAME);
+            if (await fs_extra_1.default.exists(sourceEasignorePath)) {
+                const cachedFilesWeShouldHaveIgnored = (await (0, spawn_async_1.default)('git', [
+                    'ls-files',
+                    '--exclude-from',
+                    sourceEasignorePath,
+                    // `--ignored --cached` makes git print files that should be
+                    // ignored by rules from `--exclude-from`, but instead are currently cached.
+                    '--ignored',
+                    '--cached',
+                    // separates file names with null characters
+                    '-z',
+                ], { cwd: destinationPath })).stdout
+                    .split('\0')
+                    // ls-files' output is terminated by a null character
+                    .filter(file => file !== '');
+                await Promise.all(cachedFilesWeShouldHaveIgnored.map(file => fs_extra_1.default.rm(path_1.default.join(destinationPath, file))));
             }
-            await (0, spawn_async_1.default)('git', ['clone', '--no-hardlinks', '--depth', '1', gitRepoUri, destinationPath], {
-                cwd: this.maybeCwdOverride,
-            });
         }
         finally {
-            await setGitCaseSensitivityAsync(isCaseSensitive, this.maybeCwdOverride);
+            await setGitCaseSensitivityAsync(isCaseSensitive, rootPath);
         }
+        // After we create the shallow Git copy, we copy the files
+        // again. This way we include the changed and untracked files
+        // (`git clone` only copies the committed changes).
+        await (0, local_1.makeShallowCopyAsync)(rootPath, destinationPath);
     }
     async getCommitHashAsync() {
         try {
@@ -192,10 +210,16 @@ class GitClient extends vcs_1.Client {
             !trackedFiles.includes(pathWithoutLeadingDot));
     }
     async isFileIgnoredAsync(filePath) {
+        const rootPath = await this.getRootPathAsync();
+        const easIgnorePath = path_1.default.join(rootPath, local_1.EASIGNORE_FILENAME);
+        if (await fs_extra_1.default.exists(easIgnorePath)) {
+            const ignore = new local_1.Ignore(rootPath);
+            const wouldNotBeCopiedToClone = ignore.ignores(filePath);
+            const wouldBeDeletedFromClone = (await (0, spawn_async_1.default)('git', ['ls-files', '--exclude-from', easIgnorePath, '--ignored', '--cached', filePath], { cwd: rootPath })).stdout.trim() !== '';
+            return wouldNotBeCopiedToClone && wouldBeDeletedFromClone;
+        }
         try {
-            await (0, spawn_async_1.default)('git', ['check-ignore', '-q', filePath], {
-                cwd: this.maybeCwdOverride ?? path_1.default.normalize(await this.getRootPathAsync()),
-            });
+            await (0, spawn_async_1.default)('git', ['check-ignore', '-q', filePath], { cwd: rootPath });
             return true;
         }
         catch {
@@ -318,3 +342,39 @@ async function setGitCaseSensitivityAsync(enable, cwd) {
         });
     }
 }
+async function assertEnablingGitCaseSensitivityDoesNotCauseNewUncommittedChangesAsync(cwd) {
+    // Remember uncommited changes before case sensitivity change
+    // for later comparison so we log to the user only the files
+    // that were marked as changed after the case sensitivity change.
+    const uncommittedChangesBeforeCaseSensitivityChange = await (0, git_1.gitStatusAsync)({
+        showUntracked: true,
+        cwd,
+    });
+    const isCaseSensitive = await isGitCaseSensitiveAsync(cwd);
+    await setGitCaseSensitivityAsync(true, cwd);
+    try {
+        const uncommitedChangesAfterCaseSensitivityChange = await (0, git_1.gitStatusAsync)({
+            showUntracked: true,
+            cwd,
+        });
+        if (uncommitedChangesAfterCaseSensitivityChange !== uncommittedChangesBeforeCaseSensitivityChange) {
+            const baseUncommitedChangesSet = new Set(uncommittedChangesBeforeCaseSensitivityChange.split('\n'));
+            const errorMessage = [
+                'Detected inconsistent filename casing between your local filesystem and git.',
+                'This will likely cause your job to fail. Impacted files:',
+                ...uncommitedChangesAfterCaseSensitivityChange.split('\n').flatMap(changedFile => {
+                    // This file was changed before the case sensitivity change too.
+                    if (baseUncommitedChangesSet.has(changedFile)) {
+                        return [];
+                    }
+                    return [changedFile];
+                }),
+                `Resolve filename casing inconsistencies before proceeding. ${(0, log_1.learnMore)('https://expo.fyi/macos-ignorecase')}`,
+            ];
+            throw new Error(errorMessage.join('\n'));
+        }
+    }
+    finally {
+        await setGitCaseSensitivityAsync(isCaseSensitive, cwd);
+    }
+}

package/build/vcs/index.js

@@ -4,23 +4,23 @@ exports.resolveVcsClient = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const git_1 = tslib_1.__importDefault(require("./clients/git"));
-const gitNoCommit_1 = tslib_1.__importDefault(require("./clients/gitNoCommit"));
 const noVcs_1 = tslib_1.__importDefault(require("./clients/noVcs"));
 const NO_VCS_WARNING = `Using EAS CLI without version control system is not recommended, use this mode only if you know what you are doing.`;
+let wasNoVcsWarningPrinted = false;
 function resolveVcsClient(requireCommit = false) {
     if (process.env.EAS_NO_VCS) {
         if (process.env.NODE_ENV !== 'test') {
-            // This log might be printed before cli arguments are evaluated,
-            // so it needs to go to stderr in case command is run in JSON
-            // only mode.
-            // eslint-disable-next-line no-console
-            console.error(chalk_1.default.yellow(NO_VCS_WARNING));
+            if (!wasNoVcsWarningPrinted) {
+                // This log might be printed before cli arguments are evaluated,
+                // so it needs to go to stderr in case command is run in JSON
+                // only mode.
+                // eslint-disable-next-line no-console
+                console.error(chalk_1.default.yellow(NO_VCS_WARNING));
+                wasNoVcsWarningPrinted = true;
+            }
         }
         return new noVcs_1.default();
     }
-    if (requireCommit) {
-        return new git_1.default();
-    }
-    return new gitNoCommit_1.default();
+    return new git_1.default({ requireCommit });
 }
 exports.resolveVcsClient = resolveVcsClient;

package/build/vcs/local.d.ts

@@ -1,3 +1,4 @@
+export declare const EASIGNORE_FILENAME = ".easignore";
 export declare function getRootPath(): string;
 /**
  * Ignore wraps the 'ignore' package to support multiple .gitignore files

package/build/vcs/local.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeShallowCopyAsync = exports.Ignore = exports.getRootPath = void 0;
+exports.makeShallowCopyAsync = exports.Ignore = exports.getRootPath = exports.EASIGNORE_FILENAME = void 0;
 const tslib_1 = require("tslib");
 const fast_glob_1 = tslib_1.__importDefault(require("fast-glob"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const ignore_1 = tslib_1.__importDefault(require("ignore"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const EASIGNORE_FILENAME = '.easignore';
+exports.EASIGNORE_FILENAME = '.easignore';
 const GITIGNORE_FILENAME = '.gitignore';
 const DEFAULT_IGNORE = `
 .git
@@ -37,7 +37,7 @@ class Ignore {
         this.rootDir = rootDir;
     }
     async initIgnoreAsync() {
-        const easIgnorePath = path_1.default.join(this.rootDir, EASIGNORE_FILENAME);
+        const easIgnorePath = path_1.default.join(this.rootDir, exports.EASIGNORE_FILENAME);
         if (await fs_extra_1.default.pathExists(easIgnorePath)) {
             this.ignoreMapping = [
                 ['', (0, ignore_1.default)().add(DEFAULT_IGNORE)],

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "14.7.0",
+  "version": "15.0.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -2778,20 +2778,32 @@
       "aliases": [],
       "examples": [
         "$ eas fingerprint:compare \t # Compare fingerprints in interactive mode",
-        "$ eas fingerprint:compare c71a7d475aa6f75291bc93cd74aef395c3c94eee \t # Compare fingerprint against local directory",
-        "$ eas fingerprint:compare c71a7d475aa6f75291bc93cd74aef395c3c94eee f0d6a916e73f401d428e6e006e07b12453317ba2 \t # Compare provided fingerprints",
-        "$ eas fingerprint:compare --build-id 82bc6456-611a-48cb-8db4-5f9eb2ca1003 \t # Compare fingerprint from build against local directory"
+        "$ eas fingerprint:compare <FINGERPRINT-HASH> \t # Compare fingerprint against local directory",
+        "$ eas fingerprint:compare <FINGERPRINT-HASH-1> <FINGERPRINT-HASH-2> \t # Compare provided fingerprints",
+        "$ eas fingerprint:compare --build-id <BUILD-ID> \t # Compare fingerprint from build against local directory",
+        "$ eas fingerprint:compare --build-id <BUILD-ID-1> --build-id <BUILD-ID-2>\t # Compare fingerprint from a build against another build",
+        "$ eas fingerprint:compare --build-id <BUILD-ID> --update-id <UPDATE-ID>\t # Compare fingerprint from build against fingerprint from update",
+        "$ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> \t # Compare fingerprint from update against provided fingerprint"
       ],
       "flags": {
         "build-id": {
           "name": "build-id",
           "type": "option",
           "description": "Compare the fingerprint with the build with the specified ID",
-          "multiple": false,
+          "multiple": true,
           "aliases": [
             "buildId"
           ]
         },
+        "update-id": {
+          "name": "update-id",
+          "type": "option",
+          "description": "Compare the fingerprint with the update with the specified ID",
+          "multiple": true,
+          "aliases": [
+            "updateId"
+          ]
+        },
         "json": {
           "name": "json",
           "type": "boolean",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "14.7.0",
+  "version": "15.0.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -13,7 +13,7 @@
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
     "@expo/eas-build-job": "1.0.165",
-    "@expo/eas-json": "14.5.0",
+    "@expo/eas-json": "15.0.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
@@ -237,5 +237,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "8a38cc24e1ab435bd5e150294c65c8324406af37"
+  "gitHead": "21c8131bcffa8ef78b1775ae6f8bed2c24e1fa72"
 }

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

@@ -1,8 +0,0 @@
-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>;
-    trackFileAsync(file: string): Promise<void>;
-}

package/build/vcs/clients/gitNoCommit.js

@@ -1,42 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const git_1 = tslib_1.__importDefault(require("./git"));
-const log_1 = tslib_1.__importDefault(require("../../log"));
-const local_1 = require("../local");
-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 rootPath = path_1.default.normalize(await this.getRootPathAsync());
-        const ignore = new local_1.Ignore(rootPath);
-        await ignore.initIgnoreAsync();
-        return ignore.ignores(filePath);
-    }
-    async trackFileAsync(file) {
-        try {
-            await super.trackFileAsync(file);
-        }
-        catch {
-            // In the no commit workflow it doesn't matter if we fail to track changes,
-            // so we can ignore if this throws an exception
-            log_1.default.warn(`Unable to track ${chalk_1.default.bold(path_1.default.basename(file))} in Git. Proceeding without tracking.`);
-            log_1.default.warn(`  Reason: the command ${chalk_1.default.bold(`"git add ${file}"`)} exited with an error.`);
-            log_1.default.newLine();
-        }
-    }
-}
-exports.default = GitNoCommitClient;