Skip to content

Commit b0ea694

Browse files
committed
changed AppContainer from jsx to tsx, working on App.tsx. Application testing and conversion continues with App and AppContainer
1 parent 2daedb2 commit b0ea694

File tree

5 files changed

+32
-2
lines changed

5 files changed

+32
-2
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"@material-ui/icons": "^2.0.0",
8080
"@types/react": "^16.8.14",
8181
"@types/react-dom": "^16.8.4",
82+
"@types/react-redux": "^7.0.8",
8283
"autoprefixer": "^9.0.1",
8384
"babel-polyfill": "^6.26.0",
8485
"classnames": "^2.2.6",

src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
22
import '../public/styles/style.css';
33
import { MuiThemeProvider } from '@material-ui/core/styles';
44
import theme from './theme.ts';
5-
import AppContainer from '../containers/AppContainer.jsx';
5+
import AppContainer from '../containers/AppContainer.tsx';
66

77
class App extends Component {
88
render() {

src/components/__tests__/App.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
// import '../../setupTests';
33
import { shallow } from 'enzyme';
44
import App from '../App.tsx';
5-
import AppContainer from '../../containers/AppContainer.jsx';
5+
import AppContainer from '../../containers/AppContainer.tsx';
66

77
it('contains a AppContainer', () => {
88
// wrapped version of react component
File renamed without changes.

yarn.lock

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,14 @@
180180
"@babel/runtime" "7.0.0-beta.42"
181181
recompose "^0.28.0"
182182

183+
"@types/hoist-non-react-statics@^3.3.0":
184+
version "3.3.1"
185+
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
186+
integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
187+
dependencies:
188+
"@types/react" "*"
189+
hoist-non-react-statics "^3.3.0"
190+
183191
"@types/invariant@^2.2.29":
184192
version "2.2.29"
185193
resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.29.tgz#aa845204cd0a289f65d47e0de63a6a815e30cc66"
@@ -216,6 +224,15 @@
216224
dependencies:
217225
"@types/react" "*"
218226

227+
"@types/react-redux@^7.0.8":
228+
version "7.0.8"
229+
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.8.tgz#c928863058e334d41031c6bedd0f113bc514e234"
230+
integrity sha512-vIBC15E84ehN6RzdGwRVa41whp9e4CkfPm+WfD0r6y6vqBf4tQPKZeKEBfLLM8k79uSwQC7rh3rH/MFaN1IESQ==
231+
dependencies:
232+
"@types/hoist-non-react-statics" "^3.3.0"
233+
"@types/react" "*"
234+
redux "^4.0.0"
235+
219236
"@types/react-transition-group@^2.0.8":
220237
version "2.0.13"
221238
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-2.0.13.tgz#7769fb61eb71d64d087a713956f086a42c3ee171"
@@ -4106,6 +4123,13 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
41064123
version "2.5.5"
41074124
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
41084125

4126+
hoist-non-react-statics@^3.3.0:
4127+
version "3.3.0"
4128+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
4129+
integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
4130+
dependencies:
4131+
react-is "^16.7.0"
4132+
41094133
home-or-tmp@^2.0.0:
41104134
version "2.0.0"
41114135
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -7123,6 +7147,11 @@ react-is@^16.4.2:
71237147
version "16.4.2"
71247148
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.2.tgz#84891b56c2b6d9efdee577cc83501dfc5ecead88"
71257149

7150+
react-is@^16.7.0:
7151+
version "16.8.6"
7152+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
7153+
integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
7154+
71267155
react-jss@^8.1.0:
71277156
version "8.6.1"
71287157
resolved "https://registry.yarnpkg.com/react-jss/-/react-jss-8.6.1.tgz#a06e2e1d2c4d91b4d11befda865e6c07fbd75252"

0 commit comments

Comments
 (0)