Merge branch 'master' of https://github.com/PureRunner/restackx-core

Author: Runnershuai-p

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-*.tgz
+*.tgz
+.idea/

.npmignore

@@ -1 +1,3 @@
 examples/
+*.tgz
+.babelrc

README.md

@@ -1,4 +1,3 @@
-
 # restackx-core
 
 前端快速开发框架,可适用与web及react-native。
@@ -108,6 +107,7 @@ restackx-core提供了路由的入口，导入指定路由可方便我们管理,
 	npm i babel-plugin-transform-decorators-legacy babel-preset-react-native-stage-0 --save-dev
 
 在 .babelrc 文件中配置 babel 插件：
+
 				
 	{
  		'presets': ['react-native'],

examples/demo/package.json

@@ -27,8 +27,9 @@
     "prop-types": "^15.5.8",
     "react": "^15.5.4",
     "react-dom": "^15.5.4",
-    "react-router": "^2.4.0",
-    "restackx-core": "0.0.3"
+    "react-router": "^4.1.0",
+    "react-router-dom":"4.1.2",
+    "restackx-core": "0.2.1"
   },
   "devDependencies": {
     "ansi-to-html-umd": "^0.4.2",

examples/demo/src/modules/demo/todos.model.js renamed to examples/demo/src/modules/demo/todos.store.js

@@ -1,14 +1,11 @@
 import React,{Component} from 'react'
 import { render } from 'react-dom'
-import { Router} from 'react-router'
 import routes from './routes'
-import { browserHistory } from 'react-router'
-import Store from './store'
+import Store from './stores'
 import {App} from 'restackx-core'
 
 const container = document.getElementById('container');
 render(
-  <App store={Store} history={browserHistory} routes={routes}/>,
+  <App store={Store} routes={routes}/>,
   container
 )
-//<IndexRoute component={App}/>

examples/demo/src/modules/index.jsx

@@ -1,13 +1,17 @@
 import React from 'react';
-import {Route, IndexRoute} from 'react-router'
+import {Route, Switch} from 'react-router-dom'
 
 import App from './demo/App';
 import NewComponent from './demo/newcomponent'
 import PageTwo from './demo/page2'
 
 export default (
-  <Route path="/" component={App}>
-    <IndexRoute component={NewComponent}/>
-    <Route path="pagetwo" component={PageTwo}/>
+  <Route path="/">
+    <App>
+      <Switch>
+        <Route exact path="/" component={NewComponent}/>
+        <Route path="pagetwo" component={PageTwo}/>
+      </Switch>
+    </App>
   </Route>
 );

examples/demo/src/modules/routes.jsx

@@ -0,0 +1,7 @@
+import {observable, computed, reaction} from 'mobx'
+import {handleModels} from 'restackx-core'
+
+const modelContext = require.context('../', true, /.store.js$/)
+var stores = handleModels(modelContext)
+
+export default stores

examples/demo/src/modules/store.js

@@ -1,6 +1,6 @@
 {
   "name": "restackx-core",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "react and mobx application tools",
   "main": "lib/index.js",
   "react-native":"lib/native.js",