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

update react version and move to peerDependencies #66

Merged
merged 1 commit into from
Apr 21, 2016

Conversation

holymonson
Copy link
Contributor

  1. react 升级到 v15,并且引入了新的版本规范。
    @see https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html
  2. 不同版本的 react 会冲突,把依赖写到 peerDependencies 更合适一点。参考其他
    react 相关的库,如 react-redux.

@progrape
Copy link
Collaborator

PR 冲突了,可否解决一下冲突?

1. react 升级到 v15,并且引入了新的版本规范。
    @see https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html

2. 不同版本的 react 会冲突,把依赖写到 peerDependencies 更合适一点。参考其他
    react 相关的库,如 react-redux.
@holymonson
Copy link
Contributor Author

@progrape done.

@progrape progrape merged commit 3bd5517 into weui:develop Apr 21, 2016
@n7best
Copy link
Collaborator

n7best commented Apr 26, 2016

#72

progrape added a commit that referenced this pull request Apr 28, 2016
* #58, patched searchbar, add iconSize for toast #62, change weui dependency to 0.4.1 (#63)

* update `weui` version

* update react version and move to peerDependencies (#66)

1. react 升级到 v15,并且引入了新的版本规范。
    @see https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html

2. 不同版本的 react 会冲突,把依赖写到 peerDependencies 更合适一点。参考其他
    react 相关的库,如 react-redux.

* fix extra comma in package.json

* 修复 package.son 依赖
1. 补充依赖 jsdom
2. npm 对依赖 history 顺序做了调整

* #68 Cell* 增加支持传入自定义 className

* #51 ActionSheet 的 menus 和 actions 增加支持传入自定义 className
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants