Skip to content

Commit

Permalink
Upgrade react native to 0.53.3
Browse files Browse the repository at this point in the history
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
  • Loading branch information
voxlet authored and flexsurfer committed Mar 2, 2018
1 parent a4efcd9 commit 35e8278
Show file tree
Hide file tree
Showing 9 changed files with 678 additions and 529 deletions.
19 changes: 12 additions & 7 deletions .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@
; Ignore polyfills
.*/Libraries/polyfills/.*

; Ignore metro
.*/node_modules/metro/.*

[include]

[libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/
flow/
node_modules/react-native/flow-github/

[options]
module.system=haste
Expand All @@ -47,17 +50,19 @@ munge_underscores=true
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'

module.file_ext=.js
module.file_ext=.jsx
module.file_ext=.json
module.file_ext=.native.js

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-6]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

unsafe.enable_getters_and_setters=true

[version]
^0.56.0
^0.63.0
8 changes: 5 additions & 3 deletions env/dev/env/android/main.cljs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns ^:figwheel-no-load env.android.main
(:require [reagent.core :as r]
[status-im.android.core :as core]
[figwheel.client :as figwheel :include-macros true]
[figwheel.client :as figwheel]
[re-frisk-remote.core :as rr]
[env.config :as conf]
[env.utils]
Expand All @@ -14,11 +14,13 @@

(def cnt (r/atom 0))
(defn reloader [] @cnt [core/app-root])

;; Do not delete, root-el is used by the figwheel-bridge.js
(def root-el (r/as-element [reloader]))

(figwheel/start {:websocket-url (:android conf/figwheel-urls)
(figwheel/start {:websocket-url (:android conf/figwheel-urls)
:heads-up-display false
:jsload-callback #(swap! cnt inc)})
:jsload-callback #(swap! cnt inc)})

(utils.handlers/add-pre-event-callback rr/pre-event-callback)

Expand Down
11 changes: 6 additions & 5 deletions env/dev/env/ios/main.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
[re-frisk-remote.core :as rr]
[status-im.ios.core :as core]
[status-im.utils.handlers :as utils.handlers]
[figwheel.client :as figwheel :include-macros true]
[figwheel.client :as figwheel]
[env.config :as conf]
[env.utils]
[cljs.pprint]))
[env.utils]))

(enable-console-print!)

Expand All @@ -15,11 +14,13 @@

(def cnt (r/atom 0))
(defn reloader [] @cnt [core/app-root])

;; Do not delete, root-el is used by the figwheel-bridge.js
(def root-el (r/as-element [reloader]))

(figwheel/start {:websocket-url (:ios conf/figwheel-urls)
(figwheel/start {:websocket-url (:ios conf/figwheel-urls)
:heads-up-display false
:jsload-callback #(swap! cnt inc)})
:jsload-callback #(swap! cnt inc)})

(utils.handlers/add-pre-event-callback rr/pre-event-callback)

Expand Down
14 changes: 7 additions & 7 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.1.1)
- Instabug (7.2.6)
- Protobuf (3.3.0)
- React (0.51.0):
- React/Core (= 0.51.0)
- React (0.53.3):
- React/Core (= 0.53.3)
- react-native-background-timer (2.0.0):
- React
- React/Core (0.51.0):
- yoga (= 0.51.0.React)
- yoga (0.51.0.React)
- React/Core (0.53.3):
- yoga (= 0.53.3.React)
- yoga (0.53.3.React)

DEPENDENCIES:
- FirebaseMessaging
Expand All @@ -51,9 +51,9 @@ SPEC CHECKSUMS:
GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
Instabug: 49d4fbf1bf14e2f9074dfb7774ca5611bae993b4
Protobuf: d582fecf68201eac3d79ed61369ef45734394b9c
React: 352f02f1db6e4744f9a758527e13e3fdefbbd6ba
React: fd20e9486c9d994fb6e40d6e67dbd29c7709889c
react-native-background-timer: 10063c04bf85d7f8811dff8c74399f0aa715245f
yoga: b5d96400ca8b2936965a7a6516da7c1177f432a3
yoga: c7c8e64dbc2552b1ceac0b491ff03f5e5128b501

PODFILE CHECKSUM: 2fb09df3e1ea33a8eef1757e72a6577bd5d547c1

Expand Down
Loading

0 comments on commit 35e8278

Please sign in to comment.