Replace sourcemap in output correctly

See: https://github.com/expo/eas-hosting/blob/bd72f7ef735d956b1ce2f85b3d818447f33fd6ab/workers/deployment-api/src/services/workerUpload.ts#L35-L56
This needs to vaguely match: https://github.com/cloudflare/workers-sdk/blob/508a1a31a039a5f4700efbc7535a165d79b22cb9/packages/wrangler/src/deployment-bundle/source-maps.ts#L27-L63

CHANGELOG.md

@@ -8,7 +8,20 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+-- Add `--verbose-logs` flag for `build` command ([#3000](https://github.com/expo/eas-cli/pull/3000) by [@khamilowicz](https://github.com/khamilowicz))
+
+- Add `eas-build-cache-provider` package. ([#3002](https://github.com/expo/eas-cli/pull/3002) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ### 🐛 Bug fixes
+
+- Add missing sourcemap normalization to EAS Hosting worker deployment uploads. ([#3004](https://github.com/expo/eas-cli/pull/3004) by [@kitten](https://github.com/kitten))
+
+### 🧹 Chores
+
+## [16.3.3](https://github.com/expo/eas-cli/releases/tag/v16.3.3) - 2025-04-24
+
+### 🐛 Bug fixes
+
 - Add `sdk-52` alias to the list or supported android images. ([#2989](https://github.com/expo/eas-cli/pull/2989) by [@kadikraman](https://github.com/kadikraman))
 - Detect when expo metro config is used. ([#2996](https://github.com/expo/eas-cli/pull/2996) by [@kadikraman](https://github.com/kadikraman))
 

packages/eas-build-cache-provider/README.md

@@ -0,0 +1,3 @@
+# eas-build-cache-provider
+
+A build cache provider plugin for the Expo CLI

packages/eas-build-cache-provider/package.json

@@ -0,0 +1,58 @@
+{
+  "name": "eas-build-cache-provider",
+  "description": "A build cache provider plugin for the Expo CLI",
+  "version": "0.1.0",
+  "author": "Expo <[email protected]>",
+  "bugs": "https://github.com/expo/eas-cli/issues",
+  "dependencies": {
+    "@expo/config": "10.0.6",
+    "@babel/code-frame": "7.23.5",
+    "@expo/spawn-async": "^1.7.2",
+    "chalk": "4.1.2",
+    "figures": "3.2.0",
+    "fs-extra": "11.2.0",
+    "getenv": "1.0.0",
+    "log-symbols": "4.1.0",
+    "semver": "7.5.2",
+    "terminal-link": "2.1.1",
+    "tslib": "2.4.1"
+  },
+  "devDependencies": {
+    "@tsconfig/node18": "18.2.4",
+    "@types/babel__code-frame": "7.0.3",
+    "@types/fs-extra": "11.0.4",
+    "@types/getenv": "^1.0.0",
+    "memfs": "3.4.13",
+    "rimraf": "3.0.2",
+    "typescript": "5.3.3"
+  },
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "homepage": "https://github.com/expo/eas-cli",
+  "license": "MIT",
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
+  "repository": "expo/eas-cli",
+  "scripts": {
+    "build": "tsc --project tsconfig.build.json",
+    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
+    "watch": "yarn build --watch --preserveWatchOutput",
+    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
+    "typecheck": "tsc",
+    "prepack": "yarn rebuild",
+    "rebuild": "rimraf build && yarn build",
+    "test": "jest",
+    "clean": "rimraf build node_modules yarn-error.log"
+  },
+  "files": [
+    "/build"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "volta": {
+    "node": "20.11.0",
+    "yarn": "1.22.21"
+  }
+}

packages/eas-build-cache-provider/src/.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  extends: ['universe/shared/typescript-analysis'],
+  overrides: [
+    {
+      files: ['*.ts', '*.d.ts'],
+      parserOptions: {
+        project: './packages/eas-build-cache-provider/tsconfig.json',
+      },
+      rules: {
+        '@typescript-eslint/explicit-function-return-type': [
+          'warn',
+          {
+            allowExpressions: true,
+          },
+        ],
+      },
+    },
+  ],
+};

packages/eas-build-cache-provider/src/helpers.ts

@@ -0,0 +1,41 @@
+import { getPackageJson } from '@expo/config';
+import { SpawnResult } from '@expo/spawn-async';
+
+// import from '@expo/config';
+type RunOptions = any;
+
+export function isSpawnResultError(obj: any): obj is Error & SpawnResult {
+  return (
+    obj &&
+    'message' in obj &&
+    obj.status !== undefined &&
+    obj.stdout !== undefined &&
+    obj.stderr !== undefined
+  );
+}
+
+export function isDevClientBuild({
+  runOptions,
+  projectRoot,
+}: {
+  runOptions: RunOptions;
+  projectRoot: string;
+}): boolean {
+  if (!hasDirectDevClientDependency(projectRoot)) {
+    return false;
+  }
+
+  if ('variant' in runOptions && runOptions.variant !== undefined) {
+    return runOptions.variant === 'debug';
+  }
+  if ('configuration' in runOptions && runOptions.configuration !== undefined) {
+    return runOptions.configuration === 'Debug';
+  }
+
+  return true;
+}
+
+export function hasDirectDevClientDependency(projectRoot: string): boolean {
+  const { dependencies = {}, devDependencies = {} } = getPackageJson(projectRoot);
+  return !!dependencies['expo-dev-client'] || !!devDependencies['expo-dev-client'];
+}

packages/eas-build-cache-provider/src/index.ts

@@ -0,0 +1,147 @@
+import { Platform } from '@expo/config';
+import spawnAsync from '@expo/spawn-async';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+
+import { isDevClientBuild, isSpawnResultError } from './helpers';
+import Log from './log';
+
+// import from '@expo/config';
+type CalculateFingerprintHashProps = any;
+type RemoteBuildCachePlugin = any;
+type RunOptions = any;
+
+async function resolveRemoteBuildCacheAsync({
+  projectRoot,
+  platform,
+  fingerprintHash,
+  runOptions,
+}: {
+  projectRoot: string;
+  platform: Platform;
+  fingerprintHash: string;
+  runOptions: RunOptions;
+}): Promise<string | null> {
+  const easJsonPath = path.join(projectRoot, 'eas.json');
+  if (!(await fs.exists(easJsonPath))) {
+    Log.debug('eas.json not found, skip checking for remote builds');
+    return null;
+  }
+
+  Log.log(
+    chalk`{whiteBright \u203A} {bold Searching builds with matching fingerprint on EAS servers}`
+  );
+  try {
+    const results = await spawnAsync(
+      'npx',
+      [
+        'eas-cli',
+        'build:download',
+        `--platform=${platform}`,
+        `--fingerprint=${fingerprintHash}`,
+        '--non-interactive',
+        isDevClientBuild({ runOptions, projectRoot }) ? '--dev-client' : '--no-dev-client',
+        '--json',
+      ],
+      {
+        cwd: projectRoot,
+      }
+    );
+
+    Log.log(chalk`{whiteBright \u203A} {bold Successfully downloaded cached build}`);
+    // {
+    //   "path": "/var/folders/03/lppcpcnn61q3mz5ckzmzd8w80000gn/T/eas-cli-nodejs/eas-build-run-cache/c0f9ba9c-0cf1-4c5c-8566-b28b7971050f_22f1bbfa-1c09-4b67-9e4a-721906546b58.app"
+    // }
+    const json = JSON.parse(results.stdout.trim());
+    return json?.path;
+  } catch (error) {
+    Log.debug('eas-cli error:', error);
+    // @TODO(2025-04-11): remove this in a future release
+    if (isSpawnResultError(error) && error.stderr.includes('command build:download not found')) {
+      Log.warn(
+        `To take advantage of remote build cache, upgrade your eas-cli installation to latest.`
+      );
+    }
+    return null;
+  }
+}
+
+async function uploadEASRemoteBuildCacheAsync({
+  projectRoot,
+  platform,
+  fingerprintHash,
+  buildPath,
+}: {
+  projectRoot: string;
+  runOptions: RunOptions;
+  platform: Platform;
+  fingerprintHash: string;
+  buildPath?: string;
+}): Promise<string | null> {
+  const easJsonPath = path.join(projectRoot, 'eas.json');
+  if (!(await fs.exists(easJsonPath))) {
+    Log.debug('eas.json not found, skip uploading builds');
+    return null;
+  }
+
+  try {
+    Log.log(chalk`{whiteBright \u203A} {bold Uploading build to remote cache}`);
+    const results = await spawnAsync(
+      'npx',
+      [
+        'eas-cli',
+        'upload',
+        `--platform=${platform}`,
+        `--fingerprint=${fingerprintHash}`,
+        buildPath ? `--build-path=${buildPath}` : '',
+        '--non-interactive',
+        '--json',
+      ],
+      {
+        cwd: projectRoot,
+      }
+    );
+    // {
+    //   "url": "/var/folders/03/lppcpcnn61q3mz5ckzmzd8w80000gn/T/eas-cli-nodejs/eas-build-run-cache/c0f9ba9c-0cf1-4c5c-8566-b28b7971050f_22f1bbfa-1c09-4b67-9e4a-721906546b58.app"
+    // }
+    const json = JSON.parse(results.stdout.trim());
+    Log.log(chalk`{whiteBright \u203A} {bold Build successfully uploaded: ${json?.url}}`);
+    return json?.url;
+  } catch (error) {
+    Log.debug('eas-cli error:', error);
+  }
+  return null;
+}
+
+async function calculateEASFingerprintHashAsync({
+  projectRoot,
+  platform,
+}: CalculateFingerprintHashProps): Promise<string | null> {
+  // prefer using `eas fingerprint:generate` because it automatically upload sources
+  try {
+    const results = await spawnAsync(
+      'npx',
+      ['eas-cli', 'fingerprint:generate', `--platform=${platform}`, '--json', '--non-interactive'],
+      {
+        cwd: projectRoot,
+      }
+    );
+    // {
+    //   "hash": "203f960b965e154b77dc31c6c42e5582e8d77196"
+    // }
+    const json = JSON.parse(results.stdout.trim());
+    return json?.hash;
+  } catch (error) {
+    Log.debug('eas-cli error:', error);
+  }
+  return null;
+}
+
+const EASRemoteBuildCacheProvider: RemoteBuildCachePlugin = {
+  resolveRemoteBuildCache: resolveRemoteBuildCacheAsync,
+  uploadRemoteBuildCache: uploadEASRemoteBuildCacheAsync,
+  calculateFingerprintHash: calculateEASFingerprintHashAsync,
+};
+
+export default EASRemoteBuildCacheProvider;

packages/eas-build-cache-provider/src/log.ts

@@ -0,0 +1,121 @@
+import chalk from 'chalk';
+import figures from 'figures';
+import { boolish } from 'getenv';
+import logSymbols from 'log-symbols';
+import terminalLink from 'terminal-link';
+
+type Color = (...text: string[]) => string;
+
+export default class Log {
+  public static readonly isDebug = boolish('EXPO_DEBUG', false);
+
+  public static log(...args: any[]): void {
+    Log.consoleLog(...args);
+  }
+
+  public static newLine(): void {
+    Log.consoleLog();
+  }
+
+  public static addNewLineIfNone(): void {
+    if (!Log.isLastLineNewLine) {
+      Log.newLine();
+    }
+  }
+
+  public static error(...args: any[]): void {
+    Log.consoleLog(...Log.withTextColor(args, chalk.red));
+  }
+
+  public static warn(...args: any[]): void {
+    Log.consoleLog(...Log.withTextColor(args, chalk.yellow));
+  }
+
+  public static debug(...args: any[]): void {
+    if (Log.isDebug) {
+      Log.consoleLog(...args);
+    }
+  }
+
+  public static gray(...args: any[]): void {
+    Log.consoleLog(...Log.withTextColor(args, chalk.gray));
+  }
+
+  public static warnDeprecatedFlag(flag: string, message: string): void {
+    Log.warn(`› ${chalk.bold('--' + flag)} flag is deprecated. ${message}`);
+  }
+
+  public static fail(message: string): void {
+    Log.log(`${chalk.red(logSymbols.error)} ${message}`);
+  }
+
+  public static succeed(message: string): void {
+    Log.log(`${chalk.green(logSymbols.success)} ${message}`);
+  }
+
+  public static withTick(...args: any[]): void {
+    Log.consoleLog(chalk.green(figures.tick), ...args);
+  }
+
+  public static withInfo(...args: any[]): void {
+    Log.consoleLog(chalk.green(figures.info), ...args);
+  }
+
+  private static consoleLog(...args: any[]): void {
+    Log.updateIsLastLineNewLine(args);
+    // eslint-disable-next-line no-console
+    console.log(...args);
+  }
+
+  private static withTextColor(args: any[], chalkColor: Color): string[] {
+    return args.map(arg => chalkColor(arg));
+  }
+
+  private static isLastLineNewLine = false;
+  private static updateIsLastLineNewLine(args: any[]): void {
+    if (args.length === 0) {
+      Log.isLastLineNewLine = true;
+    } else {
+      const lastArg = args[args.length - 1];
+      if (typeof lastArg === 'string' && (lastArg === '' || lastArg.match(/[\r\n]$/))) {
+        Log.isLastLineNewLine = true;
+      } else {
+        Log.isLastLineNewLine = false;
+      }
+    }
+  }
+}
+
+/**
+ * Prints a link for given URL, using text if provided, otherwise text is just the URL.
+ * Format links as dim (unless disabled) and with an underline.
+ *
+ * @example https://expo.dev
+ */
+export function link(
+  url: string,
+  { text = url, fallback, dim = true }: { text?: string; dim?: boolean; fallback?: string } = {}
+): string {
+  // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
+  const output = terminalLink(text, url, {
+    fallback: () =>
+      fallback ?? (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
+  });
+  return dim ? chalk.dim(output) : output;
+}
+
+/**
+ * Provide a consistent "Learn more" link experience.
+ * Format links as dim (unless disabled) with an underline.
+ *
+ * @example Learn more: https://expo.dev
+ */
+export function learnMore(
+  url: string,
+  {
+    learnMoreMessage: maybeLearnMoreMessage,
+    dim = true,
+  }: { learnMoreMessage?: string; dim?: boolean } = {}
+): string {
+  return link(url, { text: maybeLearnMoreMessage ?? 'Learn more', dim });
+}

packages/eas-build-cache-provider/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig",
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+}

packages/eas-build-cache-provider/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "@tsconfig/node18/tsconfig.json",
+  "compilerOptions": {
+    "declaration": true,
+    "importHelpers": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "outDir": "build",
+    "rootDir": "src",
+    "typeRoots": ["../../node_modules/@types", "../../ts-declarations", "./node_modules/@types"]
+  },
+  "include": ["src/**/*"]
+}

packages/eas-cli/src/build/android/prepareJob.ts

@@ -78,7 +78,10 @@ export async function prepareJobAsync(
       bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
-      env: buildProfile.env,
+      env: {
+        ...buildProfile.env,
+        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
+      },
     },
     cache: {
       ...cacheDefaults,

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

@@ -63,5 +63,6 @@ export interface BuildContext<T extends Platform> {
   vcsClient: Client;
   loggerLevel?: LoggerLevel;
   repack: boolean;
+  isVerboseLoggingEnabled: boolean;
   env: Record<string, string>;
 }

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

@@ -43,6 +43,7 @@ export async function createBuildContextAsync<T extends Platform>({
   buildLoggerLevel,
   freezeCredentials,
   repack,
+  isVerboseLoggingEnabled,
   env,
 }: {
   buildProfileName: string;
@@ -65,6 +66,7 @@ export async function createBuildContextAsync<T extends Platform>({
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
   repack: boolean;
+  isVerboseLoggingEnabled: boolean;
   env: Record<string, string>;
 }): Promise<BuildContext<T>> {
   const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
@@ -151,6 +153,7 @@ export async function createBuildContextAsync<T extends Platform>({
     requiredPackageManager,
     loggerLevel: buildLoggerLevel,
     repack,
+    isVerboseLoggingEnabled,
     env,
   };
   if (platform === Platform.ANDROID) {

packages/eas-cli/src/build/ios/prepareJob.ts

@@ -72,7 +72,10 @@ export async function prepareJobAsync(
       bundler: buildProfile.bundler,
       cocoapods: buildProfile.cocoapods,
       fastlane: buildProfile.fastlane,
-      env: buildProfile.env,
+      env: {
+        ...buildProfile.env,
+        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
+      },
     },
     cache: {
       ...cacheDefaults,

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

@@ -98,6 +98,7 @@ export interface BuildFlags {
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
   repack: boolean;
+  isVerboseLoggingEnabled?: boolean;
 }
 
 export async function runBuildAndSubmitAsync({
@@ -401,6 +402,7 @@ async function prepareAndStartBuildAsync({
     buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
     freezeCredentials: flags.freezeCredentials,
     repack: flags.repack,
+    isVerboseLoggingEnabled: flags.isVerboseLoggingEnabled ?? false,
     env,
   });
 

packages/eas-cli/src/commands/build/index.ts

@@ -37,6 +37,7 @@ interface RawBuildFlags {
   message?: string;
   'build-logger-level'?: LoggerLevel;
   'freeze-credentials': boolean;
+  'verbose-logs'?: boolean;
   repack: boolean;
 }
 
@@ -118,6 +119,10 @@ export default class Build extends EasCommand {
       hidden: true,
       description: 'Use the golden dev client build repack flow as it works for onboarding',
     }),
+    'verbose-logs': Flags.boolean({
+      default: false,
+      description: 'Use verbose logs for the build process',
+    }),
     ...EasNonInteractiveAndJsonFlags,
   };
 
@@ -238,6 +243,7 @@ export default class Build extends EasCommand {
       message,
       buildLoggerLevel: flags['build-logger-level'],
       freezeCredentials: flags['freeze-credentials'],
+      isVerboseLoggingEnabled: flags['verbose-logs'],
       repack: flags.repack,
     };
   }

packages/eas-cli/src/worker/assets.ts

@@ -141,6 +141,53 @@ export async function createManifestAsync(
   return { conflictingVariableNames, manifest };
 }
 
+interface RawSourceMap {
+  version: number;
+  sources: string[];
+  names: string[];
+  sourceRoot?: string;
+  sourcesContent?: string[];
+  mappings: string;
+  file: string;
+}
+
+const sourceMapExtensionRe = /\.map$/;
+
+async function normalizeSourceMapAsync(
+  file: RecursiveFileEntry
+): Promise<WorkerFileEntry | undefined> {
+  // This logic normalizes source maps like Wrangler does
+  // See: https://github.com/cloudflare/workers-sdk/blob/508a1a3/packages/wrangler/src/deployment-bundle/source-maps.ts#L31-L63
+  const data = await fs.promises.readFile(file.path, 'utf-8');
+  try {
+    const map = JSON.parse(data) as RawSourceMap;
+    if (typeof map !== 'object' || !map) {
+      return undefined;
+    }
+    let sources = map.sources || [];
+    if (Array.isArray(map.sources)) {
+      // Remote null-byte prefixes from virtual file names
+      sources = map.sources.map(sourceName =>
+        sourceName.charCodeAt(0) === 0 ? sourceName.slice(1) : sourceName
+      );
+    }
+    return {
+      normalizedPath: file.normalizedPath,
+      path: file.path,
+      data: JSON.stringify({
+        version: 3,
+        file: file.normalizedPath.replace(sourceMapExtensionRe, ''),
+        sourcesContent: sources.map(() => null),
+        sources,
+        names: map.names,
+        mappings: map.mappings,
+      }),
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 interface WorkerFileEntry {
   normalizedPath: string;
   path: string;
@@ -150,11 +197,18 @@ interface WorkerFileEntry {
 /** Reads worker files while normalizing sourcemaps and providing normalized paths */
 async function* listWorkerFilesAsync(workerPath: string): AsyncGenerator<WorkerFileEntry> {
   for await (const file of listFilesRecursively(workerPath)) {
-    yield {
-      normalizedPath: file.normalizedPath,
-      path: file.path,
-      data: await fs.promises.readFile(file.path),
-    };
+    if (file.normalizedPath.endsWith('.map')) {
+      const normalizedSourceMap = await normalizeSourceMapAsync(file);
+      if (normalizedSourceMap) {
+        yield normalizedSourceMap;
+      }
+    } else {
+      yield {
+        normalizedPath: file.normalizedPath,
+        path: file.path,
+        data: await fs.promises.readFile(file.path),
+      };
+    }
   }
 }