Merge pull request #6 from O4epegb/master

Deps and typings update, disable hot reload
This commit is contained in:
Michel Weststrate 2016-09-26 21:02:12 +02:00 committed by GitHub
commit ca7b950c4a
6 changed files with 2829 additions and 407 deletions

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
node_modules/ node_modules/
static/bundle.js static/bundle.js
.vscode

View file

@ -23,16 +23,16 @@
}, },
"homepage": "http://mobxjs.github.com/mobx", "homepage": "http://mobxjs.github.com/mobx",
"devDependencies": { "devDependencies": {
"ts-loader": "^0.8.1", "ts-loader": "^0.8.2",
"typescript": "^1.8.2", "typescript": "^1.8.10",
"webpack": "^1.9.6", "webpack": "^1.13.2",
"webpack-dev-server": "^1.8.2" "webpack-dev-server": "^1.16.1"
}, },
"dependencies": { "dependencies": {
"mobx": "^2.3.2", "mobx": "^2.5.1",
"mobx-react": "^3.3.1", "mobx-react": "^3.5.6",
"mobx-react-devtools": "^4.2.0", "mobx-react-devtools": "^4.2.6",
"react": "^15.1.0", "react": "^15.3.1",
"react-dom": "^15.1.0" "react-dom": "^15.3.1"
} }
} }

View file

@ -4,7 +4,7 @@ var config = require('./webpack.config');
new WebpackDevServer(webpack(config), { new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath, publicPath: config.output.publicPath,
hot: true, hot: false,
historyApiFallback: true historyApiFallback: true
}).listen(3000, 'localhost', function (err, result) { }).listen(3000, 'localhost', function (err, result) {
if (err) { if (err) {

View file

@ -6,13 +6,13 @@ import DevTools from 'mobx-react-devtools';
class AppState { class AppState {
@observable timer = 0; @observable timer = 0;
constructor() { constructor() {
setInterval(() => { setInterval(() => {
this.timer += 1; this.timer += 1;
}, 1000); }, 1000);
} }
resetTimer() { resetTimer() {
this.timer = 0; this.timer = 0;
} }

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff