@yahoo/uds 0.1.13 → 0.1.14

package/cli/commands/expo/_setup.ts

@@ -1,22 +1,21 @@
 import { EasJsonAccessor, EasJsonUtils, Platform } from '@expo/eas-json';
 import { type Props, print } from 'bluebun';
-import { $ } from 'bun';
+import { $, semver, which } from 'bun';
 
 export interface MobileProps extends Props {
   options: {
     profile: string;
-    platform: Platform.IOS | Platform.ANDROID;
+    platform: Platform;
     jsEngine?: 'hermes' | 'jsc';
     debug?: boolean;
   };
 }
 
-async function needsBinary(lib: string) {
-  const whichLib = await $`which ${lib}`.text();
-  return whichLib.includes('not found');
+export async function needsBinary(lib: string) {
+  return which(lib) === null;
 }
 
-async function needsBrewFormula(formula: string) {
+export async function needsBrewFormula(formula: string) {
   return (await $`brew list --formula | grep ${formula} | wc -l`.text()).trim() === '0';
 }
 
@@ -28,87 +27,67 @@ export async function setup({
   env?: Partial<typeof Bun.env>;
 }) {
   const { profile, platform, jsEngine = 'hermes', debug = false } = props.options;
+  const isIOS = platform === Platform.IOS;
+  const isAndroid = platform === Platform.ANDROID;
 
   /* -------------------------------------------------------------------------- */
-  /*                               HOMEBREW SETUP                               */
+  /*                                 XCODE SETUP                                */
   /* -------------------------------------------------------------------------- */
-  const needsBrew = await needsBinary('brew');
-  if (needsBrew) {
-    console.log('Installing brew...');
-    await $`/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`;
-    console.log('Installing brew...Complete');
+  if (isIOS) {
+    const xcodePath = await $`xcode-select -p`.text();
+    const needsXcode = !xcodePath.startsWith('/Applications');
+    const needsXcrun = await needsBinary('xcrun');
+
+    if (needsXcode) {
+      console.write(
+        'You must have XCode installed before continuing... Visit https://apps.apple.com/us/app/xcode/id497799835?mt=12 to download.',
+      );
+      throw new Error('XCode not installed');
+    }
 
     /**
-     * This portion of logic was ported from the homebrew installer script
-     * https://github.com/Homebrew/install/blob/master/install.sh#L153C5-L153C63.
-     * However, their script just alerts users to the fact that they need to add
-     * brew to their path, but doesn't do it for them. This logic attempts to do that
-     * so we can automatically proceed to the next steps of auto-installing
-     * the necessary dependencies for local development.
+     * Installing the XCode command line tools & simulators normally
+     * requires opening up XCode to install.
+     * This conditional is to avoid having to do that.
      */
-    const machineArch = await $`uname -m`.text();
-    const isLinux = (await $`uname`.text()) === 'Linux';
-    const shellType = await $`echo $SHELL`.text();
-    const homebrewPrefix = machineArch.includes('arm64') ? '/opt/homebrew' : '/usr/local';
-    let shellRcFile;
-
-    if (isLinux) {
-      shellRcFile = shellType.includes('zsh') ? '.zshrc' : '.bashrc';
-    } else {
-      shellRcFile = shellType.includes('zsh') ? '.zprofile' : '.bash_profile';
-    }
-
-    const shellRcPath = `${Bun.env.HOME}/${shellRcFile}`;
-    let shellRcContents = '';
-    try {
-      shellRcContents = await Bun.file(shellRcPath).text();
-    } catch (err) {
-      // Ignore if it doesn't exist. We create it below.
-    }
-
-    if (!shellRcContents.includes('homebrew')) {
-      console.log('Adding brew to $PATH...');
-      const newShellRcContents = `${shellRcContents}\neval "$(${homebrewPrefix}/bin/brew shellenv)"`;
-      await Bun.write(shellRcPath, newShellRcContents);
+    if (needsXcrun) {
+      /**
+       * https://developer.apple.com/documentation/xcode/installing-additional-simulator-runtimes#Install-and-manage-Simulator-runtimes-from-the-command-line
+       */
+      await $`xcodebuild -runFirstLaunch`;
+      await $`xcodebuild -downloadPlatform iOS`;
     }
   }
 
-  /* -------------------------------------------------------------------------- */
-  /*                               FASTLANE SETUP                               */
-  /* -------------------------------------------------------------------------- */
-  const needsFastlane = await needsBrewFormula('fastlane');
-  if (needsFastlane) {
-    console.log('Installing fastlane...');
-    await $`brew install fastlane`;
-  }
-
-  /* -------------------------------------------------------------------------- */
-  /*                               COCOAPODS SETUP                              */
-  /* -------------------------------------------------------------------------- */
-  const needsCocoapods = await needsBrewFormula('cocoapods');
-  if (needsCocoapods) {
-    console.log('Installing cocoapods...');
-    await $`brew install cocoapods`;
-  }
-
   /* -------------------------------------------------------------------------- */
   /*                            JAVA DEVELOPMENT KIT                            */
   /* -------------------------------------------------------------------------- */
-  if (platform === 'android') {
+  if (isAndroid) {
     const jdkPath = await $`brew info --cask zulu17`.text();
     const needsJdk = jdkPath.includes('unavailable');
     if (needsJdk) {
-      console.log('Installing Java Development Kit for Android...');
+      console.write('Installing Java Development Kit for Android...');
       await $`brew install --cask zulu17`;
     }
   }
 
   /* -------------------------------------------------------------------------- */
-  /*                                 EXPO SETUP                                 */
+  /*                              EAS CONFIG SETUP                              */
   /* -------------------------------------------------------------------------- */
+  /**
+   * eas.json is used to define build profiles for different environments.
+   * For example, you may have a profile for development, staging, and production.
+   *
+   * The EAS CLI is used to build and run an app locally based on the eas.json,
+   * but it isn't opinionated about how you define your profiles.
+   *
+   * We however want to enforce some conventions to make it easier to get started.
+   * We also want to store our builds outside of EAS ecosystem since they auto
+   * delete after 30 days & our builds infrequently.
+   *
+   */
   const appDirectory = Bun.env.PWD;
   const easJsonAccessor = EasJsonAccessor.fromProjectPath(appDirectory);
-
   const easProfiles = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
 
   if (!easProfiles.includes(profile)) {
@@ -126,20 +105,22 @@ export async function setup({
   }
 
   const easJsonConfig = await EasJsonUtils.getBuildProfileAsync(easJsonAccessor, platform, profile);
-
   const easCliConfig = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
   const easCliVersion = easCliConfig?.version ?? 'latest';
 
   /* -------------------------------------------------------------------------- */
   /*                                EAS CLI SETUP                               */
   /* -------------------------------------------------------------------------- */
+  /**
+   * EAS CLI is used to build and run an app locally.
+   */
   const needsEasCli = await needsBinary('eas');
   if (needsEasCli) {
-    await $`bun install eas-cli@${easCliVersion} -g`;
+    await $`bun install eas-cli@${easCliVersion} -g`.quiet();
   } else {
     const currentEasCliVersion = await $`eas --version`.text();
-    if (currentEasCliVersion !== easCliVersion) {
-      await $`bun install eas-cli@${easCliVersion} -g`;
+    if (!semver.satisfies(currentEasCliVersion, easCliVersion)) {
+      await $`bun install eas-cli@${easCliVersion} -g`.quiet();
     }
   }
 
@@ -150,7 +131,7 @@ export async function setup({
   } = easJsonConfig.env ?? {};
 
   // TODO: Add additional checks for ensuring this value adheres to Android formatting specs
-  if (platform === Platform.ANDROID && !androidId) {
+  if (isAndroid && !androidId) {
     throw new Error(`
       APP_ANDROID_BUNDLE_IDENTIFIER must be defined in eas.json within the ${profile} > env config.
       See https://docs.expo.dev/build-reference/variables/#setting-plaintext-environment-variables-in-easjson for information about env variables in eas.json
@@ -174,7 +155,7 @@ export async function setup({
   }
 
   // TODO: Add additional checks for ensuring this value adheres to Uniform Type Identifier
-  if (platform === Platform.IOS && !appleId) {
+  if (isIOS && !appleId) {
     throw new Error(`
       APP_APPLE_BUNDLE_IDENTIFIER must be defined in eas.json within the ${profile} > env config.
       See https://docs.expo.dev/build-reference/variables/#setting-plaintext-environment-variables-in-easjson for information about env variables in eas.json
@@ -197,11 +178,13 @@ export async function setup({
   }
 
   const outputName = `${platform}-${profile}-${jsEngine}`;
-  // TODO: make this configurable
-  const prebuildsDir = `${appDirectory}/prebuilds`;
+  const prebuildsDir = `${appDirectory}/prebuilds`; // TODO: make this configurable
   const outputDir = `${prebuildsDir}/${outputName}`;
   const outputFileBase = `${outputDir}/${outputName}`;
 
+  /* -------------------------------------------------------------------------- */
+  /*                            ENVIRONMENT VARIABLES                           */
+  /* -------------------------------------------------------------------------- */
   let envVars = Bun.env;
 
   envVars = {
@@ -226,6 +209,7 @@ export async function setup({
     envVars = { ...envVars, ...envOpts };
   }
 
+  /** Change the default environment variables for shells created by this instance. */
   $.env(envVars);
 
   const output = {
@@ -233,10 +217,10 @@ export async function setup({
     dir: outputDir,
     prebuildsDir: prebuildsDir,
     fileBase: outputFileBase,
-    artifact: platform === 'ios' ? `${outputFileBase}.tar.gz` : `${outputFileBase}.zip`,
-    app: platform === 'ios' ? `${outputFileBase}.app` : 'todo fix android',
+    artifact: isIOS ? `${outputFileBase}.tar.gz` : `${outputFileBase}.zip`,
+    app: isIOS ? `${outputFileBase}.app` : 'todo fix android',
     get launchFile() {
-      return platform === 'ios' ? this.artifact : this.apk.signed;
+      return isIOS ? this.artifact : this.apk.signed;
     },
     apk: {
       contents: `${outputFileBase}/build`,
@@ -248,7 +232,7 @@ export async function setup({
   };
 
   return {
-    scheme: platform === 'ios' ? appleId : androidId,
+    scheme: isIOS ? appleId : androidId,
     channel: easJsonConfig.channel,
     debug,
     profile,

package/cli/commands/expo/build.ts

@@ -1,6 +1,5 @@
-import { $ } from 'bun';
-import type { MobileProps } from './_setup';
-import { setup } from './_setup';
+import { $, semver } from 'bun';
+import { setup, needsBinary, needsBrewFormula, type MobileProps } from './_setup';
 
 export default {
   name: 'build',
@@ -10,6 +9,88 @@ export default {
       props,
     });
 
+    /* ----- Homebrew, Fastlane, and Cocoapods are only required for builds. ---- */
+    /* -------------------------------------------------------------------------- */
+    /*                               HOMEBREW SETUP                               */
+    /* -------------------------------------------------------------------------- */
+    const needsBrew = await needsBinary('brew');
+    if (needsBrew) {
+      console.write('Installing brew...');
+      await $`/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`;
+      console.write('Installing brew...Complete');
+
+      /**
+       * This logic was ported from the homebrew installer script
+       * https://github.com/Homebrew/install/blob/master/install.sh#L153C5-L153C63.
+       * However, their script just alerts users to the fact that they need to add
+       * brew to their path, but doesn't do it for them. This logic attempts to do that
+       * so we can automatically proceed to the next steps of auto-installing
+       * the necessary dependencies for local development.
+       */
+      const machineArch = await $`uname -m`.text();
+      const isLinux = (await $`uname`.text()) === 'Linux';
+      const shellType = await $`echo $SHELL`.text();
+      const homebrewPrefix = machineArch.includes('arm64') ? '/opt/homebrew' : '/usr/local';
+      let shellRcFile;
+
+      if (isLinux) {
+        shellRcFile = shellType.includes('zsh') ? '.zshrc' : '.bashrc';
+      } else {
+        shellRcFile = shellType.includes('zsh') ? '.zprofile' : '.bash_profile';
+      }
+
+      const shellRcPath = `${Bun.env.HOME}/${shellRcFile}`;
+      let shellRcContents = '';
+      try {
+        shellRcContents = await Bun.file(shellRcPath).text();
+      } catch (err) {
+        // Ignore if it doesn't exist. We create it below.
+      }
+
+      if (!shellRcContents.includes('homebrew')) {
+        console.write('Adding brew to $PATH...');
+        const newShellRcContents = `${shellRcContents}\neval "$(${homebrewPrefix}/bin/brew shellenv)"`;
+        await Bun.write(shellRcPath, newShellRcContents);
+      }
+    }
+
+    /* -------------------------------------------------------------------------- */
+    /*                               FASTLANE SETUP                               */
+    /* -------------------------------------------------------------------------- */
+    const needsFastlane = await needsBrewFormula('fastlane');
+    if (needsFastlane) {
+      console.write('Installing fastlane...');
+      await $`brew install fastlane`;
+    }
+
+    /* -------------------------------------------------------------------------- */
+    /*                               COCOAPODS SETUP                              */
+    /* -------------------------------------------------------------------------- */
+    const needsCocoapods = await needsBrewFormula('cocoapods');
+    /** https://github.com/facebook/react-native/issues/42698#issuecomment-1915670708 */
+    const validCocoapodsVersion = '1.14.3';
+
+    const installCocoapods = async () =>
+      await $`brew install ${import.meta.dirname}/install/cocoapods.rb`;
+
+    if (needsCocoapods) {
+      console.write('Installing cocoapods...');
+      await installCocoapods();
+    } else {
+      const cocoapodsVersion = await $`pod --version`.text();
+      const needsDowngrade = semver.satisfies(cocoapodsVersion, `>${validCocoapodsVersion}`);
+      if (needsDowngrade) {
+        await $`brew unlink cocoapods`;
+        await $`brew uninstall cocoapods`;
+        console.write(
+          `Downgrading cocoapods from ${cocoapodsVersion} to ${validCocoapodsVersion}...`,
+        );
+        await installCocoapods();
+        await $`brew link cocoapods`;
+      }
+    }
+
     await $`eas build --local --non-interactive --json --clear-cache --platform ${platform} --profile ${profile} --output ${output.artifact}`;
+    console.write('You can now run your dev command to start the app!');
   },
 };

package/cli/commands/expo/dev.ts

@@ -1,5 +1,5 @@
 import { Props } from 'bluebun';
-import { $ } from 'bun';
+import { $, sleep } from 'bun';
 import { setup, type MobileProps } from './_setup';
 
 interface MobileStartProps extends Props {
@@ -12,7 +12,7 @@ interface MobileStartProps extends Props {
 type SimDevice = { udid: string; name: string; state: 'Booted' | 'Shutdown' };
 type SimList = {
   devices: {
-    ['com.apple.CoreSimulator.SimRuntime.iOS-17-2']: SimDevice[];
+    [key: string]: SimDevice[];
   };
 };
 
@@ -20,7 +20,6 @@ export default {
   name: 'dev',
   description: '🚧 Dev',
   run: async (props: MobileStartProps) => {
-    console.log('running dev');
     const { platform, scheme, output } = await setup({
       props,
       env: {
@@ -28,52 +27,56 @@ export default {
       },
     });
 
-    if (platform === 'ios') {
-      const xcodePath = await $`xcode-select -p`.text();
-      const xcodeExists = xcodePath.startsWith('/Applications');
-
-      if (xcodeExists) {
-        await $`open -a simulator`;
-        const deviceList = (await $`xcrun simctl list devices available -j -e`.json()) as SimList;
-
-        const devices = Object.values(deviceList?.devices).flatMap((item) => item);
-
-        if (devices.length === 0) {
-          throw new Error('No devices found');
-        } else {
-          const isBooted = devices.find((device: SimDevice) => device.state === 'Booted');
-          if (!isBooted) {
-            const iphone15Max = devices.find(
-              (device: SimDevice) => device.name === 'iPhone 15 Pro Max',
-            );
-            if (!iphone15Max) {
-              throw new Error('iPhone 15 Pro Max not found');
-            } else {
-              const udid = iphone15Max.udid;
-              await $`xcrun simctl boot ${udid}`;
-            }
-          }
-        }
-      } else {
-        console.log(
-          'You must have XCode installed before continuing... Visit https://apps.apple.com/us/app/xcode/id497799835?mt=12 to download.',
-        );
-        throw new Error('XCode not installed');
-      }
-    }
-
-    await $`eas build:run --platform ${platform} --path ${output.launchFile}`;
-
     const extraArgs = [];
 
     if (props.options.clear) {
       extraArgs.push('--clear');
     }
-
     const extrArgsString = extraArgs.join(' ');
 
-    console.log(`Starting metro server...`);
+    try {
+      /**
+       * Get list of devices.
+       * If there is a booted device, open the simulator on that device.
+       * If no booted device is found, open the simulator on iPhone 15 Pro Max.
+       * * https://github.com/expo/orbit/blob/main/packages/eas-shared/src/run/ios/simulator.ts#L98
+       *
+       * TODO:
+       * Should we open app on all booted devices if there are multiple open?
+       * Should we prompt user to pick from one of the booted devices?
+       * Should we prompt user to pick a device if there are no booted devices?
+       */
+      if (platform === 'ios') {
+        const deviceList =
+          (await $`xcrun simctl list devices available --json -e`.json()) as SimList;
+        const devices = Object.values(deviceList?.devices).flatMap((item) => item);
+        const bootedDevice = devices.find((device: SimDevice) => device.state === 'Booted');
+        if (!bootedDevice) {
+          const iphone15ProMax = devices.find((device) => device.name === 'iPhone 15 Pro Max');
+          const iphone15Udid = iphone15ProMax?.udid;
+          await $`open -a Simulator --args -CurrentDeviceUDID ${iphone15Udid}`;
+        }
+      }
+
+      /**
+       * In dev mode we use a debug build, which requires a metro server to serve
+       * the Javascript bundle.
+       *
+       * To avoid the, "Could not find metro server" error screen on launch,
+       * we delay the launch of the app until after the metro server has started.
+       */
+      sleep(3000).then(async () => {
+        /**
+         * Launch the app on the booted device
+         * https://github.com/expo/eas-cli?tab=readme-ov-file#eas-buildrun
+         */
+        await $`eas build:run --platform ${platform} --path ${output.launchFile}`;
+      });
 
-    await $`expo start --${platform} --dev-client --localhost --scheme ${scheme} ${extrArgsString}`;
+      console.write('Starting Metro server...');
+      await $`expo start --${platform} --dev-client --localhost --scheme ${scheme} ${extrArgsString}`;
+    } catch (err) {
+      throw err;
+    }
   },
 };

package/cli/commands/expo/install/cocoapods.rb

@@ -0,0 +1,35 @@
+class Cocoapods < Formula
+  desc "Dependency manager for Cocoa projects"
+  homepage "https://cocoapods.org/"
+  url "https://github.com/CocoaPods/CocoaPods/archive/refs/tags/1.14.3.tar.gz"
+  sha256 "de05766e5771e0cef7af89f73b0e42a1f1c52a76ce1288592cd9511bcd688a9e"
+  license "MIT"
+  revision 1
+
+  bottle do
+    sha256 cellar: :any,                 arm64_sonoma:   "0fb8e638fb4901b6c578c44ae1af0098a0b3530e7a339bf43f2fb67f2819d412"
+    sha256 cellar: :any,                 arm64_ventura:  "e3d0c8624df429cb30c5cf818f3a358d4f678b374410e9fbc8fde090889f9b61"
+    sha256 cellar: :any,                 arm64_monterey: "a6df519bae3f51b1609cfcd017b4d47cb688200780ffb9b27d57a5dc05ea93de"
+    sha256 cellar: :any,                 sonoma:         "5c2ee41824fcb154b46f9fa967f203fbf9009d2051f8c898375d69d333052988"
+    sha256 cellar: :any,                 ventura:        "91459cb108161201a81fdd0e96a126e9843be8213112c208051e8e72ce9736f9"
+    sha256 cellar: :any,                 monterey:       "316b0954e21f76c013d8c581c589e4f884231687eb2253a9f9a38a77a87728a6"
+    sha256 cellar: :any_skip_relocation, x86_64_linux:   "2d5be1290e8161d9a49b3fd191fc8423aac29f61fbc84148c8ba08cdc03d8d84"
+  end
+
+  depends_on "pkg-config" => :build
+  depends_on "ruby"
+  uses_from_macos "libffi", since: :catalina
+
+  def install
+    ENV["GEM_HOME"] = libexec
+    system "gem", "build", "cocoapods.gemspec"
+    system "gem", "install", "cocoapods-#{version}.gem"
+    # Other executables don't work currently.
+    bin.install libexec/"bin/pod", libexec/"bin/xcodeproj"
+    bin.env_script_all_files(libexec/"bin", GEM_HOME: ENV["GEM_HOME"])
+  end
+
+  test do
+    system "#{bin}/pod", "list"
+  end
+end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yahoo/uds",
   "description": "Yahoo Universal System",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "type": "module",
   "bin": {
     "uds": "./cli/uds-cli"
@@ -88,10 +88,10 @@
     "build": "bun run build:fontcss && bun run build:fixtures && tsup",
     "build:css": "tailwindcss --input ./src/tailwind/uds.css --output ./generated/uds.css --config ./src/tailwind/tailwind.config.ts",
     "build:fixtures": "bun run ./scripts/buildFixtures.ts",
-    "build:fontcss": "tsx ./scripts/generateFontCSS.ts --output ./generated/fonts.css",
+    "build:fontcss": "bun run ./scripts/generateFontCSS.ts --output ./generated/fonts.css",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
     "dev": "concurrently bun:dev:*",
-    "dev:fontcss": "tsx watch --clear-screen=false ./scripts/generateFontCSS.ts --output ./generated/fonts.css",
+    "dev:fontcss": "bun run --watch --clear-screen=false ./scripts/generateFontCSS.ts --output ./generated/fonts.css",
     "dev:ts": "tsup --watch",
     "lint": "ESLINT_USE_FLAT_CONFIG=true eslint -c eslint.config.mjs .",
     "lint:pkg": "bun publint",
@@ -113,18 +113,9 @@
     "tailwind-merge": "^2.2.1"
   },
   "devDependencies": {
-    "@gorhom/bottom-sheet": "^4.6.0",
-    "@react-navigation/native": "^6.0.2",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "concurrently": "^8.2.2",
-    "expo-constants": "^15.4.5",
-    "expo-image": "^1.10.4",
-    "expo-status-bar": "^1.11.1",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "^0.73.2",
-    "react-native-safe-area-context": "^4.8.2",
     "shared": "workspace:*",
     "tsconfig": "workspace:*",
     "tsup": "^8.0.1",
@@ -143,9 +134,6 @@
     "tailwindcss": "^3.4.1"
   },
   "peerDependenciesMeta": {
-    "@expo/eas-json": {
-      "optional": true
-    },
     "@gorhom/bottom-sheet": {
       "optional": true
     },