Skip to content

Commit 2b5fb92

Browse files
committed
Merge branch 'master' into greenkeeper-react-transform-catch-errors-1.0.2
* master: Fix issues with clashing types. chore(package): update rimraf to version 2.5.2 chore(package): update redbox-react to version 1.2.2
2 parents 04176c5 + 672f5dc commit 2b5fb92

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

app/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { Provider } from 'react-redux';
88
import { App } from './components/app';
99
import { counterApp } from './reducers';
1010

11+
declare const require: (name: String) => any;
12+
1113
interface IHotModule {
1214
hot?: { accept: (path: string, callback: () => void) => void };
1315
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"express": "^4.13.4",
3131
"react-transform-catch-errors": "^1.0.2",
3232
"react-transform-hmr": "^1.0.1",
33-
"redbox-react": "^1.2.0",
34-
"rimraf": "^2.5.1",
33+
"redbox-react": "^1.2.2",
34+
"rimraf": "^2.5.2",
3535
"tslint": "^3.3.0",
3636
"tslint-loader": "^2.1.0",
3737
"webpack": "^1.12.12",

tsd.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
},
1717
"react/react.d.ts": {
1818
"commit": "ba424f7ee39717d51c17699a09ac8df312a7e9a1"
19-
},
20-
"node/node.d.ts": {
21-
"commit": "ba424f7ee39717d51c17699a09ac8df312a7e9a1"
2219
}
2320
}
2421
}

0 commit comments

Comments
 (0)