Skip to content

Commit 53bb6a5

Browse files
Tolga MizrakciTolga Mizrakci
Tolga Mizrakci
authored and
Tolga Mizrakci
committed
electron build with tsx containers working
1 parent 65b2bb0 commit 53bb6a5

File tree

9 files changed

+18
-17
lines changed

9 files changed

+18
-17
lines changed

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';
5-
import AppContainer from '../containers/AppContainer.jsx';
5+
import AppContainer from '../containers/AppContainer.tsx';
66

77
interface Adam {
88
goodguy: boolean;

src/components/KonvaStage.jsx renamed to src/components/KonvaStage.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import React, { Component, createRef } from 'react';
33
import {
44
Stage, Layer, Image, Group,
55
} from 'react-konva';
6-
import TransformerComponent from './TransformerComponent.jsx';
7-
import Rectangle from './Rectangle.jsx';
6+
import TransformerComponent from './TransformerComponent.tsx';
7+
import Rectangle from './Rectangle.tsx';
88

99

1010
class KonvaStage extends Component {
File renamed without changes.

src/containers/AppContainer.jsx renamed to src/containers/AppContainer.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { Component } from 'react';
22
import { connect } from 'react-redux';
3-
import PropTypes from 'prop-types';
3+
// import PropTypes from 'prop-types';
44
import { MuiThemeProvider } from '@material-ui/core/styles';
55
import LinearProgress from '@material-ui/core/LinearProgress';
6-
import LeftContainer from './LeftContainer.jsx';
7-
import MainContainer from './MainContainer.jsx';
8-
import RightContainer from './RightContainer.jsx';
6+
import LeftContainer from './LeftContainer.tsx';
7+
import MainContainer from './MainContainer.tsx';
8+
import RightContainer from './RightContainer.tsx';
99
import convertIdsToObjs from '../utils/convertIdsToObjs.util';
1010
import theme from '../components/theme';
1111
import { loadInitData } from '../actions/components';
@@ -86,10 +86,10 @@ class AppContainer extends Component {
8686

8787
export default connect(mapStateToProps, mapDispatchToProps)(AppContainer);
8888

89-
AppContainer.propTypes = {
90-
components: PropTypes.array.isRequired,
91-
totalComponents: PropTypes.number.isRequired,
92-
focusComponent: PropTypes.object.isRequired,
93-
loadInitData: PropTypes.func.isRequired,
94-
loading: PropTypes.bool,
95-
};
89+
// AppContainer.propTypes = {
90+
// components: PropTypes.array.isRequired,
91+
// totalComponents: PropTypes.number.isRequired,
92+
// focusComponent: PropTypes.object.isRequired,
93+
// loadInitData: PropTypes.func.isRequired,
94+
// loading: PropTypes.bool,
95+
// };
File renamed without changes.

src/containers/MainContainer.jsx renamed to src/containers/MainContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import theme from '../components/theme';
1010
import {
1111
toggleDragging, openExpansionPanel, handleTransform, createApplication, changeImagePath,
1212
} from '../actions/components';
13-
import KonvaStage from '../components/KonvaStage.jsx';
13+
import KonvaStage from '../components/KonvaStage.tsx';
1414
// import MainContainerHeader from '../components/MainContainerHeader.jsx';
1515
// import createModal from '../utils/createModal.util';
1616
// import Info from '../components/Info.jsx';
File renamed without changes.

yarn.lock

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2990,9 +2990,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
29902990
dependencies:
29912991
once "^1.4.0"
29922992

2993-
enhanced-resolve@^4.1.0:
2993+
enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
29942994
version "4.1.0"
29952995
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
2996+
integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
29962997
dependencies:
29972998
graceful-fs "^4.1.2"
29982999
memory-fs "^0.4.0"
@@ -5459,7 +5460,7 @@ loglevelnext@^1.0.1:
54595460
dependencies:
54605461
es6-symbol "^3.1.1"
54615462
object.assign "^4.1.0"
5462-
5463+
54635464
54645465
version "4.0.0"
54655466
resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"

0 commit comments

Comments
 (0)