Harmonizes the main entry files for build

PaulSzymanski · Oct 14, 2015 · 6a7a3ce · 6a7a3ce
1 parent ec4b2ee
commit 6a7a3ce
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ios/iosApp/AppDelegate.m b/ios/iosApp/AppDelegate.m
@@ -31,7 +31,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
    * on the same Wi-Fi network.
    */
 
-  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
+  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/src/index.ios.bundle?platform=ios&dev=true"];
 
   /**
    * OPTION 2

diff --git a/index.ios.js → src/index.ios.js b/index.ios.js → src/index.ios.js
@@ -12,9 +12,9 @@ import React, {
 } from 'react-native';
 import { Component } from 'react';
 
-import Screen from './src/common/components/Screen';
-import Formulae from './src/common/components/Formulae';
-import Keyboard from './src/common/components/Keyboard';
+import Screen from './common/components/Screen';
+import Formulae from './common/components/Formulae';
+import Keyboard from './common/components/Keyboard';
 
 class iosApp extends Component {
   render() {

diff --git a/src/specificWebAndNW/main.js → src/index.js b/src/specificWebAndNW/main.js → src/index.js
@@ -1,13 +1,13 @@
 'use strict';
 
-import App from '../common/components/App';
+import App from './common/components/App';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route } from 'react-router';
 
 // CSS
 require('normalize.css');
-require('../styles/main.css');
+require('./styles/main.css');
 
 var content = document.getElementById('content');
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -16,7 +16,7 @@ module.exports = {
   devtool: false,
   entry: [
       'webpack/hot/only-dev-server',
-      './src/specificWebAndNW/main.js'
+      './src/index.js'
   ],
   stats: {
     colors: true,

diff --git a/webpack.dist.config.js b/webpack.dist.config.js
@@ -16,7 +16,7 @@ module.exports = {
   },
   debug: false,
   devtool: false,
-  entry: './src/specificWebAndNW/main.js',
+  entry: './src/index.js',
   stats: {
     colors: true,
     reasons: false