Skip to content
This repository has been archived by the owner on Jan 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #103 from nirre7/master
Browse files Browse the repository at this point in the history
Update Ignite Bowser to RN 0.57.3
  • Loading branch information
morgandonze authored Oct 12, 2018
2 parents 06597ff + 6a10edd commit 1449a2c
Show file tree
Hide file tree
Showing 12 changed files with 1,318 additions and 1,136 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# OSX
#
.idea
.DS_Store
npm-debug.log
npm-debug.log*
Expand Down
1 change: 0 additions & 1 deletion boilerplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ async function install (context) {
{ template: '.prettierignore', target: '.prettierignore' },
{ template: '.prettierrc', target: '.prettierrc' },
{ template: '.solidarity', target: '.solidarity' },
{ template: 'rn-cli.config.js', target: 'rn-cli.config.js' },
{ template: 'tsconfig.json', target: 'tsconfig.json' },
{ template: 'tslint.json', target: 'tslint.json' },
{ template: 'src/app/main.tsx.ejs', target: 'src/app/main.tsx' }
Expand Down
11 changes: 10 additions & 1 deletion boilerplate/.babelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"presets": ["react-native"],
"presets": ["module:metro-react-native-babel-preset"],
"env": {
"production": {
}
Expand All @@ -10,6 +10,15 @@
{
"include": ["NODE_ENV", "API"]
}
],
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
[
"@babel/plugin-proposal-optional-catch-binding"
]
]
}
49 changes: 22 additions & 27 deletions boilerplate/package.json.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,50 @@
"storybook": "storybook start -p 9001 --skip-packager"
},
"dependencies": {
"apisauce": "0.14.3",
"apisauce": "0.16.0",
"lodash.throttle": "4.1.1",
"mobx": "4.2.1",
"mobx-react": "5.1.2",
"mobx-react": "5.2.8",
"mobx-state-tree": "2.0.5",
"ramda": "0.25.0",
"react-native-languages": "^3.0.0",
"i18n-js": "^3.0.11",
"react-native-keychain": "3.0.0-rc.3",
"react-native-splash-screen": "3.0.6",
"react-navigation": "2.3.1",
"reactotron-mst": "2.1.0",
"reactotron-react-native": "2.1.0",
"react-native-keychain": "3.0.0",
"react-native-splash-screen": "3.1.1",
"react-navigation": "2.16.0",
"reactotron-mst": "^2.1.0",
"reactotron-react-native": "^2.1.0",
"validate.js": "0.12.0"
},
"devDependencies": {
"@babel/runtime": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
"@storybook/addon-storyshots": "github:infinitered/addon-storyshots",
"@storybook/react-native": "3.4.3",
"@types/jest": "22.2.3",
"@types/jest": "23.3.2",
"@types/ramda": "0.25.28",
"@types/react": "16.0.40",
"@types/react-native": "0.55.12",
"@types/react-navigation": "2.0.6",
"@types/react-test-renderer": "16.0.1",
"@types/react": "16.4.14",
"@types/react-native": "0.56.24",
"@types/react-navigation": "2.0.22",
"@types/react-test-renderer": "16.0.2",
"@types/validate.js": "0.11.0",
"babel-plugin-transform-inline-environment-variables": "0.4.1",
"jest-preset-ignite": "0.5.0",
"babel-plugin-transform-inline-environment-variables": "0.4.3",
"jest-preset-ignite": "0.6.1",
"npm-run-all": "4.1.3",
"patch-package": "5.1.1",
"postinstall-prepare": "1.0.1",
"prettier": "1.12.1",
"react-dom": "16.2.0",
"react-native-typescript-transformer": "1.2.5",
"react-dom": "16.5.0",
"react-powerplug": "0.1.5",
"react-test-renderer": "16.3.1",
"rimraf": "2.6.2",
"solidarity": "2.1.0",
"tslint": "5.10.0",
"tslint-config-prettier": "1.12.0",
"typescript": "2.8.3"
"tslint": "5.11.0",
"tslint-config-prettier": "1.15.0",
"typescript": "3.0.3"
},
"jest": {
"preset": "jest-preset-ignite",
"testPathIgnorePatterns": [
"/node_modules"
],
"globals": {
"__TEST__": true
}
"preset": "jest-preset-ignite"
},
"rnpm": {
"assets": [
Expand Down
34 changes: 17 additions & 17 deletions boilerplate/patches/splash-screen/splash-screen.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ index 7964134..89d24a5 100644
--- a/android/app/src/main/java/com/SplashScreenPatch/MainActivity.java
+++ b/android/app/src/main/java/com/SplashScreenPatch/MainActivity.java
@@ -2,8 +2,16 @@

+import android.os.Bundle;
import com.facebook.react.ReactActivity;
+import org.devio.rn.splashscreen.SplashScreen;

public class MainActivity extends ReactActivity {

+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ SplashScreen.show(this);
Expand Down Expand Up @@ -17206,20 +17206,20 @@ index 36c1405..379305f 100644
+++ b/ios/SplashScreenPatch/AppDelegate.m
@@ -6,6 +6,7 @@
*/

#import "AppDelegate.h"
+#import "SplashScreen.h"
+#import "RNSplashScreen.h"

#import <React/RCTBundleURLProvider.h>
#import <React/RCTRootView.h>
@@ -29,6 +30,7 @@
rootViewController.view = rootView;
self.window.rootViewController = rootViewController;
[self.window makeKeyAndVisible];
+ [SplashScreen show];
+ [RNSplashScreen show];
return YES;
}

diff --git a/ios/SplashScreenPatch/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/SplashScreenPatch/Images.xcassets/AppIcon.appiconset/Contents.json
index 118c98f..19882d5 100644
--- a/ios/SplashScreenPatch/Images.xcassets/AppIcon.appiconset/Contents.json
Expand Down Expand Up @@ -30447,6 +30447,8 @@ index 9c9b21f..babe043 100644
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string/>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIRequiredDeviceCapabilities</key>
Expand All @@ -30461,12 +30463,10 @@ index 9c9b21f..babe043 100644
- </array>
- <key>UIViewControllerBasedStatusBarAppearance</key>
- <false/>
- <key>NSLocationWhenInUseUsageDescription</key>
- <string/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSExceptionDomains</key>
@@ -51,6 +35,8 @@
<key>NSAllowsArbitraryLoads</key>
@@ -53,6 +37,8 @@
</dict>
</dict>
</dict>
Expand All @@ -30475,16 +30475,16 @@ index 9c9b21f..babe043 100644
<key>UIAppFonts</key>
<array>
<string>Montserrat-Black.ttf</string>
@@ -72,5 +58,19 @@
@@ -74,5 +60,19 @@
<string>Montserrat-Thin.ttf</string>
<string>Montserrat-ThinItalic.ttf</string>
</array>
+ <key>UIRequiredDeviceCapabilities</key>
+ <array>
+ <string>armv7</string>
+ </array>
+ <key>UIStatusBarStyle</key>
+ <string>UIStatusBarStyleLightContent</string>
+ <key>UIStatusBarStyle</key>
+ <string>UIStatusBarStyleLightContent</string>
+ <key>UISupportedInterfaceOrientations</key>
+ <array>
+ <string>UIInterfaceOrientationPortrait</string>
Expand Down Expand Up @@ -30513,8 +30513,8 @@ index 88a7c9c..87d2632 100644
rootStore: await setupRootStore(),
})
}

/**
--
--
2.17.0

8 changes: 0 additions & 8 deletions boilerplate/rn-cli.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion boilerplate/src/views/shared/text-field/text-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class TextField extends React.Component<TextFieldProps, {}> {
style: styleOverride,
inputStyle: inputStyleOverride,
forwardedRef,
...rest,
...rest
} = this.props
let containerStyle: ViewStyle = { ...CONTAINER, ...PRESETS[preset] }
containerStyle = enhance(containerStyle, styleOverride)
Expand Down
Loading

0 comments on commit 1449a2c

Please sign in to comment.