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

Jump to bottom

React16 compatibility update #125

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

React16 compatibility update #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb05fc2
updating dependency
franciscofsales Mar 15, 2018
0b082d5
change swiper to custom repo
franciscofsales Mar 15, 2018
e260c8d
package `prop-types` added
mariorodriguespt Jul 10, 2018
872e53d
Hotfix: duplicated import fix
mariorodriguespt Jul 10, 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
9 changes: 6 additions & 3 deletions AppIntro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import assign from 'assign-deep';
import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import {
StatusBar,
StyleSheet,
Expand All @@ -11,7 +12,9 @@ import {
Image,
Platform,
} from 'react-native';

import Swiper from 'react-native-swiper';

import DoneButton from './components/DoneButton';
import SkipButton from './components/SkipButton';
import RenderDots from './components/Dots';
Expand Down Expand Up @@ -105,8 +108,8 @@ const defaulStyles = {
}

export default class AppIntro extends Component {
constructor(props) {
super(props);
constructor(props, context) {
super(props, context);

this.styles = StyleSheet.create(assign({}, defaulStyles, props.customStyles));

Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"homepage": "https://github.com/fuyaode/react-native-app-intro#readme",
"dependencies": {
"assign-deep": "^0.4.5",
"react-native-swiper": "git+https://github.com/FuYaoDe/react-native-swiper.git"
"prop-types": "^15.6.2",
"react-native-swiper": "git+https://github.com/revdapp/react-native-swiper.git"
}
}
54 changes: 54 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


assign-deep@^0.4.5:
version "0.4.7"
resolved "https://registry.yarnpkg.com/assign-deep/-/assign-deep-0.4.7.tgz#7f66886a0bdae6d652abb1497f6edfc2c7ab14cf"
dependencies:
assign-symbols "^0.1.1"
is-primitive "^2.0.0"
kind-of "^5.0.2"

assign-symbols@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-0.1.1.tgz#cb025944ef4ec8a3693f086e9e112c74e3a0fed9"

is-primitive@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"

js-tokens@^3.0.0:
version "3.0.2"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"

kind-of@^5.0.2:
version "5.1.0"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"

loose-envify@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
dependencies:
js-tokens "^3.0.0"

object-assign@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

prop-types@^15.6.2:
version "15.6.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
dependencies:
loose-envify "^1.3.1"
object-assign "^4.1.1"

"react-native-swiper@git+https://github.com/revdapp/react-native-swiper.git":
version "1.4.4"
resolved "git+https://github.com/revdapp/react-native-swiper.git#f8cbe07ac215eaec04750f12381858fd78f09f11"
dependencies:
react-timer-mixin "^0.13.3"

react-timer-mixin@^0.13.3:
version "0.13.3"
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz#0da8b9f807ec07dc3e854d082c737c65605b3d22"