Skip to content

Commit

Permalink
Merge pull request #597 from leecade/bumpVersion
Browse files Browse the repository at this point in the history 
Bump version
  • Loading branch information
Bart Arribe authored Oct 2, 2017
2 parents b3c6264 + 1a34346 commit 5336a4a
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 78 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
- [1.5.13]
+ Workaround for react-native 0.4.8 contentOffset regression #572 (thanks @nixoz)
+ Fix wrong calculation of width and height after device rotation #581 (thanks @kostyaVyrodov)
+ Calculated width & height on layout, used later on re-rendering. Possibility to change ScrollView styles #548 (thanks @germanst)
- [1.5.12]
+ Update core packages
+ Optionally disable the 'next' control button (thanks [@SSTPIERRE2](https://github.com/SSTPIERRE2))
Expand Down
22 changes: 11 additions & 11 deletions examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start",
"watch": "node ./scripts/watch-and-copy-src.js",
"packager": "sh ./node_modules/react-native/packager/packager.sh --root ./node_modules/react-native-swiper",
"dev": "concurrently 'npm run watch' 'npm run packager'",
"watch": "node ./scripts/watch-and-copy-src.js",
"packager": "sh ./node_modules/react-native/packager/packager.sh --root ./node_modules/react-native-swiper",
"dev": "concurrently 'npm run watch' 'npm run packager'",
"test": "jest"
},
"dependencies": {
"react": "16.0.0-alpha.12",
"react-native": "0.47.1",
"react-native-swiper": "../"
"react-native": "0.48.4",
"react-native-swiper": "../"
},
"devDependencies": {
"babel-jest": "20.0.3",
"babel-preset-react-native": "2.1.0",
"concurrently": "^2.2.0",
"fs-extra": "^0.30.0",
"jest": "20.0.4",
"minimatch": "^3.0.2",
"node-watch": "^0.4.0",
"react-test-renderer": "16.0.0-alpha.12",
"concurrently": "^2.2.0",
"fs-extra": "^0.30.0",
"minimatch": "^3.0.2",
"node-watch": "^0.4.0",
"rimraf": "^2.5.4"
"rimraf": "^2.5.4"
},
"jest": {
"preset": "react-native"
}
}
}
148 changes: 82 additions & 66 deletions examples/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ babel-preset-fbjs@^1.0.0:
babel-plugin-transform-object-rest-spread "^6.6.5"
object-assign "^4.0.1"

babel-preset-fbjs@^2.1.0, babel-preset-fbjs@^2.1.4:
babel-preset-fbjs@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-2.1.4.tgz#22f358e6654073acf61e47a052a777d7bccf03af"
dependencies:
Expand Down Expand Up @@ -757,40 +757,6 @@ [email protected], babel-preset-react-native@^2.0.0:
babel-plugin-transform-regenerator "^6.5.0"
react-transform-hmr "^1.0.4"

babel-preset-react-native@^1.9.1:
version "1.9.2"
resolved "https://registry.yarnpkg.com/babel-preset-react-native/-/babel-preset-react-native-1.9.2.tgz#b22addd2e355ff3b39671b79be807e52dfa145f2"
dependencies:
babel-plugin-check-es2015-constants "^6.5.0"
babel-plugin-react-transform "2.0.2"
babel-plugin-syntax-async-functions "^6.5.0"
babel-plugin-syntax-class-properties "^6.5.0"
babel-plugin-syntax-flow "^6.5.0"
babel-plugin-syntax-jsx "^6.5.0"
babel-plugin-syntax-trailing-function-commas "^6.5.0"
babel-plugin-transform-class-properties "^6.5.0"
babel-plugin-transform-es2015-arrow-functions "^6.5.0"
babel-plugin-transform-es2015-block-scoping "^6.5.0"
babel-plugin-transform-es2015-classes "^6.5.0"
babel-plugin-transform-es2015-computed-properties "^6.5.0"
babel-plugin-transform-es2015-destructuring "^6.5.0"
babel-plugin-transform-es2015-for-of "^6.5.0"
babel-plugin-transform-es2015-function-name "^6.5.0"
babel-plugin-transform-es2015-literals "^6.5.0"
babel-plugin-transform-es2015-modules-commonjs "^6.5.0"
babel-plugin-transform-es2015-parameters "^6.5.0"
babel-plugin-transform-es2015-shorthand-properties "^6.5.0"
babel-plugin-transform-es2015-spread "^6.5.0"
babel-plugin-transform-es2015-template-literals "^6.5.0"
babel-plugin-transform-flow-strip-types "^6.5.0"
babel-plugin-transform-object-assign "^6.5.0"
babel-plugin-transform-object-rest-spread "^6.5.0"
babel-plugin-transform-react-display-name "^6.5.0"
babel-plugin-transform-react-jsx "^6.5.0"
babel-plugin-transform-react-jsx-source "^6.5.0"
babel-plugin-transform-regenerator "^6.5.0"
react-transform-hmr "^1.0.4"

babel-register@^6.24.1:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.1.tgz#7e10e13a2f71065bdfad5a1787ba45bca6ded75f"
Expand Down Expand Up @@ -1395,6 +1361,14 @@ encoding@^0.1.11:
dependencies:
iconv-lite "~0.4.13"

envinfo@^3.0.0:
version "3.4.1"
resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-3.4.1.tgz#8c80e9f2eec2cd4e2adb2c5d0127ce07a2aaa2ae"
dependencies:
minimist "^1.2.0"
os-name "^2.0.1"
which "^1.2.14"

"errno@>=0.1.1 <0.2.0-0", errno@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
Expand Down Expand Up @@ -1923,9 +1897,9 @@ iconv-lite@^0.4.17, iconv-lite@~0.4.13:
version "0.4.18"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"

image-size@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.3.5.tgz#83240eab2fb5b00b04aab8c74b0471e9cba7ad8c"
image-size@^0.6.0:
version "0.6.1"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.1.tgz#98122a562d59dcc097ef1b2c8191866eb8f5d663"

imurmurhash@^0.1.4:
version "0.1.4"
Expand Down Expand Up @@ -2226,13 +2200,21 @@ jest-diff@^20.0.3:
jest-matcher-utils "^20.0.3"
pretty-format "^20.0.3"

[email protected]:
version "20.1.0-chi.1"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.1.0-chi.1.tgz#06981ab0e59498a2492333b0c5502a82e4603207"

[email protected]:
version "20.1.0-delta.4"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.1.0-delta.4.tgz#360d4f5fb702730c4136c4e71e5706188a694682"

jest-docblock@^20.0.3:
version "20.0.3"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.0.3.tgz#17bea984342cc33d83c50fbe1545ea0efaa44712"

jest-docblock@^20.1.0-alpha.3:
version "20.1.0-delta.5"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.1.0-delta.5.tgz#a3699e999a4be26beee576a41988bd9c782cb469"
jest-docblock@^20.1.0-chi.1:
version "20.1.0-echo.1"
resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-20.1.0-echo.1.tgz#be02f43ee019f97e6b83267c746ac7b40d290fe8"

jest-environment-jsdom@^20.0.3:
version "20.0.3"
Expand All @@ -2249,13 +2231,24 @@ jest-environment-node@^20.0.3:
jest-mock "^20.0.3"
jest-util "^20.0.3"

[email protected]:
version "20.1.0-alpha.3"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.1.0-alpha.3.tgz#37a1eea267cd770b99114a39c049a287501edf72"
[email protected]:
version "20.1.0-chi.1"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.1.0-chi.1.tgz#db5f5f31362c76e242b40ea9a3ccfa364719cee3"
dependencies:
fb-watchman "^2.0.0"
graceful-fs "^4.1.11"
jest-docblock "^20.1.0-chi.1"
micromatch "^2.3.11"
sane "^2.0.0"
worker-farm "^1.3.1"

[email protected]:
version "20.1.0-delta.4"
resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-20.1.0-delta.4.tgz#12e32b297a6dd49705cacde938029fc158834006"
dependencies:
fb-watchman "^2.0.0"
graceful-fs "^4.1.11"
jest-docblock "^20.1.0-alpha.3"
jest-docblock "20.1.0-delta.4"
micromatch "^2.3.11"
sane "^2.0.0"
worker-farm "^1.3.1"
Expand Down Expand Up @@ -2665,6 +2658,10 @@ lru-cache@^4.0.1:
pseudomap "^1.0.2"
yallist "^2.1.2"

macos-release@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-1.1.0.tgz#831945e29365b470aa8724b0ab36c8f8959d10fb"

[email protected]:
version "1.0.11"
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
Expand Down Expand Up @@ -2698,18 +2695,18 @@ methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"

metro-bundler@^0.9.0:
version "0.9.2"
resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.9.2.tgz#a23c1e0c28fc920f4280980dc7c3bb54e51d0240"
metro-bundler@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/metro-bundler/-/metro-bundler-0.11.0.tgz#ba5d2ae34943da28a37c2098047ad265c16fddf4"
dependencies:
absolute-path "^0.0.0"
async "^2.4.0"
babel-core "^6.24.1"
babel-generator "^6.24.1"
babel-plugin-external-helpers "^6.18.0"
babel-preset-es2015-node "^6.1.1"
babel-preset-fbjs "^2.1.0"
babel-preset-react-native "^1.9.1"
babel-preset-fbjs "^2.1.4"
babel-preset-react-native "^2.0.0"
babel-register "^6.24.1"
babylon "^6.17.0"
chalk "^1.1.1"
Expand All @@ -2719,8 +2716,9 @@ metro-bundler@^0.9.0:
denodeify "^1.2.1"
fbjs "0.8.12"
graceful-fs "^4.1.3"
image-size "^0.3.5"
jest-haste-map "^20.0.4"
image-size "^0.6.0"
jest-docblock "20.1.0-chi.1"
jest-haste-map "20.1.0-chi.1"
json-stable-stringify "^1.0.1"
json5 "^0.4.0"
left-pad "^1.1.3"
Expand All @@ -2732,7 +2730,7 @@ metro-bundler@^0.9.0:
rimraf "^2.5.4"
source-map "^0.5.6"
temp "0.8.3"
throat "^3.0.0"
throat "^4.1.0"
uglify-js "2.7.5"
write-file-atomic "^1.2.0"
xpipe "^1.0.5"
Expand Down Expand Up @@ -3040,6 +3038,13 @@ os-locale@^1.4.0:
dependencies:
lcid "^1.0.0"

os-name@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/os-name/-/os-name-2.0.1.tgz#b9a386361c17ae3a21736ef0599405c9a8c5dc5e"
dependencies:
macos-release "^1.0.0"
win-release "^1.0.0"

os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
Expand Down Expand Up @@ -3261,21 +3266,21 @@ react-deep-force-update@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.0.1.tgz#f911b5be1d2a6fe387507dd6e9a767aa2924b4c7"

react-devtools-core@2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-2.3.1.tgz#dc83aba85735effe5e1dc386a1614cb5e8d0047d"
react-devtools-core@^2.5.0:
version "2.5.2"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-2.5.2.tgz#f97bec5afae5d9318d16778065e0c214c4d5714c"
dependencies:
shell-quote "^1.6.1"
ws "^2.0.3"

react-native-swiper@../:
version "1.5.6"
version "1.5.12"
dependencies:
prop-types "^15.5.10"

react-native@0.47.1:
version "0.47.1"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.47.1.tgz#b4a1f1e92a57ff5868de2bfa9d8ece3192635242"
react-native@0.48.4:
version "0.48.4"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.48.4.tgz#f305e9fef069a5b3f6a7250ddd50f603cf30ab2d"
dependencies:
absolute-path "^0.0.0"
art "^0.10.0"
Expand Down Expand Up @@ -3307,6 +3312,7 @@ [email protected]:
create-react-class "^15.5.2"
debug "^2.2.0"
denodeify "^1.2.1"
envinfo "^3.0.0"
errno ">=0.1.1 <0.2.0-0"
event-target-shim "^1.0.5"
fbjs "0.8.12"
Expand All @@ -3316,13 +3322,13 @@ [email protected]:
glob "^7.1.1"
graceful-fs "^4.1.3"
inquirer "^3.0.6"
jest-haste-map "20.1.0-alpha.3"
jest-haste-map "20.1.0-delta.4"
json-stable-stringify "^1.0.1"
json5 "^0.4.0"
left-pad "^1.1.3"
lodash "^4.16.6"
merge-stream "^1.0.1"
metro-bundler "^0.9.0"
metro-bundler "^0.11.0"
mime "^1.3.4"
mime-types "2.1.11"
minimist "^1.2.0"
Expand All @@ -3336,7 +3342,7 @@ [email protected]:
promise "^7.1.1"
prop-types "^15.5.8"
react-clone-referenced-element "^1.0.1"
react-devtools-core "2.3.1"
react-devtools-core "^2.5.0"
react-timer-mixin "^0.13.2"
react-transform-hmr "^1.0.4"
rebound "^0.0.13"
Expand All @@ -3349,7 +3355,7 @@ [email protected]:
source-map "^0.5.6"
stacktrace-parser "^0.1.3"
temp "0.8.3"
throat "^3.0.0"
throat "^4.1.0"
whatwg-fetch "^1.0.0"
wordwrap "^1.0.0"
write-file-atomic "^1.2.0"
Expand Down Expand Up @@ -3654,7 +3660,7 @@ sax@~1.1.1:
version "1.1.6"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.1.6.tgz#5d616be8a5e607d54e114afae55b7eaf2fcc3240"

"semver@2 || 3 || 4 || 5", [email protected], semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
"semver@2 || 3 || 4 || 5", [email protected], semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
version "5.4.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"

Expand Down Expand Up @@ -3964,6 +3970,10 @@ throat@^3.0.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/throat/-/throat-3.2.0.tgz#50cb0670edbc40237b9e347d7e1f88e4620af836"

throat@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"

through2@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
Expand Down Expand Up @@ -4186,7 +4196,7 @@ which-module@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"

which@^1.2.12, which@^1.2.9:
which@^1.2.12, which@^1.2.14, which@^1.2.9:
version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies:
Expand All @@ -4198,6 +4208,12 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2"

win-release@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209"
dependencies:
semver "^5.0.1"

[email protected]:
version "0.1.0"
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"react-native",
"ios"
],
"version": "1.5.12",
"version": "1.5.13",
"description": "Swiper component for React Native.",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 5336a4a

Please sign in to comment.