Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade react-navigation to v.2.12.1 #3223

Merged
merged 2 commits into from
Aug 28, 2018
Merged

Upgrade react-navigation to v.2.12.1 #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1db74
Upgrade of react-navigation to v2.12.1
daviscabral Aug 28, 2018
c9d6a1b
Merge branch 'master' into dc/issue/3222
daviscabral Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/Example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Platform, StyleSheet, Text, View } from 'react-native';
import CardStackStyleInterpolator from 'react-navigation/src/views/StackView/StackViewStyleInterpolator';
import CardStackStyleInterpolator from 'react-navigation-stack/dist/views/StackView/StackViewStyleInterpolator';
import { Scene, Router, Actions, Reducer, ActionConst, Overlay, Tabs, Modal, Drawer, Stack, Lightbox } from 'react-native-router-flux';
import Launch from './components/Launch';
import Register from './components/Register';
Expand Down
9 changes: 4 additions & 5 deletions Example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@
"*/babel-core": "7.0.0-bridge.0"
},
"dependencies": {
"prop-types": "15.6.2",
"react": "16.4.1",
"react-native": "0.56.0",
"prop-types": "^15.6.2",
"react": "^16.4.1",
"react-native": "^0.56.0",
"react-native-button": "^2.3.0",
"react-native-message-bar": "^2.0.10",
"react-native-router-flux": "file:..",
"react-navigation": "^2.11.2"
"react-navigation": "^2.12.1"
},
"devDependencies": {
"@babel/code-frame": "7.0.0-beta.47",
"@babel/core": "7.0.0-beta.47",
"@babel/plugin-proposal-decorators": "7.0.0-beta.47",
"autobind-decorator": "^2.1.0",
Expand Down
41 changes: 23 additions & 18 deletions Example/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4122,9 +4122,9 @@ path-to-regexp@^1.7.0:
dependencies:
isarray "0.0.1"

path-to-regexp@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.3.0.tgz#690d682cb9e2dde26d25f41bcc2b4774b67d1fa2"
path-to-regexp@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"

path-type@^1.0.0:
version "1.1.0"
Expand Down Expand Up @@ -4256,7 +4256,7 @@ prompts@^0.1.9:
kleur "^2.0.1"
sisteransi "^0.1.1"

prop-types@15.6.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies:
Expand Down Expand Up @@ -4361,23 +4361,23 @@ react-native-message-bar@^2.0.10:
resolved "https://registry.yarnpkg.com/react-native-message-bar/-/react-native-message-bar-2.0.10.tgz#34632bdf2cbfe0f51ae4f1e9a91c42b4394a11c2"

"react-native-router-flux@file:..":
version "4.0.2"
version "4.0.2-dev"
dependencies:
lodash.isequal "^4.5.0"
opencollective "^1.0.3"
path-to-regexp "^2.2.1"
path-to-regexp "^2.4.0"
prop-types "^15.6.2"
react-navigation "^2.11.2"
react-navigation "^2.12.1"

react-native-safe-area-view@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz#38f5ab9368d6ef9e5d18ab64212938af3ec39421"
dependencies:
hoist-non-react-statics "^2.3.1"

react-native-safe-area-view@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz#22d78cb8e8658d04a10cd53c1546e0bc86cb7aea"
react-native-safe-area-view@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.9.0.tgz#10ece2ecac70e7005a5b0b3f06c8833060e6d21f"
dependencies:
hoist-non-react-statics "^2.3.1"

Expand All @@ -4393,7 +4393,7 @@ react-native-tab-view@^1.0.0:
dependencies:
prop-types "^15.6.1"

[email protected]:
react-native@^0.56.0:
version "0.56.0"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.56.0.tgz#66686f781ec39a44376aadd4bbc55c8573ab61e5"
dependencies:
Expand Down Expand Up @@ -4461,6 +4461,10 @@ [email protected]:
dependencies:
react-native-drawer-layout-polyfill "^1.3.2"

[email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.2.3.tgz#9d1e2524aa1d178302c938948b8ece49d713f12b"

[email protected]:
version "0.6.0"
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.6.0.tgz#2f526194f4360e56c2702e736887449acc2080dc"
Expand All @@ -4471,19 +4475,20 @@ [email protected]:
react-native-safe-area-view "^0.7.0"
react-native-tab-view "^1.0.0"

react-navigation@^2.11.2:
version "2.11.2"
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.11.2.tgz#cd099f6d7d09efe48ef8463614a3abb113d45c01"
react-navigation@^2.12.1:
version "2.12.1"
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.12.1.tgz#17122a4162cd5a65d79814385cd61c2c0cb7ebb5"
dependencies:
clamp "^1.0.1"
create-react-context "^0.2.1"
hoist-non-react-statics "^2.2.0"
path-to-regexp "^1.7.0"
query-string "^6.1.0"
react-lifecycles-compat "^3"
react-native-safe-area-view "^0.8.0"
react-native-safe-area-view "^0.9.0"
react-navigation-deprecated-tab-navigator "1.3.0"
react-navigation-drawer "0.5.0"
react-navigation-stack "0.2.3"
react-navigation-tabs "0.6.0"

react-proxy@^1.1.7:
Expand Down Expand Up @@ -4513,9 +4518,9 @@ react-transform-hmr@^1.0.4:
global "^4.3.0"
react-proxy "^1.1.7"

[email protected]:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.1.tgz#de51ba5764b5dbcd1f9079037b862bd26b82fe32"
react@^16.4.1:
version "16.4.2"
resolved "https://registry.yarnpkg.com/react/-/react-16.4.2.tgz#2cd90154e3a9d9dd8da2991149fdca3c260e129f"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down
6 changes: 3 additions & 3 deletions ReduxExample/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"react": "^16.4.1",
"react-native": "^0.56.0",
"react-native-router-flux": "file:..",
"react-navigation": "^2.11.2",
"react-navigation": "^2.12.1",
"react-navigation-redux-helpers": "^2.0.5",
"react-redux": "^5.0.5",
"redux": "^3.7.2"
"redux": "^4.0.0"
},
"devDependencies": {
"@babel/core": "7.0.0-beta.47",
"@babel/plugin-proposal-decorators": "^7.0.0-beta.47",
"@babel/plugin-proposal-decorators": "7.0.0-beta.47",
"autobind-decorator": "^2.1.0",
"babel-core": "^7.0.0-0",
"babel-jest": "^23.4.0",
Expand Down
69 changes: 34 additions & 35 deletions ReduxExample/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,6 @@
version "7.0.0-beta.47"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.47.tgz#4f564117ec39f96cf60fafcde35c9ddce0e008fd"

"@babel/[email protected]":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-rc.1.tgz#3e277eae59818e7d4caf4174f58a7a00d441336e"

"@babel/[email protected]":
version "7.0.0-beta.47"
resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.47.tgz#b8e3b53132c4edbb04804242c02ffe4d60316971"
Expand Down Expand Up @@ -247,12 +243,12 @@
"@babel/helper-replace-supers" "7.0.0-beta.47"
"@babel/plugin-syntax-class-properties" "7.0.0-beta.47"

"@babel/plugin-proposal-decorators@^7.0.0-beta.47":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.0.0-rc.1.tgz#2cb2a8f8707280b41865fcebd48792cc24f83b9e"
"@babel/[email protected]":
version "7.0.0-beta.47"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.0.0-beta.47.tgz#5e8943c8f8eb3301f911ef0dcd3ed64cf28c723e"
dependencies:
"@babel/helper-plugin-utils" "7.0.0-rc.1"
"@babel/plugin-syntax-decorators" "7.0.0-rc.1"
"@babel/helper-plugin-utils" "7.0.0-beta.47"
"@babel/plugin-syntax-decorators" "7.0.0-beta.47"

"@babel/[email protected]":
version "7.0.0-beta.47"
Expand All @@ -274,11 +270,11 @@
dependencies:
"@babel/helper-plugin-utils" "7.0.0-beta.47"

"@babel/[email protected]rc.1":
version "7.0.0-rc.1"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.0.0-rc.1.tgz#f5b2c04547c1e780ffd5ed943757f810858870e2"
"@babel/[email protected]beta.47":
version "7.0.0-beta.47"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.0.0-beta.47.tgz#a42f10fcd651940bc475d93b3ac23432b4a8a293"
dependencies:
"@babel/helper-plugin-utils" "7.0.0-rc.1"
"@babel/helper-plugin-utils" "7.0.0-beta.47"

"@babel/[email protected]":
version "7.0.0-beta.47"
Expand Down Expand Up @@ -3368,7 +3364,7 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"

lodash-es@^4.17.5, lodash-es@^4.2.1:
lodash-es@^4.17.5:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"

Expand Down Expand Up @@ -3400,7 +3396,7 @@ lodash.throttle@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"

lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"

Expand Down Expand Up @@ -4130,9 +4126,9 @@ path-to-regexp@^1.7.0:
dependencies:
isarray "0.0.1"

path-to-regexp@^2.2.1:
version "2.3.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.3.0.tgz#690d682cb9e2dde26d25f41bcc2b4774b67d1fa2"
path-to-regexp@^2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.4.0.tgz#35ce7f333d5616f1c1e1bfe266c3aba2e5b2e704"

path-type@^1.0.0:
version "1.1.0"
Expand Down Expand Up @@ -4359,23 +4355,23 @@ [email protected]:
react-native-dismiss-keyboard "1.0.0"

"react-native-router-flux@file:..":
version "4.0.2"
version "4.0.2-dev"
dependencies:
lodash.isequal "^4.5.0"
opencollective "^1.0.3"
path-to-regexp "^2.2.1"
path-to-regexp "^2.4.0"
prop-types "^15.6.2"
react-navigation "^2.11.2"
react-navigation "^2.12.1"

react-native-safe-area-view@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.7.0.tgz#38f5ab9368d6ef9e5d18ab64212938af3ec39421"
dependencies:
hoist-non-react-statics "^2.3.1"

react-native-safe-area-view@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.8.0.tgz#22d78cb8e8658d04a10cd53c1546e0bc86cb7aea"
react-native-safe-area-view@^0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.9.0.tgz#10ece2ecac70e7005a5b0b3f06c8833060e6d21f"
dependencies:
hoist-non-react-statics "^2.3.1"

Expand Down Expand Up @@ -4465,6 +4461,10 @@ react-navigation-redux-helpers@^2.0.5:
dependencies:
invariant "^2.2.2"

[email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.2.3.tgz#9d1e2524aa1d178302c938948b8ece49d713f12b"

[email protected]:
version "0.6.0"
resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.6.0.tgz#2f526194f4360e56c2702e736887449acc2080dc"
Expand All @@ -4475,19 +4475,20 @@ [email protected]:
react-native-safe-area-view "^0.7.0"
react-native-tab-view "^1.0.0"

react-navigation@^2.11.2:
version "2.11.2"
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.11.2.tgz#cd099f6d7d09efe48ef8463614a3abb113d45c01"
react-navigation@^2.12.1:
version "2.12.1"
resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-2.12.1.tgz#17122a4162cd5a65d79814385cd61c2c0cb7ebb5"
dependencies:
clamp "^1.0.1"
create-react-context "^0.2.1"
hoist-non-react-statics "^2.2.0"
path-to-regexp "^1.7.0"
query-string "^6.1.0"
react-lifecycles-compat "^3"
react-native-safe-area-view "^0.8.0"
react-native-safe-area-view "^0.9.0"
react-navigation-deprecated-tab-navigator "1.3.0"
react-navigation-drawer "0.5.0"
react-navigation-stack "0.2.3"
react-navigation-tabs "0.6.0"

react-proxy@^1.1.7:
Expand Down Expand Up @@ -4594,14 +4595,12 @@ realpath-native@^1.0.0:
dependencies:
util.promisify "^1.0.0"

redux@^3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
redux@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
dependencies:
lodash "^4.2.1"
lodash-es "^4.2.1"
loose-envify "^1.1.0"
symbol-observable "^1.0.3"
symbol-observable "^1.2.0"

regenerate-unicode-properties@^7.0.0:
version "7.0.0"
Expand Down Expand Up @@ -5204,7 +5203,7 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"

symbol-observable@^1.0.3:
symbol-observable@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"

Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@
"dependencies": {
"lodash.isequal": "^4.5.0",
"opencollective": "^1.0.3",
"path-to-regexp": "^2.2.1",
"path-to-regexp": "^2.4.0",
"prop-types": "^15.6.2",
"react-navigation": "^2.11.2"
"react-navigation": "^2.12.1"
},
"devDependencies": {
"@babel/cli": "7.0.0-beta.47",
"@babel/code-frame": "7.0.0-beta.47",
"@babel/core": "7.0.0-beta.47",
"@babel/plugin-proposal-decorators": "7.0.0-beta.47",
"@babel/plugin-proposal-optional-chaining": "7.0.0-beta.47",
"@types/react": "^16.4.11",
"@types/react-native": "^0.56.9",
"@types/react": "^16.4.12",
"@types/react-native": "^0.56.14",
"babel-core": "^7.0.0-0",
"babel-jest": "^23.4.0",
"babel-preset-react-native": "^5.0.2",
"eslint": "^4.9.0",
"eslint-config-airbnb": "16.1.0",
"eslint": "^5.4.0",
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "^3.0.1",
"eslint-plugin-eslint-comments": "^3.0.1",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.21.0",
"eslint-plugin-jest": "^21.22.0",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.11.0",
"estraverse-fb": "^1.3.2",
Expand Down
Loading