From 3e261b6c0a78adb2bf72842e95929eea56c93db1 Mon Sep 17 00:00:00 2001 From: Pablo Carrillo Date: Thu, 24 Nov 2016 15:05:02 +0000 Subject: [PATCH 1/2] Fixes #188 in the master repo by replacing the path in the import with the new path --- elements/Circle.js | 2 +- elements/ClipPath.js | 2 +- elements/Defs.js | 2 +- elements/Ellipse.js | 2 +- elements/G.js | 2 +- elements/Image.js | 2 +- elements/Line.js | 2 +- elements/LinearGradient.js | 2 +- elements/Path.js | 2 +- elements/RadialGradient.js | 2 +- elements/Rect.js | 2 +- elements/Text.js | 2 +- elements/Use.js | 2 +- elements/ViewBox.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/elements/Circle.js b/elements/Circle.js index 02460c3c..926d62ee 100644 --- a/elements/Circle.js +++ b/elements/Circle.js @@ -1,5 +1,5 @@ import React from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import Shape from './Shape'; import {CircleAttributes} from '../lib/attributes'; import {pathProps, numberProp} from '../lib/props'; diff --git a/elements/ClipPath.js b/elements/ClipPath.js index 8b1728ba..7c483c86 100644 --- a/elements/ClipPath.js +++ b/elements/ClipPath.js @@ -1,5 +1,5 @@ import React, {Component, PropTypes} from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ClipPathAttributes} from '../lib/attributes'; class ClipPath extends Component{ diff --git a/elements/Defs.js b/elements/Defs.js index e07dafec..1d39f43c 100644 --- a/elements/Defs.js +++ b/elements/Defs.js @@ -1,7 +1,7 @@ import React, { Component, } from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; class Defs extends Component { static displayName = 'Defs'; diff --git a/elements/Ellipse.js b/elements/Ellipse.js index 9cd66c1f..70c2e0fe 100644 --- a/elements/Ellipse.js +++ b/elements/Ellipse.js @@ -1,5 +1,5 @@ import React from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import Shape from './Shape'; import {pathProps, numberProp} from '../lib/props'; import {EllipseAttributes} from '../lib/attributes'; diff --git a/elements/G.js b/elements/G.js index 01a281c8..804a0c71 100644 --- a/elements/G.js +++ b/elements/G.js @@ -1,5 +1,5 @@ import React from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import Shape from './Shape'; import {transformProps} from '../lib/props'; import {GroupAttributes} from '../lib/attributes'; diff --git a/elements/Image.js b/elements/Image.js index fb7f1d6f..f5fa6e0e 100644 --- a/elements/Image.js +++ b/elements/Image.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ImageAttributes} from '../lib/attributes'; import {numberProp, touchableProps, responderProps} from '../lib/props'; import Shape from './Shape'; diff --git a/elements/Line.js b/elements/Line.js index a4a6cfe7..c63d06e2 100644 --- a/elements/Line.js +++ b/elements/Line.js @@ -1,5 +1,5 @@ import React from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {LineAttributes} from '../lib/attributes'; import Shape from './Shape'; import {pathProps, numberProp} from '../lib/props'; diff --git a/elements/LinearGradient.js b/elements/LinearGradient.js index 985e9fc5..4f0626ad 100644 --- a/elements/LinearGradient.js +++ b/elements/LinearGradient.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {numberProp} from '../lib/props'; import Gradient from './Gradient'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {LinearGradientAttributes} from '../lib/attributes'; class LinearGradient extends Gradient{ diff --git a/elements/Path.js b/elements/Path.js index ff359442..85f72361 100644 --- a/elements/Path.js +++ b/elements/Path.js @@ -1,6 +1,6 @@ import React, {PropTypes} from 'react'; import SerializablePath from '../lib/SerializablePath'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {PathAttributes} from '../lib/attributes'; import Shape from './Shape'; import {pathProps} from '../lib/props'; diff --git a/elements/RadialGradient.js b/elements/RadialGradient.js index f11b7e45..7fad89ee 100644 --- a/elements/RadialGradient.js +++ b/elements/RadialGradient.js @@ -1,7 +1,7 @@ import React, {PropTypes} from 'react'; import {numberProp} from '../lib/props'; import Gradient from './Gradient'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {RadialGradientAttributes} from '../lib/attributes'; class RadialGradient extends Gradient{ diff --git a/elements/Rect.js b/elements/Rect.js index 6fc3dc08..b918edce 100644 --- a/elements/Rect.js +++ b/elements/Rect.js @@ -1,6 +1,6 @@ import React from 'react'; import './Path'; // must import Path first, don`t know why. without this will throw an `Super expression must either be null or a function, not undefined` -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {pathProps, numberProp} from '../lib/props'; import {RectAttributes} from '../lib/attributes'; import Shape from './Shape'; diff --git a/elements/Text.js b/elements/Text.js index a9179c09..72741896 100644 --- a/elements/Text.js +++ b/elements/Text.js @@ -1,5 +1,5 @@ import React, {PropTypes} from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import extractText from '../lib/extract/extractText'; import {numberProp, pathProps} from '../lib/props'; import {TextAttributes} from '../lib/attributes'; diff --git a/elements/Use.js b/elements/Use.js index f02645f4..75f01ab5 100644 --- a/elements/Use.js +++ b/elements/Use.js @@ -3,7 +3,7 @@ import {pathProps, numberProp} from '../lib/props'; import {UseAttributes} from '../lib/attributes'; import Shape from './Shape'; import React from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; const idExpReg = /^#(.+)$/; class Use extends Shape { diff --git a/elements/ViewBox.js b/elements/ViewBox.js index 40f0c807..71f4061a 100644 --- a/elements/ViewBox.js +++ b/elements/ViewBox.js @@ -1,5 +1,5 @@ import React, {Component, PropTypes} from 'react'; -import createReactNativeComponentClass from 'react/lib/createReactNativeComponentClass'; +import createReactNativeComponentClass from 'react-native/Libraries/Renderer/src/renderers/native/createReactNativeComponentClass'; import {ViewBoxAttributes} from '../lib/attributes'; import G from './G'; import _ from 'lodash'; From fa5fc81488cff3c5eee02c75ac4383a66d6699ae Mon Sep 17 00:00:00 2001 From: Pablo Isidoro Carrillo Alvarez Date: Sat, 26 Nov 2016 11:37:16 +0000 Subject: [PATCH 2/2] Update peer dependency versions --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 1e234455..b6ec7957 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "lint": "eslint ./" }, "peerDependencies": { - "react-native": ">=0.33.0" + "react-native": ">=0.38.0", + "react": ">=15.4.0" }, "dependencies": { "color": "^0.11.1",