Deleted webpack and upgraded packages for may

.babelrc

-{
-  "presets": ["react-native"]
-}

.eslintrc.json

@@ -44,7 +44,8 @@
         "react-native/no-color-literals": 2,
         "react/jsx-filename-extension": 0,
         "react/prefer-stateless-function": 1,
-        "import/prefer-default-export": 1
+        "import/prefer-default-export": 1,
+        "import/no-extraneous-dependencies": ["error", {"packageDir": "."}]
     },
     "settings": {
         "import/resolver": {

.flowconfig

@@ -36,12 +36,12 @@ suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-2]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
+suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(4[0-5]\\|[1-3][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.42.0
+^0.45.0

android/app/build.gradle

@@ -34,6 +34,13 @@ import com.android.build.OutputFile
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *

app/components/Calendar.js

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Text, View, SectionList } from 'react-native';
 import { connect } from 'react-redux';
 import Moment from 'moment';
@@ -161,20 +162,20 @@ class Calendar extends Component {
 }
 
 Calendar.propTypes = {
-  eventList: React.PropTypes.arrayOf(React.PropTypes.shape({
-    pk: React.PropTypes.number,
-    title: React.PropTypes.string,
-    description: React.PropTypes.string,
-    start: React.PropTypes.string,
-    end: React.PropTypes.string,
-    location: React.PropTypes.string,
-    price: React.PropTypes.string,
-    registered: React.PropTypes.bool,
-    pizza: React.PropTypes.bool,
+  eventList: PropTypes.arrayOf(PropTypes.shape({
+    pk: PropTypes.number,
+    title: PropTypes.string,
+    description: PropTypes.string,
+    start: PropTypes.string,
+    end: PropTypes.string,
+    location: PropTypes.string,
+    price: PropTypes.string,
+    registered: PropTypes.bool,
+    pizza: PropTypes.bool,
   })).isRequired,
-  calendarFetched: React.PropTypes.bool.isRequired,
-  retrieveCalendar: React.PropTypes.func.isRequired,
-  token: React.PropTypes.string.isRequired,
+  calendarFetched: PropTypes.bool.isRequired,
+  retrieveCalendar: PropTypes.func.isRequired,
+  token: PropTypes.string.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/Event.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { Image, ScrollView, Text, View } from 'react-native';
 import { connect } from 'react-redux';
 import Moment from 'moment';
@@ -249,39 +250,39 @@ const Event = (props) => {
 };
 
 Event.propTypes = {
-  data: React.PropTypes.shape({
-    pk: React.PropTypes.number.isRequired,
-    title: React.PropTypes.string.isRequired,
-    description: React.PropTypes.string.isRequired,
-    start: React.PropTypes.string.isRequired,
-    end: React.PropTypes.string.isRequired,
-    organiser: React.PropTypes.number.isRequired,
-    location: React.PropTypes.string.isRequired,
-    map_location: React.PropTypes.string.isRequired,
-    status: React.PropTypes.number.isRequired,
-    registration_allowed: React.PropTypes.bool.isRequired,
-    has_fields: React.PropTypes.bool.isRequired,
-    registration_start: React.PropTypes.string,
-    registration_end: React.PropTypes.string,
-    cancel_deadline: React.PropTypes.string,
-    max_participants: React.PropTypes.number,
-    num_participants: React.PropTypes.number,
-    price: React.PropTypes.string,
-    fine: React.PropTypes.string,
-    user_registration: React.PropTypes.shape({
-      registered_on: React.PropTypes.string,
-      queue_position: React.PropTypes.number,
-      is_cancelled: React.PropTypes.bool,
-      is_late_cancellation: React.PropTypes.bool,
+  data: PropTypes.shape({
+    pk: PropTypes.number.isRequired,
+    title: PropTypes.string.isRequired,
+    description: PropTypes.string.isRequired,
+    start: PropTypes.string.isRequired,
+    end: PropTypes.string.isRequired,
+    organiser: PropTypes.number.isRequired,
+    location: PropTypes.string.isRequired,
+    map_location: PropTypes.string.isRequired,
+    status: PropTypes.number.isRequired,
+    registration_allowed: PropTypes.bool.isRequired,
+    has_fields: PropTypes.bool.isRequired,
+    registration_start: PropTypes.string,
+    registration_end: PropTypes.string,
+    cancel_deadline: PropTypes.string,
+    max_participants: PropTypes.number,
+    num_participants: PropTypes.number,
+    price: PropTypes.string,
+    fine: PropTypes.string,
+    user_registration: PropTypes.shape({
+      registered_on: PropTypes.string,
+      queue_position: PropTypes.number,
+      is_cancelled: PropTypes.bool,
+      is_late_cancellation: PropTypes.bool,
     }),
-    no_registration_message: React.PropTypes.string,
+    no_registration_message: PropTypes.string,
   }).isRequired,
-  registrations: React.PropTypes.arrayOf(React.PropTypes.shape({
-    pk: React.PropTypes.number.isRequired,
-    member: React.PropTypes.number,
-    name: React.PropTypes.string.isRequired,
+  registrations: PropTypes.arrayOf(PropTypes.shape({
+    pk: PropTypes.number.isRequired,
+    member: PropTypes.number,
+    name: PropTypes.string.isRequired,
   })).isRequired,
-  success: React.PropTypes.bool.isRequired,
+  success: PropTypes.bool.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/EventCard.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, TouchableHighlight } from 'react-native';
 import { connect } from 'react-redux';
 import Moment from 'moment';
@@ -33,19 +34,19 @@ const EventCard = props => (
 );
 
 EventCard.propTypes = {
-  event: React.PropTypes.shape({
-    title: React.PropTypes.string,
-    description: React.PropTypes.string,
-    start: React.PropTypes.string,
-    end: React.PropTypes.string,
-    location: React.PropTypes.string,
-    price: React.PropTypes.string,
-    pk: React.PropTypes.number,
-    registered: React.PropTypes.bool,
-    pizza: React.PropTypes.bool,
+  event: PropTypes.shape({
+    title: PropTypes.string,
+    description: PropTypes.string,
+    start: PropTypes.string,
+    end: PropTypes.string,
+    location: PropTypes.string,
+    price: PropTypes.string,
+    pk: PropTypes.number,
+    registered: PropTypes.bool,
+    pizza: PropTypes.bool,
   }).isRequired,
-  loadEvent: React.PropTypes.func.isRequired,
-  token: React.PropTypes.string.isRequired,
+  loadEvent: PropTypes.func.isRequired,
+  token: PropTypes.string.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/EventDetailCard.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, TouchableOpacity, Linking } from 'react-native';
 import { connect } from 'react-redux';
 import Moment from 'moment';
@@ -66,19 +67,19 @@ const EventDetailCard = props => (
 );
 
 EventDetailCard.propTypes = {
-  event: React.PropTypes.shape({
-    title: React.PropTypes.string,
-    description: React.PropTypes.string,
-    start: React.PropTypes.string,
-    end: React.PropTypes.string,
-    location: React.PropTypes.string,
-    price: React.PropTypes.string,
-    pk: React.PropTypes.number,
-    registered: React.PropTypes.bool,
-    pizza: React.PropTypes.bool,
+  event: PropTypes.shape({
+    title: PropTypes.string,
+    description: PropTypes.string,
+    start: PropTypes.string,
+    end: PropTypes.string,
+    location: PropTypes.string,
+    price: PropTypes.string,
+    pk: PropTypes.number,
+    registered: PropTypes.bool,
+    pizza: PropTypes.bool,
   }).isRequired,
-  loadEvent: React.PropTypes.func.isRequired,
-  token: React.PropTypes.string.isRequired,
+  loadEvent: PropTypes.func.isRequired,
+  token: PropTypes.string.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/Login.js

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, TextInput, Text, Linking, Image, TouchableOpacity, KeyboardAvoidingView } from 'react-native';
 import { connect } from 'react-redux';
 import SnackBar from 'react-native-snackbar-component';
@@ -70,8 +71,8 @@ class Login extends Component {
 }
 
 Login.propTypes = {
-  loginState: React.PropTypes.string.isRequired,
-  login: React.PropTypes.func.isRequired,
+  loginState: PropTypes.string.isRequired,
+  login: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = state => state.session;

app/components/MemberView.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { Image, Text, ViewPropTypes, StyleSheet } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { connect } from 'react-redux';
@@ -15,9 +16,9 @@ const MemberView = props => (
   );
 
 MemberView.propTypes = {
-  member: React.PropTypes.shape({
-    name: React.PropTypes.string,
-    photo: React.PropTypes.string,
+  member: PropTypes.shape({
+    name: PropTypes.string,
+    photo: PropTypes.string,
   }).isRequired,
   style: ViewPropTypes.style,
 };

app/components/Sidebar.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { Text, View, Image, TouchableHighlight } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { connect } from 'react-redux';
@@ -84,11 +85,11 @@ const Sidebar = (props) => {
 };
 
 Sidebar.propTypes = {
-  currentScene: React.PropTypes.string.isRequired,
-  displayName: React.PropTypes.string.isRequired,
-  photo: React.PropTypes.string.isRequired,
-  navigate: React.PropTypes.func.isRequired,
-  logout: React.PropTypes.func.isRequired,
+  currentScene: PropTypes.string.isRequired,
+  displayName: PropTypes.string.isRequired,
+  photo: PropTypes.string.isRequired,
+  navigate: PropTypes.func.isRequired,
+  logout: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/SquareView.js

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, ViewPropTypes, StyleSheet } from 'react-native';
 
 class SquareView extends Component {
@@ -44,7 +45,7 @@ class SquareView extends Component {
 }
 
 SquareView.propTypes = {
-  children: React.PropTypes.node.isRequired,
+  children: PropTypes.node.isRequired,
   style: ViewPropTypes.style,
 };
 

app/components/Welcome.js

 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { View, Text, SectionList, TouchableOpacity } from 'react-native';
 import { connect } from 'react-redux';
 import Moment from 'moment';
@@ -54,7 +55,7 @@ const Footer = props => (
 );
 
 Footer.propTypes = {
-  navigate: React.PropTypes.func.isRequired,
+  navigate: PropTypes.func.isRequired,
 };
 
 const mapDispatchToPropsFooter = dispatch => ({
@@ -112,19 +113,19 @@ class Welcome extends Component {
 }
 
 Welcome.propTypes = {
-  eventList: React.PropTypes.arrayOf(React.PropTypes.shape({
-    title: React.PropTypes.string,
-    description: React.PropTypes.string,
-    start: React.PropTypes.string,
-    end: React.PropTypes.string,
-    location: React.PropTypes.string,
-    price: React.PropTypes.string,
-    pk: React.PropTypes.number,
-    registered: React.PropTypes.bool,
-    pizza: React.PropTypes.bool,
+  eventList: PropTypes.arrayOf(PropTypes.shape({
+    title: PropTypes.string,
+    description: PropTypes.string,
+    start: PropTypes.string,
+    end: PropTypes.string,
+    location: PropTypes.string,
+    price: PropTypes.string,
+    pk: PropTypes.number,
+    registered: PropTypes.bool,
+    pizza: PropTypes.bool,
   })).isRequired,
-  token: React.PropTypes.string.isRequired,
-  retrieveShortlist: React.PropTypes.func.isRequired,
+  token: PropTypes.string.isRequired,
+  retrieveShortlist: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = state => ({

app/components/navigator.js

 import React from 'react';
+import PropTypes from 'prop-types';
 import { Text, View, StatusBar, TouchableOpacity } from 'react-native';
 import { connect } from 'react-redux';
 import Drawer from 'react-native-drawer';
@@ -93,12 +94,12 @@ const ReduxNavigator = (props) => {
 };
 
 ReduxNavigator.propTypes = {
-  currentScene: React.PropTypes.string.isRequired,
-  loggedIn: React.PropTypes.bool.isRequired,
-  drawerOpen: React.PropTypes.bool.isRequired,
-  isFirstScene: React.PropTypes.bool.isRequired,
-  updateDrawer: React.PropTypes.func.isRequired,
-  back: React.PropTypes.func.isRequired,
+  currentScene: PropTypes.string.isRequired,
+  loggedIn: PropTypes.bool.isRequired,
+  drawerOpen: PropTypes.bool.isRequired,
+  isFirstScene: PropTypes.bool.isRequired,
+  updateDrawer: PropTypes.func.isRequired,
+  back: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = state => ({

package.json

@@ -20,8 +20,8 @@
   "dependencies": {
     "moment": "^2.18.1",
     "prop-types": "^15.5.8",
-    "react": "16.0.0-alpha.6",
-    "react-native": "0.44.2",
+    "react": "16.0.0-alpha.12",
+    "react-native": "0.45.0",
     "react-native-drawer": "^2.3.0",
     "react-native-linear-gradient": "^2.0.0",
     "react-native-snackbar-component": "^1.0.3",
@@ -33,7 +33,6 @@
   "devDependencies": {
     "babel-eslint": "^7.1.1",
     "babel-jest": "^18.0.0",
-    "babel-loader": "^6.4.1",
     "babel-polyfill": "^6.23.0",
     "babel-preset-react-native": "1.9.1",
     "eslint": "^3.15.0",
@@ -45,9 +44,6 @@
     "jest": "^19.0.2",
     "react-native-cli": "^2.0.1",
     "react-native-git-upgrade": "^0.2.7",
-    "react-native-web": "^0.0.81",
-    "react-test-renderer": "^15.5.4",
-    "url-loader": "^0.5.8",
-    "webpack": "^2.3.3"
+    "react-test-renderer": "^15.5.4"
   }
 }

webpack.config.js

-const path = require('path');
-
-module.exports = {
-  entry: './index.web.js',
-  output: {
-    filename: 'bundle.js',
-  },
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-      },
-      {
-        test: /\.js$/,
-        include: /node_modules\/react-native-/,
-        loader: 'babel-loader',
-      },
-      {
-        test: /\.ttf$/,
-        loader: 'url-loader',
-        include: path.resolve(__dirname, 'node_modules/react-native-vector-icons'),
-      },
-    ],
-  },
-  resolve: {
-    alias: {
-      'react-native': 'react-native-web',
-    },
-  },
-};