From d71d66c36945a9e6840c4d2e8fcea109c74f9971 Mon Sep 17 00:00:00 2001 From: Andrey Bukati Date: Sun, 4 Oct 2015 15:48:52 +0300 Subject: [PATCH 1/3] Xcode 7 allow all connections --- .idea/jsLibraryMappings.xml | 6 ++++++ .idea/watcherTasks.xml | 4 ++++ iOS/Info.plist | 8 +++++++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .idea/jsLibraryMappings.xml create mode 100644 .idea/watcherTasks.xml diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..b8387eb --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..0df7231 --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/iOS/Info.plist b/iOS/Info.plist index 0a56a6e..a3d2c2f 100644 --- a/iOS/Info.plist +++ b/iOS/Info.plist @@ -38,5 +38,11 @@ NSLocationWhenInUseUsageDescription - + NSAppTransportSecurity + + + NSAllowsArbitraryLoads + + + From 766edcbfa5bbad4c7d363fb7e3589e92e8a2effd Mon Sep 17 00:00:00 2001 From: Andrey Bukati Date: Sun, 4 Oct 2015 15:50:32 +0300 Subject: [PATCH 2/3] react-natice-webpack-server added + npm start now also runs npm install --- package.json | 45 ++++++++++++++++++++++++++++++--------------- webpack.config.js | 4 +++- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 8d45b24..a2065e0 100644 --- a/package.json +++ b/package.json @@ -1,19 +1,34 @@ { - "name": "ReactNativeEs6Reflux", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "node_modules/react-native/packager/packager.sh", - "webpack": "webpack --config webpack.config.js" - }, + "name": "react-native-es6-reflux", + "version": "1.0.0", + "description": "As the very long repo title indicates, this is a boilerplate repository that includes the following:", + "main": "ignored-modules.js", "dependencies": { - "babel-core": "^5.1.8", - "babel-loader": "^5.0.0", - "babel-runtime": "^5.1.8", "eslint": "^0.19.0", - "eslint-plugin-react": "^2.2.0", - "react-native": "^0.5.0", - "reflux": "^0.2.7", - "webpack": "^1.8.4" - } + "babel-runtime": "^5.8.25", + "babel-loader": "^5.3.2", + "babel-core": "^5.8.25", + "eslint-plugin-react": "^2.7.1", + "react-native": "^0.11.4", + "react-native-webpack-server": "^0.6.0", + "react": "^0.13.3", + "reflux": "^0.2.12", + "webpack-dev-server": "^1.12.0", + "webpack": "^1.12.2" + }, + "devDependencies": {}, + "scripts": { + "prestart": "npm install", + "start": "rnws start" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Bukati/react-native-es6-reflux.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Bukati/react-native-es6-reflux/issues" + }, + "homepage": "https://github.com/Bukati/react-native-es6-reflux#readme" } diff --git a/webpack.config.js b/webpack.config.js index d3e9447..e476fbf 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -7,7 +7,9 @@ var path = require("path"); module.exports = { watch: true, - entry: path.join(__dirname, "/src/main.js"), + entry: { + 'index.ios': path.join(__dirname, "/src/main.js") + }, externals: [require("./ignored-modules")], module: { loaders: [ From 191c69af97f31e26b1b1ebe986127166243dc3f3 Mon Sep 17 00:00:00 2001 From: Andrey Bukati Date: Sun, 4 Oct 2015 15:50:58 +0300 Subject: [PATCH 3/3] .idea added to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fd29ebe..fea8267 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ node_modules/ npm-debug.log index.ios.js +.idea \ No newline at end of file