Skip to content

Commit 5bb1bf2

Browse files
committed
Updates a few libs, add Box/Sphere types to prevent error
1 parent c85c0cc commit 5bb1bf2

File tree

5 files changed

+58
-8
lines changed

5 files changed

+58
-8
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ node_modules
3636
.DS_STORE
3737

3838
# TypeScript
39-
typings
39+
# typings // TODO renable this once whs provides proper types
4040

4141
# JetBrains
4242
.idea

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/redux-thunk": "^2.1.31",
7575
"@types/sinon": "^1.16.34",
7676
"@types/source-map": "^0.5.0",
77-
"@types/three": "^0.84.3",
77+
"@types/three": "^0.84.15",
7878
"@types/uglify-js": "^2.6.28",
7979
"@types/webpack": "^2.2.2",
8080
"awesome-typescript-loader": "^3.0.0-beta.18",
@@ -84,16 +84,16 @@
8484
"babel-plugin-transform-runtime": "^6.23.0",
8585
"babel-preset-es2015": "^6.22.0",
8686
"classnames": "^2.2.5",
87-
"cross-env": "^5.0.0",
87+
"cross-env": "^5.0.1",
8888
"css-loader": "^0.28.0",
8989
"enzyme": "^2.8.2",
90-
"extract-text-webpack-plugin": "^2.0.0-beta.5",
90+
"extract-text-webpack-plugin": "^2.1.2",
9191
"fetch-mock": "^5.8.1",
9292
"file-loader": "^0.11.1",
9393
"html-webpack-plugin": "^2.28.0",
9494
"isomorphic-style-loader": "^2.0.0",
9595
"istanbul-instrumenter-loader": "^2.0.0",
96-
"jest": "^20.0.3",
96+
"jest": "^20.0.4",
9797
"json-loader": "^0.5.4",
9898
"postcss-assets": "^4.1.0",
9999
"postcss-cssnext": "^2.9.0",
@@ -105,7 +105,7 @@
105105
"source-map-loader": "^0.2.1",
106106
"style-loader": "^0.17.0",
107107
"stylelint": "^7.7.1",
108-
"ts-jest": "^20.0.4",
108+
"ts-jest": "^20.0.6",
109109
"tslint": "^4.3.1",
110110
"tslint-loader": "^3.3.0",
111111
"tslint-react": "^2.3.0",
@@ -120,9 +120,9 @@
120120
"dependencies": {
121121
"chalk": "^1.1.3",
122122
"compression": "^1.6.2",
123-
"es6-promise": "^4.0.5",
123+
"es6-promise": "^4.1.1",
124124
"express": "^4.14.0",
125-
"history": "^4.5.1",
125+
"history": "^4.6.3",
126126
"isomorphic-fetch": "^2.2.1",
127127
"react": "^15.5.4",
128128
"react-css-modules": "^4.1.0",

typings/index.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference path="modules/whs/index.d.ts" />

typings/modules/whs/index.d.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Generated by typings
2+
// Source: src/app-definitions/whs.d.ts
3+
declare module 'whs' {
4+
interface IBoxGeometryParameters {
5+
geometry:{
6+
width?: number;
7+
height?: number;
8+
depth?: number;
9+
widthSegments?: number;
10+
heightSegments?: number;
11+
depthSegments?: number;
12+
},
13+
14+
material?: any
15+
16+
shadow?: {
17+
receive?: boolean,
18+
cast?: boolean
19+
},
20+
21+
// TODO fix type for position
22+
position?: any
23+
}
24+
25+
/**
26+
* ModuleSystem
27+
*/
28+
export class Box {
29+
30+
/**
31+
* @param params
32+
*/
33+
constructor(params: IBoxGeometryParameters);
34+
35+
}
36+
37+
export class Sphere {
38+
// TODO set types
39+
constructor(any);
40+
}
41+
}

typings/modules/whs/typings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"resolution": "main",
3+
"tree": {
4+
"src": "/Users/meed/dev/whitestorm-typescript-boilerplate-clean/src/app-definitions/whs.d.ts",
5+
"raw": "file:./src/app-definitions/whs.d.ts",
6+
"typings": "/Users/meed/dev/whitestorm-typescript-boilerplate-clean/src/app-definitions/whs.d.ts"
7+
}
8+
}

0 commit comments

Comments
 (0)