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

React 0.14 support #1790

Merged
merged 4 commits into from
Oct 6, 2015
Merged

React 0.14 support #1790

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae6024d
Updated react-draggable2 for 0.14 support.
TheUltDev Oct 3, 2015
36a472a
Dependency fixes for React 0.14 and Windows
Daviejoe100 Oct 3, 2015
8aa3750
Updated react-draggable2 to 0.7.0-alpha1
Daviejoe100 Oct 4, 2015
1ae2615
Moved test dependencies to dev dependencies.
Daviejoe100 Oct 6, 2015
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
14 changes: 11 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test": "npm run test-base -- --single-run",
"test-watch": "npm run test-base -- --auto-watch",
"test-base": "./node_modules/.bin/karma start",
"prebuild": "rm -rf lib",
"prebuild": "rimraf lib",
"eslint": "gulp eslint",
"build": "npm run eslint && babel --stage 1 ./src --out-dir ./lib",
"prepublish": "npm run build"
Expand All @@ -30,7 +30,7 @@
},
"homepage": "http://material-ui.com/",
"dependencies": {
"react-draggable2": "^0.5.1"
"react-draggable2": "^0.7.0-alpha1"
},
"peerDependencies": {
"react": ">=0.14.0-rc1",
Expand Down Expand Up @@ -68,9 +68,17 @@
"phantomjs": "^1.9.17",
"react-hot-loader": "^1.2.8",
"react-router": "^1.0.0-rc1",
"rimraf": "^2.4.3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it a peerDependency and not a dependency?
I feel like this is not link to react v0.14 and should be added to master

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not, it's a devDependency. You may have to expand your diff.
True, but I needed Windows compatibility to test and continue developing this branch.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sorry, I'm on my phone.

"sinon": "^1.15.4",
"sinon-chai": "^2.8.0",
"transfer-webpack-plugin": "^0.1.4",
"webpack": "^1.11.0"
"webpack": "^1.11.0",
"react": ">=0.14.0-rc1",
"react-dom": ">=0.14.0-rc1",
"react-tap-event-plugin": "^0.2.0",
"react-addons-transition-group": "^0.14.0-rc1",
"react-addons-update": "^0.14.0-rc1",
"react-addons-create-fragment": "^0.14.0-rc1",
"react-addons-pure-render-mixin": "^0.14.0-rc1"
}
}