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.

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

Fix PropTypes deprecation warnings #804

Merged
merged 5 commits into from
Apr 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';

export default class HelloWorld extends React.Component {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
},
"cacheDirectories": ["node_modules", "client/node_modules"],
"dependencies": {
"babel-cli": "^6.23.0",
"babel-core": "^6.23.1",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-loader": "^6.3.2",
"babel-runtime": "^6.23.0",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-2": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"es5-shim": "^4.5.9",
"expose-loader": "^0.7.3",
"imports-loader": "^0.7.1",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-on-rails": "<%= VersionSyntaxConverter.new.rubygem_to_npm %>",
<%- if options.redux? -%>
"react-redux": "^5.0.3",
"react-redux": "^5.0.4",
"redux": "^3.6.0",
<%- end -%>
"webpack": "^2.3.1"
"webpack": "^2.3.3"
},
"devDependencies": {
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';

const HelloWorld = ({ name, updateName }) => (
<div>
Expand Down
3 changes: 2 additions & 1 deletion node_package/tests/ComponentRegistry.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import test from 'tape';
import React from 'react';
import createReactClass from 'create-react-class';

import ComponentRegistry from '../src/ComponentRegistry';

Expand All @@ -22,7 +23,7 @@ test('ComponentRegistry registers and retrieves generator function components',

test('ComponentRegistry registers and retrieves ES5 class components', (assert) => {
assert.plan(1);
const C2 = React.createClass({
const C2 = createReactClass({
render() {
return <div> WORLD </div>;
},
Expand Down
4 changes: 2 additions & 2 deletions node_package/tests/ReactOnRails.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import test from 'tape';
import { createStore } from 'redux';
import React from 'react';

import createReactClass from 'create-react-class';
import ReactOnRails from '../src/ReactOnRails';

test('ReactOnRails render returns a virtual DOM element for component', (assert) => {
assert.plan(1);
const R1 = React.createClass({
const R1 = createReactClass({
render() {
return (
<div> WORLD </div>
Expand Down
5 changes: 3 additions & 2 deletions node_package/tests/generatorFunction.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@

import test from 'tape';
import React from 'react';
import createReactClass from 'create-react-class';

import generatorFunction from '../src/generatorFunction';

test('generatorFunction: ES5 Component recognized as React.Component', (assert) => {
assert.plan(1);

const es5Component = React.createClass({
const es5Component = createReactClass({
render() {
return (<div>ES5 React Component</div>);
},
Expand Down Expand Up @@ -67,7 +68,7 @@ test('generatorFunction: pure component recognized as React.Component', (assert)
test('generatorFunction: Generator function recognized as such', (assert) => {
assert.plan(1);

const foobarComponent = React.createClass({
const foobarComponent = createReactClass({
render() {
return (<div>Component for Generator Function</div>);
},
Expand Down
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,37 @@
"doc": "docs"
},
"devDependencies": {
"babel-cli": "^6.23.0",
"babel-core": "^6.23.1",
"babel-loader": "^6.3.2",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-loader": "^6.4.1",
"babel-plugin-react-transform": "^2.0.2",
"babel-plugin-transform-flow-strip-types": "^6.22.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-2": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.23.0",
"babel-tape-runner": "^2.0.1",
"babel-types": "^6.23.0",
"babel-types": "^6.24.1",
"babelify": "^7.3.0",
"blue-tape": "^1.0.0",
"eslint": "^3.16.1",
"create-react-class": "^15.5.2",
"eslint": "^3.19.0",
"eslint-config-shakacode": "^14.1.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.0",
"flow-bin": "^0.40.0",
"jsdom": "^9.11.0",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"eslint-plugin-react": "^6.10.3",
"flow-bin": "^0.43.1",
"jsdom": "^9.12.0",
"prop-types": "^15.5.7",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-transform-hmr": "^1.0.4",
"redux": "^3.6.0",
"release-it": "^2.5.4",
"release-it": "^2.7.1",
"tap-spec": "^4.1.1",
"tape": "^4.6.3",
"webpack": "^2.3.1"
"webpack": "^2.3.3"
},
"peerDependencies": {
"babel-runtime": ">= 6",
Expand Down
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/DeferredRender.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router';

Expand All @@ -21,7 +22,7 @@ const DeferredRender = ({ children }) => (
);

DeferredRender.propTypes = {
children: React.PropTypes.node,
children: PropTypes.node,
};

export default DeferredRender;
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/HelloWorld.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import RailsContext from './RailsContext';

// Example of CSS modules.
Expand Down
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/HelloWorldContainer.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';

Expand Down
6 changes: 4 additions & 2 deletions spec/dummy/client/app/components/HelloWorldES5.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/* eslint-disable react/prefer-es6-class */

import PropTypes from 'prop-types';
import React from 'react';
import createReactClass from 'create-react-class';

// Super simple example of React component using React.createClass
const HelloWorldES5 = React.createClass({
const HelloWorldES5 = createReactClass({
propTypes: {
helloWorldData: React.PropTypes.object,
helloWorldData: PropTypes.object,
},

getInitialState() {
Expand Down
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/HelloWorldRedux.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import RailsContext from './RailsContext';

// Super simple example of the simplest possible React component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import css from './ImageExample.scss';

// Note the global alias for images
Expand Down Expand Up @@ -33,7 +34,7 @@ const TestComponent = (props) => (
);

TestComponent.propTypes = {
message: React.PropTypes.string,
message: PropTypes.string,
};

export default TestComponent;
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/RailsContext.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { PropTypes } from 'react';
import PropTypes from 'prop-types';
import React from 'react';
import _ from 'lodash';

function renderContextRows(railsContext) {
Expand Down
3 changes: 2 additions & 1 deletion spec/dummy/client/app/components/RouterLayout.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import PropTypes from 'prop-types';
import React from 'react';
import { Link } from 'react-router';

Expand Down Expand Up @@ -30,7 +31,7 @@ const RouterLayout = ({ children }) => (
);

RouterLayout.propTypes = {
children: React.PropTypes.object,
children: PropTypes.object,
};

export default RouterLayout;
61 changes: 31 additions & 30 deletions spec/dummy/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,56 +8,57 @@
},
"main": "js/app.js",
"dependencies": {
"autoprefixer": "^6.7.6",
"babel-cli": "^6.23.0",
"babel-core": "^6.23.1",
"babel-loader": "^6.3.2",
"autoprefixer": "^6.7.7",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-loader": "^6.4.1",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.23.0",
"babel-preset-stage-2": "^6.22.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"babel-runtime": "^6.23.0",
"css-loader": "^0.26.2",
"css-loader": "^0.28.0",
"es5-shim": "^4.5.9",
"expose-loader": "^0.7.3",
"extract-text-webpack-plugin": "^2.0.0",
"file-loader": "^0.10.1",
"history": "^4.5.1",
"extract-text-webpack-plugin": "^2.1.0",
"file-loader": "^0.11.1",
"history": "^4.6.1",
"imports-loader": "^0.7.1",
"jquery": "^3.1.1",
"jquery": "^3.2.1",
"jquery-ujs": "^1.2.2",
"loader-utils": "^1.0.2",
"loader-utils": "^1.1.0",
"lodash": "^4.17.4",
"node-libs-browser": "^2.0.0",
"node-sass": "^4.5.0",
"postcss-loader": "^1.3.2",
"react": "^15.4.2",
"react-dom": "^15.4.2",
"node-sass": "^4.5.2",
"postcss-loader": "^1.3.3",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-on-rails": "file:../../..",
"react-redux": "^5.0.3",
"react-router": "^3.0.2",
"react-proptypes": "^0.0.1",
"react-redux": "^5.0.4",
"react-router": "3.0.5",
"redux": "^3.6.0",
"redux-thunk": "^2.2.0",
"resolve-url-loader": "^2.0.0",
"sass-loader": "^6.0.2",
"sass-resources-loader": "1.2.0",
"style-loader": "^0.13.2",
"resolve-url-loader": "^2.0.2",
"sass-loader": "^6.0.3",
"sass-resources-loader": "1.2.1",
"style-loader": "^0.16.1",
"url-loader": "^0.5.8",
"webpack": "^2.3.1"
"webpack": "^2.3.3"
},
"devDependencies": {
"babel-plugin-react-transform": "^2.0.2",
"body-parser": "^1.16.1",
"eslint": "^3.16.1",
"body-parser": "^1.17.1",
"eslint": "^3.19.0",
"eslint-config-shakacode": "^14.1.1",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^4.0.0",
"eslint-plugin-react": "^6.10.0",
"fbjs": "^0.8.9",
"jsdom": "^9.11.0",
"eslint-plugin-react": "^6.10.3",
"fbjs": "^0.8.12",
"jsdom": "^9.12.0",
"react-transform-hmr": "^1.0.4",
"tape": "^4.6.3",
"webpack-dev-server": "^2.4.1"
"webpack-dev-server": "^2.4.2"
},
"browser": {
"fs": false
Expand Down
Loading