From 538527bd391d2a10742b88f81b15ae7fb7d5e51a Mon Sep 17 00:00:00 2001 From: EnixCoda Date: Sat, 9 Feb 2019 19:41:38 +0800 Subject: [PATCH] refactor: transform more to TS --- src/components/Gitako.jsx | 23 ----------------------- src/components/Gitako.tsx | 13 +++++++++++++ src/{content.jsx => content.tsx} | 4 ++-- src/driver/core/Gitako.js | 6 ------ src/driver/core/index.ts | 1 - tsconfig.json | 2 +- webpack.config.js | 2 +- 7 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 src/components/Gitako.jsx create mode 100644 src/components/Gitako.tsx rename src/{content.jsx => content.tsx} (82%) delete mode 100644 src/driver/core/Gitako.js diff --git a/src/components/Gitako.jsx b/src/components/Gitako.jsx deleted file mode 100644 index aec2575..0000000 --- a/src/components/Gitako.jsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from 'react' -import SideBar from 'components/SideBar' -import { Gitako as GitakoCore } from 'driver/core' -import connect from 'driver/connect' -import { raiseError } from 'analytics' - -@connect(GitakoCore) -export default class Gitako extends React.PureComponent { - componentDidMount() { - const { init } = this.props - init() - } - - componentDidCatch(error) { - raiseError(error) - } - - render() { - return ( - - ) - } -} diff --git a/src/components/Gitako.tsx b/src/components/Gitako.tsx new file mode 100644 index 0000000..8d5b658 --- /dev/null +++ b/src/components/Gitako.tsx @@ -0,0 +1,13 @@ +import * as React from 'react' +import SideBar from 'components/SideBar' +import { raiseError } from 'analytics' + +export default class Gitako extends React.PureComponent { + componentDidCatch(error: Error) { + raiseError(error) + } + + render() { + return React.createElement(SideBar as any) + } +} diff --git a/src/content.jsx b/src/content.tsx similarity index 82% rename from src/content.jsx rename to src/content.tsx index b86067f..06b7c41 100644 --- a/src/content.jsx +++ b/src/content.tsx @@ -1,5 +1,5 @@ -import React from 'react' -import ReactDOM from 'react-dom' +import * as React from 'react' +import * as ReactDOM from 'react-dom' import Gitako from 'components/Gitako' import { addMiddleware } from 'driver/connect' import { withErrorLog } from 'analytics' diff --git a/src/driver/core/Gitako.js b/src/driver/core/Gitako.js deleted file mode 100644 index 922294c..0000000 --- a/src/driver/core/Gitako.js +++ /dev/null @@ -1,6 +0,0 @@ -const init = dispatch => () => { -} - -export default { - init, -} diff --git a/src/driver/core/index.ts b/src/driver/core/index.ts index 18fb34f..071ab89 100644 --- a/src/driver/core/index.ts +++ b/src/driver/core/index.ts @@ -1,3 +1,2 @@ -export { default as Gitako } from './Gitako' export { default as SideBar } from './SideBar' export { default as FileExplorer } from './FileExplorer' diff --git a/tsconfig.json b/tsconfig.json index 450d0fc..8ec4d18 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "files": ["src/content.jsx"], + "files": ["src/content.tsx"], "compilerOptions": { "target": "es2016", "outDir": "dist", diff --git a/webpack.config.js b/webpack.config.js index 501afe6..17607ec 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -41,7 +41,7 @@ if (IN_PRODUCTION_MODE) { module.exports = { entry: { - content: './src/content.jsx', + content: './src/content.tsx', }, mode: IN_PRODUCTION_MODE ? 'production' : 'development', output: {