Skip to content

Commit 6930b9f

Browse files
committed
Merged mobx into master
2 parents 970acf5 + b1e9f33 commit 6930b9f

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

jspm.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ SystemJS.config({
6565
"assert": "github:jspm/nodelibs-assert@0.2.0-alpha",
6666
"buffer": "github:jspm/nodelibs-buffer@0.2.0-alpha",
6767
"child_process": "github:jspm/nodelibs-child_process@0.2.0-alpha",
68+
"classnames": "npm:classnames@2.2.5",
6869
"constants": "github:jspm/nodelibs-constants@0.2.0-alpha",
6970
"crypto": "github:jspm/nodelibs-crypto@0.2.0-alpha",
7071
"css": "github:systemjs/plugin-css@0.1.23",

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"bugs": "https://github.com/piotrwitek/react-ts-jspm-starter-kit/issues",
1010
"license": "MIT",
1111
"scripts": {
12-
"postinstall": "jspm install && typings install",
12+
"postinstall": "jspm install",
1313
"precommit": "npm run lint",
1414
"prepush": "npm run lint && npm test",
1515
"bundle-dev": "jspm bundle dev-bundle.config.js out/dev-bundle.js -id",
@@ -29,16 +29,19 @@
2929
"lint": "tslint ./src/**/*.ts*"
3030
},
3131
"devDependencies": {
32+
"@types/react": "^0.14.27",
33+
"@types/react-dom": "^0.14.13",
3234
"husky": "^0.11.4",
3335
"jspm": "^0.17.0-beta.22",
3436
"jspm-hmr": "^0.4.2",
3537
"regenerator": "^0.8.46",
3638
"tslint": "^3.13.0",
37-
"typings": "^1.3.1"
39+
"typescript": "^1.8.10"
3840
},
3941
"jspm": {
4042
"name": "app",
4143
"dependencies": {
44+
"classnames": "npm:classnames@^2.2.5",
4245
"css": "github:systemjs/plugin-css@^0.1.23",
4346
"react-dom": "npm:react-dom@^15.2.1"
4447
},

typings.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)