From f1746ac83e152249661aff92958e81bef392262d Mon Sep 17 00:00:00 2001
From: Amjad Masad <amasad@fb.com>
Date: Fri, 20 Mar 2015 15:51:11 -0700
Subject: [PATCH] [react-packager] change all but one `ix` to `require`

---
 Examples/UIExplorer/ImageCapInsetsExample.js  |  5 ++--
 Examples/UIExplorer/ImageExample.js           | 21 +++++++--------
 Examples/UIExplorer/TabBarExample.js          |  7 +++--
 .../Touchable/TouchableHighlight.js           |  2 +-
 .../Components/Touchable/TouchableOpacity.js  |  2 +-
 Libraries/Image/Image.ios.js                  |  2 +-
 Libraries/Image/ix.js                         | 26 -------------------
 Libraries/react-native/react-native.js        |  2 +-
 8 files changed, 19 insertions(+), 48 deletions(-)
 delete mode 100644 Libraries/Image/ix.js

diff --git a/Examples/UIExplorer/ImageCapInsetsExample.js b/Examples/UIExplorer/ImageCapInsetsExample.js
index 20fea43c712..d1efbdf2fb9 100644
--- a/Examples/UIExplorer/ImageCapInsetsExample.js
+++ b/Examples/UIExplorer/ImageCapInsetsExample.js
@@ -11,7 +11,6 @@ var {
   StyleSheet,
   Text,
   View,
-  ix,
 } = React;
 
 var ImageCapInsetsExample = React.createClass({
@@ -23,7 +22,7 @@ var ImageCapInsetsExample = React.createClass({
             capInsets: none
           </Text>
           <Image
-            source={ix('story-background')}
+            source={require('image!story-background')}
             style={styles.storyBackground}
             capInsets={{left: 0, right: 0, bottom: 0, top: 0}}
           />
@@ -33,7 +32,7 @@ var ImageCapInsetsExample = React.createClass({
             capInsets: 15
           </Text>
           <Image
-            source={ix('story-background')}
+            source={require('image!story-background')}
             style={styles.storyBackground}
             capInsets={{left: 15, right: 15, bottom: 15, top: 15}}
           />
diff --git a/Examples/UIExplorer/ImageExample.js b/Examples/UIExplorer/ImageExample.js
index 12b4d884349..7daf537911a 100644
--- a/Examples/UIExplorer/ImageExample.js
+++ b/Examples/UIExplorer/ImageExample.js
@@ -9,7 +9,6 @@ var {
   StyleSheet,
   Text,
   View,
-  ix,
 } = React;
 
 var ImageCapInsetsExample = require('./ImageCapInsetsExample');
@@ -34,15 +33,15 @@ exports.examples = [
   },
   {
     title: 'Plain Static Image',
-    description: 'Static assets must be referenced with the `ix` wrapper and ' +
-      'located in the app bundle.',
+    description: 'Static assets should be required by prefixing with `image!` ' +
+      'and are located in the app bundle.',
     render: function() {
       return (
         <View style={styles.horizontal}>
-          <Image source={ix('uie_thumb_normal')} style={styles.icon} />
-          <Image source={ix('uie_thumb_selected')} style={styles.icon} />
-          <Image source={ix('uie_comment_normal')} style={styles.icon} />
-          <Image source={ix('uie_comment_highlighted')} style={styles.icon} />
+          <Image source={require('image!uie_thumb_normal')} style={styles.icon} />
+          <Image source={require('image!uie_thumb_selected')} style={styles.icon} />
+          <Image source={require('image!uie_comment_normal')} style={styles.icon} />
+          <Image source={require('image!uie_comment_highlighted')} style={styles.icon} />
         </View>
       );
     },
@@ -184,19 +183,19 @@ exports.examples = [
       return (
         <View style={styles.horizontal}>
           <Image
-            source={ix('uie_thumb_normal')}
+            source={require('image!uie_thumb_normal')}
             style={[styles.icon, {tintColor: 'blue' }]}
           />
           <Image
-            source={ix('uie_thumb_normal')}
+            source={require('image!uie_thumb_normal')}
             style={[styles.icon, styles.leftMargin, {tintColor: 'green' }]}
           />
           <Image
-            source={ix('uie_thumb_normal')}
+            source={require('image!uie_thumb_normal')}
             style={[styles.icon, styles.leftMargin, {tintColor: 'red' }]}
           />
           <Image
-            source={ix('uie_thumb_normal')}
+            source={require('image!uie_thumb_normal')}
             style={[styles.icon, styles.leftMargin, {tintColor: 'black' }]}
           />
         </View>
diff --git a/Examples/UIExplorer/TabBarExample.js b/Examples/UIExplorer/TabBarExample.js
index 34518284da8..cd116b3e7f8 100644
--- a/Examples/UIExplorer/TabBarExample.js
+++ b/Examples/UIExplorer/TabBarExample.js
@@ -10,7 +10,6 @@ var StyleSheet = require('StyleSheet');
 var Text = require('Text');
 var View = require('View');
 
-var ix = require('ix');
 
 var TabBarExample = React.createClass({
 
@@ -42,7 +41,7 @@ var TabBarExample = React.createClass({
         selectedTab={this.state.selectedTab}>
         <TabBarItemIOS
           name="blueTab"
-          icon={ix('favorites')}
+          icon={require('image!favorites')}
           accessibilityLabel="Blue Tab"
           selected={this.state.selectedTab === 'blueTab'}
           onPress={() => {
@@ -55,7 +54,7 @@ var TabBarExample = React.createClass({
         <TabBarItemIOS
           accessibilityLabel="Red Tab"
           name="redTab"
-          icon={ix('history')}
+          icon={require('image!history')}
           badgeValue={this.state.notifCount ? String(this.state.notifCount) : null}
           selected={this.state.selectedTab === 'redTab'}
           onPress={() => {
@@ -68,7 +67,7 @@ var TabBarExample = React.createClass({
         </TabBarItemIOS>
         <TabBarItemIOS
           name="greenTab"
-          icon={ix('more')}
+          icon={require('image!more')}
           accessibilityLabel="Green Tab"
           selected={this.state.selectedTab === 'greenTab'}
           onPress={() => {
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 9bb539cebab..0794e19ae18 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -41,7 +41,7 @@ var DEFAULT_PROPS = {
  *     <TouchableHighlight onPress={this._onPressButton}>
  *       <Image
  *         style={styles.button}
- *         source={ix('myButton')}
+ *         source={require('image!myButton')}
  *       />
  *     </View>
  *   );
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index 549df36a86b..680fc87f575 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -30,7 +30,7 @@ var onlyChild = require('onlyChild');
  *     <TouchableOpacity onPress={this._onPressButton}>
  *       <Image
  *         style={styles.button}
- *         source={ix('myButton')}
+ *         source={require('image!myButton')}
  *       />
  *     </View>
  *   );
diff --git a/Libraries/Image/Image.ios.js b/Libraries/Image/Image.ios.js
index 315667d2518..c25e92654f9 100644
--- a/Libraries/Image/Image.ios.js
+++ b/Libraries/Image/Image.ios.js
@@ -36,7 +36,7 @@ var warning = require('warning');
  *     <View>
  *       <Image
  *         style={styles.icon}
- *         source={ix('myIcon')}
+ *         source={require('image!myIcon')}
  *       />
  *       <Image
  *         style={styles.logo}
diff --git a/Libraries/Image/ix.js b/Libraries/Image/ix.js
deleted file mode 100644
index 52cbbc4e2ac..00000000000
--- a/Libraries/Image/ix.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright 2004-present Facebook. All Rights Reserved.
- *
- * @providesModule ix
- */
-'use strict';
-
-/**
- * This function is used to mark string literals that are image paths. The
- * return value is a blob of data that core image components understand how to
- * render.
- *
- * The arguments to ix() must be string literals so that they can be parsed
- * statically.
- *
- * @param  string        Image path to render
- * @return object        Data blob to be used by core UI components
- */
-function ix(path) {
-  return {
-    uri: path,
-    isStatic: true,
-  };
-}
-
-module.exports = ix;
diff --git a/Libraries/react-native/react-native.js b/Libraries/react-native/react-native.js
index 59c82ef72cc..8c53abd53b5 100644
--- a/Libraries/react-native/react-native.js
+++ b/Libraries/react-native/react-native.js
@@ -45,7 +45,7 @@ var ReactNative = {
   TimerMixin: require('TimerMixin'),
   VibrationIOS: require('VibrationIOS'),
 
-  ix: require('ix'),
+  invariant: require('invariant'),
 };
 
 module.exports = ReactNative;