Upgrade react native to 0.53.3

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
Itoh, Masaru 2018-02-21 04:23:52 +09:00 committed by Andrey Shovkoplyas
parent a4efcd99c6
commit 35e8278e8c
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
9 changed files with 678 additions and 529 deletions

View File

@ -27,12 +27,15 @@
; Ignore polyfills ; Ignore polyfills
.*/Libraries/polyfills/.* .*/Libraries/polyfills/.*
; Ignore metro
.*/node_modules/metro/.*
[include] [include]
[libs] [libs]
node_modules/react-native/Libraries/react-native/react-native-interface.js node_modules/react-native/Libraries/react-native/react-native-interface.js
node_modules/react-native/flow/ node_modules/react-native/flow/
flow/ node_modules/react-native/flow-github/
[options] [options]
module.system=haste module.system=haste
@ -47,17 +50,19 @@ munge_underscores=true
module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub' 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.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=$FlowIssue
suppress_type=$FlowFixMe suppress_type=$FlowFixMe
suppress_type=$FlowFixMeProps suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState 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\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(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\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
unsafe.enable_getters_and_setters=true
[version] [version]
^0.56.0 ^0.63.0

View File

@ -1,7 +1,7 @@
(ns ^:figwheel-no-load env.android.main (ns ^:figwheel-no-load env.android.main
(:require [reagent.core :as r] (:require [reagent.core :as r]
[status-im.android.core :as core] [status-im.android.core :as core]
[figwheel.client :as figwheel :include-macros true] [figwheel.client :as figwheel]
[re-frisk-remote.core :as rr] [re-frisk-remote.core :as rr]
[env.config :as conf] [env.config :as conf]
[env.utils] [env.utils]
@ -14,11 +14,13 @@
(def cnt (r/atom 0)) (def cnt (r/atom 0))
(defn reloader [] @cnt [core/app-root]) (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])) (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 :heads-up-display false
:jsload-callback #(swap! cnt inc)}) :jsload-callback #(swap! cnt inc)})
(utils.handlers/add-pre-event-callback rr/pre-event-callback) (utils.handlers/add-pre-event-callback rr/pre-event-callback)

View File

@ -3,10 +3,9 @@
[re-frisk-remote.core :as rr] [re-frisk-remote.core :as rr]
[status-im.ios.core :as core] [status-im.ios.core :as core]
[status-im.utils.handlers :as utils.handlers] [status-im.utils.handlers :as utils.handlers]
[figwheel.client :as figwheel :include-macros true] [figwheel.client :as figwheel]
[env.config :as conf] [env.config :as conf]
[env.utils] [env.utils]))
[cljs.pprint]))
(enable-console-print!) (enable-console-print!)
@ -15,11 +14,13 @@
(def cnt (r/atom 0)) (def cnt (r/atom 0))
(defn reloader [] @cnt [core/app-root]) (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])) (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 :heads-up-display false
:jsload-callback #(swap! cnt inc)}) :jsload-callback #(swap! cnt inc)})
(utils.handlers/add-pre-event-callback rr/pre-event-callback) (utils.handlers/add-pre-event-callback rr/pre-event-callback)

View File

@ -20,13 +20,13 @@ PODS:
- GoogleToolboxForMac/Defines (= 2.1.1) - GoogleToolboxForMac/Defines (= 2.1.1)
- Instabug (7.2.6) - Instabug (7.2.6)
- Protobuf (3.3.0) - Protobuf (3.3.0)
- React (0.51.0): - React (0.53.3):
- React/Core (= 0.51.0) - React/Core (= 0.53.3)
- react-native-background-timer (2.0.0): - react-native-background-timer (2.0.0):
- React - React
- React/Core (0.51.0): - React/Core (0.53.3):
- yoga (= 0.51.0.React) - yoga (= 0.53.3.React)
- yoga (0.51.0.React) - yoga (0.53.3.React)
DEPENDENCIES: DEPENDENCIES:
- FirebaseMessaging - FirebaseMessaging
@ -51,9 +51,9 @@ SPEC CHECKSUMS:
GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0 GoogleToolboxForMac: 8e329f1b599f2512c6b10676d45736bcc2cbbeb0
Instabug: 49d4fbf1bf14e2f9074dfb7774ca5611bae993b4 Instabug: 49d4fbf1bf14e2f9074dfb7774ca5611bae993b4
Protobuf: d582fecf68201eac3d79ed61369ef45734394b9c Protobuf: d582fecf68201eac3d79ed61369ef45734394b9c
React: 352f02f1db6e4744f9a758527e13e3fdefbbd6ba React: fd20e9486c9d994fb6e40d6e67dbd29c7709889c
react-native-background-timer: 10063c04bf85d7f8811dff8c74399f0aa715245f react-native-background-timer: 10063c04bf85d7f8811dff8c74399f0aa715245f
yoga: b5d96400ca8b2936965a7a6516da7c1177f432a3 yoga: c7c8e64dbc2552b1ceac0b491ff03f5e5128b501
PODFILE CHECKSUM: 2fb09df3e1ea33a8eef1757e72a6577bd5d547c1 PODFILE CHECKSUM: 2fb09df3e1ea33a8eef1757e72a6577bd5d547c1

1129
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -42,10 +42,10 @@
"prop-types": "15.6.0", "prop-types": "15.6.0",
"punycode": "1.4.1", "punycode": "1.4.1",
"querystring-es3": "0.2.1", "querystring-es3": "0.2.1",
"re-natal": "0.8.0", "re-natal": "0.8.1",
"react": "16.2.0", "react": "16.2.0",
"react-dom": "16.2.0", "react-dom": "16.2.0",
"react-native": "0.51.0", "react-native": "0.53.3",
"react-native-action-button": "2.8.1", "react-native-action-button": "2.8.1",
"react-native-background-timer": "2.0.0", "react-native-background-timer": "2.0.0",
"react-native-camera": "0.10.0", "react-native-camera": "0.10.0",
@ -74,14 +74,14 @@
"react-native-webview-bridge": "github:status-im/react-native-webview-bridge#feature/camera-permissions", "react-native-webview-bridge": "github:status-im/react-native-webview-bridge#feature/camera-permissions",
"readable-stream": "1.1.14", "readable-stream": "1.1.14",
"realm": "2.0.7", "realm": "2.0.7",
"rn-snoopy": "github:status-im/rn-snoopy",
"stream-browserify": "1.0.0", "stream-browserify": "1.0.0",
"string_decoder": "0.10.31", "string_decoder": "0.10.31",
"timers-browserify": "1.4.2", "timers-browserify": "1.4.2",
"tty-browserify": "0.0.0", "tty-browserify": "0.0.0",
"url": "0.10.3", "url": "0.10.3",
"vm-browserify": "0.0.4", "vm-browserify": "0.0.4",
"web3": "github:status-im/web3.js#status-develop", "web3": "github:status-im/web3.js#status-develop"
"rn-snoopy": "github:status-im/rn-snoopy"
}, },
"browser": { "browser": {
"crypto": "react-native-crypto", "crypto": "react-native-crypto",

9
rn-cli.config.js Normal file
View File

@ -0,0 +1,9 @@
// workaround for react-native-vector-icons
// https://github.com/oblador/react-native-vector-icons/issues/626#issuecomment-362386341
const blacklist = require('metro/src/blacklist')
module.exports = {
getBlacklistRE () {
return blacklist([/react-native\/local-cli\/core\/__fixtures__.*/])
},
}

View File

@ -53,9 +53,10 @@
(re-frame/dispatch [:update-input-data])))) (re-frame/dispatch [:update-input-data]))))
:on-content-size-change (when (and (not input-focused?) :on-content-size-change (when (and (not input-focused?)
(not single-line-input?)) (not single-line-input?))
#(let [h (-> (.-nativeEvent %) #(let [s (.-contentSize (.-nativeEvent %))
(.-contentSize) w (.-width s)
(.-height))] h (.-height s)]
(set-container-width-fn w)
(set-layout-height-fn h))) (set-layout-height-fn h)))
:on-selection-change #(let [s (-> (.-nativeEvent %) :on-selection-change #(let [s (-> (.-nativeEvent %)
(.-selection)) (.-selection))

View File

@ -101,7 +101,7 @@
(defn- base-list-props (defn- base-list-props
[{:keys [render-fn empty-component header separator default-separator?]}] [{:keys [render-fn empty-component header separator default-separator?]}]
(let [separator (or separator (when (and platform/ios? default-separator?) default-separator))] (let [separator (or separator (when (and platform/ios? default-separator?) default-separator))]
(merge {:keyExtractor (fn [_ i] i)} (merge {:keyExtractor (fn [_ i] (str i))}
(when render-fn {:renderItem (wrap-render-fn render-fn)}) (when render-fn {:renderItem (wrap-render-fn render-fn)})
(when separator {:ItemSeparatorComponent (fn [] (reagent/as-element separator))}) (when separator {:ItemSeparatorComponent (fn [] (reagent/as-element separator))})
(when empty-component {:ListEmptyComponent (fn [] (reagent/as-element empty-component))}) (when empty-component {:ListEmptyComponent (fn [] (reagent/as-element empty-component))})