expo-constants 13.2.2 → 13.2.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 13.2.3 — 2022-07-25
+
+### 🐛 Bug fixes
+
+- Deprecated the unreliable `source-login-scripts.sh` and sourcing the Node.js binary path from `.xcode.env` and `.xcode.env.local`. ([#18330](https://github.com/expo/expo/pull/18330) by [@kudo](https://github.com/kudo))
+
 ## 13.2.2 — 2022-07-16
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'maven-publish'
 
 group = 'host.exp.exponent'
-version = '13.2.2'
+version = '13.2.3'
 
 apply from: "../scripts/get-app-config-android.gradle"
 
@@ -76,7 +76,7 @@ android {
     minSdkVersion safeExtGet("minSdkVersion", 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 33
-    versionName "13.2.2"
+    versionName "13.2.3"
   }
   lintOptions {
     abortOnError false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-constants",
-  "version": "13.2.2",
+  "version": "13.2.3",
   "description": "Provides system information that remains constant throughout the lifetime of your app.",
   "main": "build/Constants.js",
   "types": "build/Constants.d.ts",
@@ -43,5 +43,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "c6678c65b68e45062d49a2deea8e822f69388278"
+  "gitHead": "066000e04629874e1c67f2b3b9a38af805d9831c"
 }

package/scripts/get-app-config-ios.sh

@@ -4,23 +4,7 @@ set -eo pipefail
 
 DEST="$CONFIGURATION_BUILD_DIR"
 RESOURCE_BUNDLE_NAME="EXConstants.bundle"
-# ref: https://github.com/facebook/react-native/blob/c974cbff04a8d90ac0f856dbada3fc5a75c75b49/scripts/react-native-xcode.sh#L59-L65
-# Path to expo-constants folder inside node_modules
-EXPO_CONSTANTS_PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-
-# Suppress environment errors from sourcing the login scripts
-set +e
-source "$EXPO_CONSTANTS_PACKAGE_DIR/scripts/source-login-scripts.sh"
-set -e
-
-NODE_BINARY=${NODE_BINARY:-node}
-
-if ! [ -x "$(command -v "$NODE_BINARY")" ]; then
-  echo 'Error: cannot find the node binary. Try setting the NODE_BINARY variable in the ' \
-  '"Bundle React Native code and images" Build Phase to the absolute path to your node binary. ' \
-  'You can find it by executing "which node" in a terminal window.' >&2
-  exit 1
-fi
+EXPO_CONSTANTS_PACKAGE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"
 
 # For classic main project build phases integration, will be no-op to prevent duplicated app.config creation.
 #
@@ -38,4 +22,4 @@ PROJECT_ROOT=${PROJECT_ROOT:-"$EXPO_CONSTANTS_PACKAGE_DIR/../.."}
 
 cd "$PROJECT_ROOT" || exit
 
-"$NODE_BINARY" "${EXPO_CONSTANTS_PACKAGE_DIR}/scripts/getAppConfig.js" "$PROJECT_ROOT" "$DEST/$RESOURCE_BUNDLE_NAME"
+"${EXPO_CONSTANTS_PACKAGE_DIR}/scripts/with-node.sh" "${EXPO_CONSTANTS_PACKAGE_DIR}/scripts/getAppConfig.js" "$PROJECT_ROOT" "$DEST/$RESOURCE_BUNDLE_NAME"

package/scripts/with-node.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2018-present 650 Industries. All rights reserved.
+#
+# @generated by expo-module-scripts
+#
+# USAGE:
+# ./with-node.sh command
+
+CURR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
+# Start with a default
+NODE_BINARY=$(command -v node)
+export NODE_BINARY
+
+# Override the default with the global environment
+ENV_PATH="$PODS_ROOT/../.xcode.env"
+if [[ -f "$ENV_PATH" ]]; then
+  source "$ENV_PATH"
+fi
+
+# Override the global with the local environment
+LOCAL_ENV_PATH="${ENV_PATH}.local"
+if [[ -f "$LOCAL_ENV_PATH" ]]; then
+  source "$LOCAL_ENV_PATH"
+fi
+
+if [[ -n "$NODE_BINARY" && -x "$NODE_BINARY" ]]; then
+  echo "Node found at: ${NODE_BINARY}"
+else
+  cat >&2 << EOF
+[ERROR] Could not find "node" while running an Xcode build script. You need to specify the path to your Node.js executable by defining an environment variable named NODE_BINARY in your project's .xcode.env or .xcode.env.local file. You can set this up quickly by running:
+
+  echo "export NODE_BINARY=\$(command -v node)" >> .xcode.env
+
+in the ios folder of your project.
+EOF
+  exit 1
+fi
+
+# Execute argument, if present
+if [[ "$#" -gt 0 ]]; then
+  "$NODE_BINARY" $@
+fi

package/scripts/source-login-scripts.sh

@@ -1,52 +0,0 @@
-# shellcheck shell=bash disable=SC1090,SC1091
-
-# @generated by expo-module-scripts
-
-# Source login scripts to simulate running in an interactive login shell to
-# configure environment variables as if the user had opened a shell. This
-# script is intended for Xcode build phase scripts on macOS and does not have
-# a shebang so it inherits the current shell.
-
-current_shell=$(ps -cp "$$" -o comm='' | sed 's/^-//')
-
-# attempt to source via nvm
-if [ -f "$HOME/.nvm/nvm.sh" ]; then
-  . "$HOME/.nvm/nvm.sh"
-fi
-
-if [[ "$current_shell" == zsh ]]; then
-   # Zsh's setup script order is:
-   #   /etc/zshenv
-   #   ~/.zshenv
-   #   /etc/zprofile
-   #   ~/.zprofile
-   #   /etc/zshrc
-   #   ~/.zshrc
-   #   /etc/zlogin
-   #   ~/.zlogin
-   # http://zsh.sourceforge.net/Guide/zshguide02.html
-
-   if [ -f /etc/zshenv ]; then . /etc/zshenv; fi
-   if [ -f ~/.zshenv ]; then . ~/.zshenv; fi
-   if [ -f /etc/zprofile ]; then . /etc/zprofile; fi
-   if [ -f ~/.zprofile ]; then . ~/.zprofile; fi
-   if [ -f /etc/zshrc ]; then . /etc/zshrc; fi
-   if [ -f ~/.zshrc ]; then . ~/.zshrc; fi
-   if [ -f /etc/zlogin ]; then . /etc/zlogin; fi
-   if [ -f ~/.zlogin ]; then . ~/.zlogin; fi
-else
-   # Bash's setup script order is:
-   #   /etc/profile (if it exists)
-   #   The first of: ~/.bash_profile, ~/.bash_login, and ~/.profile
-   # https://www.gnu.org/software/bash/manual/html_node/Bash-Startup-Files.html
-
-   if [ -f /etc/profile ]; then . /etc/profile; fi
-
-   if [ -f ~/.bash_profile ]; then
-      . ~/.bash_profile
-   elif [ -f ~/.bash_login ]; then
-      . ~/.bash_login
-   elif [ -f ~/.profile ]; then
-      . ~/.profile
-   fi
-fi