Skip to content

Commit d4c73c8

Browse files
bchernyChad Smith
bcherny
authored and
Chad Smith
committedApr 28, 2019
Add TypeScript, catch bugs (#256)
·
v0.15.1.00.15.2.0
1 parent 49daedc commit d4c73c8

16 files changed

+1961
-1369
lines changed
 

‎gdbgui/src/js/Breakpoints.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import GdbApi from "./GdbApi.jsx";
44
import Actions from "./Actions.js";
55
import Util from "./Util.js";
66
import FileOps from "./FileOps.jsx";
7-
import { FileLink } from "./Links.jsx";
7+
import { FileLink } from "./Links";
88

99
const BreakpointSourceLineCache = {
1010
_cache: {},

‎gdbgui/src/js/CopyToClipboard.jsx ‎gdbgui/src/js/CopyToClipboard.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
import React from "react";
1+
import * as React from "react";
22
import ToolTip from "./ToolTip.jsx";
33
import { store } from "statorgfc";
44

5-
class CopyToClipboard extends React.Component {
5+
type Props = {
6+
content: string | null
7+
};
8+
9+
class CopyToClipboard extends React.Component<Props> {
10+
node: HTMLSpanElement | null = null;
611
render() {
712
if (!this.props.content) {
813
return null;

‎gdbgui/src/js/GdbVariable.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Memory from "./Memory.jsx";
99
import constants from "./constants.js";
1010
import { store } from "statorgfc";
1111
import GdbApi from "./GdbApi.jsx";
12-
import CopyToClipboard from "./CopyToClipboard.jsx";
12+
import CopyToClipboard from "./CopyToClipboard";
1313
import Actions from "./Actions.js";
1414

1515
/**

‎gdbgui/src/js/Links.jsx ‎gdbgui/src/js/Links.tsx

+21-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
import Actions from "./Actions.js";
2-
import React from "react";
3-
import CopyToClipboard from "./CopyToClipboard.jsx";
2+
import * as React from "react";
3+
import CopyToClipboard from "./CopyToClipboard";
4+
import MemoryLink from "./MemoryLink";
45

5-
class FileLink extends React.Component {
6+
type Props = {
7+
file?: string
8+
fullname?: string
9+
line: string
10+
num_lines?: number
11+
};
12+
13+
export class FileLink extends React.Component<Props> {
614
render() {
715
let line = parseInt(this.props.line);
8-
let onclick = null,
16+
let onclick = () => {},
917
cls = "";
1018
if (!this.props.file || !line) {
11-
line = "";
19+
line = 0;
1220
}
1321
let sep = "";
1422
if (line && line !== 0) {
@@ -43,7 +51,14 @@ class FileLink extends React.Component {
4351
}
4452
}
4553

46-
class FrameLink extends React.Component {
54+
type FrameLinkProps = {
55+
addr: string
56+
file?: string
57+
fullname?: string
58+
line: string
59+
};
60+
61+
export class FrameLink extends React.Component<FrameLinkProps> {
4762
render() {
4863
return (
4964
<div>
@@ -58,6 +73,3 @@ class FrameLink extends React.Component {
5873
);
5974
}
6075
}
61-
62-
export { FileLink };
63-
export { FrameLink };

‎gdbgui/src/js/Memory.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { store } from "statorgfc";
99
import GdbApi from "./GdbApi.jsx";
1010
import constants from "./constants.js";
1111
import ReactTable from "./ReactTable.jsx";
12-
import MemoryLink from "./MemoryLink.jsx";
12+
import MemoryLink from "./MemoryLink.tsx";
1313
import Actions from "./Actions";
1414
import React from "react";
1515

‎gdbgui/src/js/MemoryLink.jsx ‎gdbgui/src/js/MemoryLink.tsx

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import React from "react";
1+
import * as React from "react";
22
import Memory from "./Memory.jsx";
33

4-
class MemoryLink extends React.Component {
4+
type Props = {
5+
addr: string
6+
style?: React.CSSProperties
7+
};
8+
9+
class MemoryLink extends React.Component<Props> {
510
render() {
611
// turn 0x00000000000000 into 0x0
712
const address_no_leading_zeros = "0x" + parseInt(this.props.addr, 16).toString(16);

‎gdbgui/src/js/SourceCode.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import React from "react";
77
import FileOps from "./FileOps.jsx";
88
import Breakpoints from "./Breakpoints.jsx";
99
import Memory from "./Memory.jsx";
10-
import MemoryLink from "./MemoryLink.jsx";
10+
import MemoryLink from "./MemoryLink";
1111
import constants from "./constants.js";
1212
import Actions from "./Actions.js";
1313

‎gdbgui/src/js/SourceCodeHeading.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import constants from "./constants.js";
33
import { store } from "statorgfc";
4-
import { FileLink } from "./Links.jsx";
4+
import { FileLink } from "./Links";
55
import FileOps from "./FileOps.jsx";
66

77
class SourceCodeHeading extends React.Component {

‎gdbgui/src/js/Threads.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import ReactTable from "./ReactTable.jsx";
33
import { store } from "statorgfc";
44
import GdbApi from "./GdbApi.jsx";
55
import Memory from "./Memory.jsx";
6-
import { FileLink } from "./Links.jsx";
7-
import MemoryLink from "./MemoryLink.jsx";
6+
import { FileLink } from "./Links";
7+
import MemoryLink from "./MemoryLink";
88

99
class FrameArguments extends React.Component {
1010
render_frame_arg(frame_arg) {

‎gdbgui/src/js/types.d.ts

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
declare module 'statorgfc' {
2+
export let store: {
3+
get(key: string): any
4+
}
5+
}

‎jest.config.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
module.exports = {
2+
"preset": 'ts-jest',
23
"verbose": true,
3-
"testMatch": [__dirname + '/gdbgui/src/js/tests/**']
4+
"testMatch": [__dirname + '/gdbgui/src/js/tests/**'],
5+
"transform": {
6+
'^.+\.(j|t)sx?$': 'ts-jest'
7+
}
48
}

‎package.json

+15-17
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
"version": "0.1.0",
44
"license": "GPL-3.0",
55
"scripts": {
6-
"start": "BABEL_ENV=development webpack --mode development --watch --config webpack.config.js",
6+
"start": "NODE_ENV=development webpack --mode development --watch --config webpack.config.js",
77
"test": "jest",
8-
"build": "BABEL_ENV=production webpack --mode production --config webpack.config.js",
8+
"build": "NODE_ENV=production webpack --mode production --config webpack.config.js",
99
"prettier": "prettier ./gdbgui/src/js/** --write"
1010
},
11-
"babel": {
12-
"presets": [
13-
"react-app"
14-
]
15-
},
1611
"dependencies": {
17-
"babel-core": "^6.26.0",
18-
"babel-eslint": "^8.2.3",
19-
"babel-loader": "^7.1.4",
20-
"babel-preset-react-app": "^3.1.1",
21-
"babel-runtime": "6.26.0",
22-
"eslint": "^4.19.1",
23-
"eslint-loader": "^2.0.0",
24-
"eslint-plugin-prettier": "^2.6.0",
25-
"eslint-plugin-react": "^7.7.0",
26-
"jest": "^21.2.1",
2712
"prettier": "^1.12.0",
2813
"react": "^16.4",
2914
"react-dom": "^16.4",
3015
"statorgfc": "^0.1.6",
3116
"webpack": "^4.5.0",
3217
"webpack-cli": "^2.0.14"
18+
},
19+
"devDependencies": {
20+
"@types/jest": "^24.0.11",
21+
"@types/react": "^16.8.7",
22+
"@types/react-dom": "^16.8.2",
23+
"fork-ts-checker-webpack-plugin": "^1.0.0",
24+
"jest": "^24.3.1",
25+
"ts-jest": "^24.0.0",
26+
"ts-loader": "^5.3.3",
27+
"tslint": "^5.13.1",
28+
"tslint-config-prettier": "^1.18.0",
29+
"tslint-loader": "^3.5.4",
30+
"typescript": "^3.3.3333"
3331
}
3432
}

‎tsconfig.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"compilerOptions": {
3+
"allowJs": true,
4+
"downlevelIteration": true,
5+
"forceConsistentCasingInFileNames": true,
6+
"jsx": "react",
7+
"lib": ["dom", "es2015", "es2016.array.include"],
8+
"module": "esnext",
9+
"moduleResolution": "node",
10+
"newLine": "LF",
11+
"noEmitOnError": false,
12+
"outDir": "dist",
13+
"preserveConstEnums": true,
14+
"skipLibCheck": true,
15+
"sourceMap": true,
16+
"strict": true,
17+
"target": "es5"
18+
},
19+
"include": [
20+
"./gdbgui/src/js"
21+
]
22+
}

‎tslint.json

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"es6": true,
5+
"jquery": true
6+
},
7+
"extends": ["tslint-config-prettier"],
8+
"globals": {
9+
"initial_data": true,
10+
"module": true,
11+
"_": true,
12+
"moment": true
13+
},
14+
"jsRules": {
15+
"indent": {
16+
"options": ["spaces"]
17+
}
18+
},
19+
"rules": {
20+
"quotemark": true,
21+
"semicolon": true
22+
}
23+
}

‎webpack.config.js

+31-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
11
const path = require('path');
2+
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
23

34
module.exports = {
45
entry: './gdbgui/src/js/gdbgui.jsx',
5-
devtool: 'source-map',
6-
performance: {
7-
hints: false
8-
},
96
output: {
107
path: path.resolve(__dirname, 'gdbgui/static/js/'),
118
filename: 'build.js'
129
},
1310
module: {
14-
rules: [
15-
{ test: /\.js$/,
16-
use: [
17-
'babel-loader',
18-
'eslint-loader',
19-
],
20-
exclude: /node_modules/
21-
},
22-
{ test: /\.jsx$/,
23-
use: [
24-
'babel-loader',
25-
'eslint-loader',
26-
],
27-
exclude: /node_modules/
28-
}
29-
]
11+
rules: [{
12+
test: /\.(j|t)sx?$/,
13+
use: [
14+
{
15+
loader: 'ts-loader',
16+
options: {
17+
experimentalFileCaching: true,
18+
experimentalWatchApi: true,
19+
transpileOnly: true
20+
}
21+
},
22+
{
23+
loader: 'tslint-loader',
24+
options: {
25+
fix: true,
26+
typeCheck: true
27+
}
28+
}
29+
],
30+
exclude: /node_modules/
31+
}]
32+
},
33+
plugins: [
34+
new ForkTsCheckerWebpackPlugin({
35+
tslint: true,
36+
tslintAutoFix: true
37+
})
38+
],
39+
resolve: {
40+
extensions: ['.js', '.ts', '.tsx']
3041
}
3142
}

‎yarn.lock

+1,818-1,311
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.