From 862ecaf3dc7fb54b661eec8e58d9d0bf91981c55 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 16 Jan 2018 14:36:20 +0200 Subject: [PATCH 1/8] upgrade to separate PropTypes --- library/Gallery.js | 3 ++- package.json | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/library/Gallery.js b/library/Gallery.js index 3fd01ed..3eb2c62 100644 --- a/library/Gallery.js +++ b/library/Gallery.js @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react'; +import PropTypes from 'prop-types'; +import React, { Component } from 'react'; import { View } from 'react-native'; diff --git a/package.json b/package.json index 76802f9..285a1e9 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,9 @@ }, "homepage": "https://github.com/ldn0x7dc/react-native-gallery#readme", "dependencies": { - "react-native-transformable-image": "0.0.18", "@ldn0x7dc/react-native-view-pager": "0.0.9", - "react-native-gesture-responder": "0.1.1" + "prop-types": "^15.6.0", + "react-native-gesture-responder": "0.1.1", + "react-native-transformable-image": "0.0.18" } } From 44b3471c6a82c5f4db2570c1f6a3ec2736c171e1 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 14:24:52 +0200 Subject: [PATCH 2/8] don't use deprecated View.propTypes --- library/Gallery.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/Gallery.js b/library/Gallery.js index 3eb2c62..ea35428 100644 --- a/library/Gallery.js +++ b/library/Gallery.js @@ -1,7 +1,8 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { - View + View, + ViewPropTypes } from 'react-native'; import Image from 'react-native-transformable-image'; @@ -12,7 +13,7 @@ import {createResponder} from 'react-native-gesture-responder'; export default class Gallery extends Component { static propTypes = { - ...View.propTypes, + ...ViewPropTypes, images: PropTypes.array, initialPage: PropTypes.number, From 0239163ec00b66658bac2eb0f556af76ff823548 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 14:40:44 +0200 Subject: [PATCH 3/8] gitignore node_modules --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file From 54101fd4314a2abf9f95c136ff18223c47bdb24b Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 14:40:52 +0200 Subject: [PATCH 4/8] use package-lock.json --- package-lock.json | 119 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..1f7a021 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,119 @@ +{ + "name": "react-native-gallery", + "version": "0.0.17", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "0.4.19" + } + }, + "fbjs": { + "version": "0.8.16", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz", + "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.17" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "1.7.3", + "whatwg-fetch": "2.0.3" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "requires": { + "js-tokens": "3.0.2" + } + }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "2.0.6" + } + }, + "prop-types": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", + "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "requires": { + "fbjs": "0.8.16", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "ua-parser-js": { + "version": "0.7.17", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", + "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==" + }, + "whatwg-fetch": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" + } + } +} From d40fc1c4587174e5dd5735abccc5a946bc136ede Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 15:09:17 +0200 Subject: [PATCH 5/8] bump 0.0.18 and fork --- package-lock.json | 61 +++++++++++++++++++++++++++++++++++++++++++++-- package.json | 14 +++++------ 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1f7a021..0914f3f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "react-native-gallery", - "version": "0.0.17", + "name": "@borgand/react-native-gallery", + "version": "0.0.18", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -100,11 +100,68 @@ "object-assign": "4.1.1" } }, + "react-mixin": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/react-mixin/-/react-mixin-3.1.1.tgz", + "integrity": "sha512-z9fZ0aCRDjlgxLdMeWkJ9TwhmVLhQ09r8RFpin/cEPA2T6jsb7YHNWcIe0Oii+hhJNyMymdy91CSya5mRkuCkg==", + "requires": { + "object-assign": "4.1.1", + "smart-mixin": "2.0.0" + } + }, + "react-native-gesture-responder": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/react-native-gesture-responder/-/react-native-gesture-responder-0.1.1.tgz", + "integrity": "sha1-gCVS2OtxU8DYGjlumPS4C0BLZ5g=", + "requires": { + "react-timer-mixin": "0.13.3" + } + }, + "react-native-scroller": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/react-native-scroller/-/react-native-scroller-0.0.6.tgz", + "integrity": "sha1-3qjIm9HKLSRF+7azqQlg32wXZ/8=" + }, + "react-native-transformable-image": { + "version": "github:borgand/react-native-transformable-image#14642f2c8e4ca9e39bef478754cf06b1bf99a037", + "requires": { + "prop-types": "15.6.0", + "react-native-view-transformer": "github:borgand/react-native-view-transformer#e73c9e5f9af9ed9602922f754aa96c8042af1167" + } + }, + "react-native-view-pager": { + "version": "github:borgand/react-native-view-pager#496bf58a95aecc227c93f7e1e1ab67e576ba1ae2", + "requires": { + "prop-types": "15.6.0", + "react-mixin": "3.1.1", + "react-native-gesture-responder": "0.1.1", + "react-native-scroller": "0.0.6", + "react-timer-mixin": "0.13.3" + } + }, + "react-native-view-transformer": { + "version": "github:borgand/react-native-view-transformer#e73c9e5f9af9ed9602922f754aa96c8042af1167", + "requires": { + "prop-types": "15.6.0", + "react-native-gesture-responder": "0.1.1", + "react-native-scroller": "0.0.6" + } + }, + "react-timer-mixin": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz", + "integrity": "sha1-Dai5+AfsB9w+hU0ILHN8ZWBbPSI=" + }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "smart-mixin": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/smart-mixin/-/smart-mixin-2.0.0.tgz", + "integrity": "sha1-o0oQVeMqdbMNK048oyPcmctT9Dc=" + }, "ua-parser-js": { "version": "0.7.17", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", diff --git a/package.json b/package.json index 285a1e9..43de4e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "react-native-gallery", - "version": "0.0.17", + "name": "@borgand/react-native-gallery", + "version": "0.0.18", "description": "", "main": "library/Gallery.js", "scripts": { @@ -8,18 +8,18 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/ldn0x7dc/react-native-gallery.git" + "url": "git+https://github.com/borgand/react-native-gallery.git" }, "author": "", "license": "ISC", "bugs": { - "url": "https://github.com/ldn0x7dc/react-native-gallery/issues" + "url": "https://github.com/borgand/react-native-gallery/issues" }, - "homepage": "https://github.com/ldn0x7dc/react-native-gallery#readme", + "homepage": "https://github.com/borgand/react-native-gallery#readme", "dependencies": { - "@ldn0x7dc/react-native-view-pager": "0.0.9", + "react-native-view-pager": "github:borgand/react-native-view-pager", "prop-types": "^15.6.0", "react-native-gesture-responder": "0.1.1", - "react-native-transformable-image": "0.0.18" + "react-native-transformable-image": "github:borgand/react-native-transformable-image" } } From 57efece3016a1488e59a59c3797b880da9155699 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 15:25:43 +0200 Subject: [PATCH 6/8] fix versions better --- package-lock.json | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0914f3f..4a57ca1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -123,7 +123,7 @@ "integrity": "sha1-3qjIm9HKLSRF+7azqQlg32wXZ/8=" }, "react-native-transformable-image": { - "version": "github:borgand/react-native-transformable-image#14642f2c8e4ca9e39bef478754cf06b1bf99a037", + "version": "github:borgand/react-native-transformable-image#064c085bd821baccd98d2747a292c9e6e1bce754", "requires": { "prop-types": "15.6.0", "react-native-view-transformer": "github:borgand/react-native-view-transformer#e73c9e5f9af9ed9602922f754aa96c8042af1167" diff --git a/package.json b/package.json index 43de4e3..a450b49 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ }, "homepage": "https://github.com/borgand/react-native-gallery#readme", "dependencies": { - "react-native-view-pager": "github:borgand/react-native-view-pager", "prop-types": "^15.6.0", "react-native-gesture-responder": "0.1.1", - "react-native-transformable-image": "github:borgand/react-native-transformable-image" + "react-native-transformable-image": "github:borgand/react-native-transformable-image#064c085", + "react-native-view-pager": "github:borgand/react-native-view-pager#496bf58" } } From 24dd3c74851ca8009fecd6886dfc1f394ec59a27 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 15:34:45 +0200 Subject: [PATCH 7/8] rename to remove prefix --- package-lock.json | 4 ++-- package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a57ca1..46e8799 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "@borgand/react-native-gallery", - "version": "0.0.18", + "name": "react-native-gallery", + "version": "0.0.19", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a450b49..cf3272d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "@borgand/react-native-gallery", - "version": "0.0.18", + "name": "react-native-gallery", + "version": "0.0.19", "description": "", "main": "library/Gallery.js", "scripts": { From 105b8e5bf2e7d5d6ef9bfc0cc00ea39840b185c1 Mon Sep 17 00:00:00 2001 From: Laas Toom Date: Tue, 30 Jan 2018 15:44:06 +0200 Subject: [PATCH 8/8] update to remove original naming prfi --- library/Gallery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Gallery.js b/library/Gallery.js index ea35428..3051d4e 100644 --- a/library/Gallery.js +++ b/library/Gallery.js @@ -6,7 +6,7 @@ import { } from 'react-native'; import Image from 'react-native-transformable-image'; -import ViewPager from '@ldn0x7dc/react-native-view-pager'; +import ViewPager from 'react-native-view-pager'; import {createResponder} from 'react-native-gesture-responder';