Skip to content

Commit 596af9a

Browse files
committed
TSLinting everything, including the demo now
1 parent 3af4e79 commit 596af9a

File tree

5 files changed

+63
-62
lines changed

5 files changed

+63
-62
lines changed

demo/server.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
import * as fs from 'fs';
2-
import * as express from 'express';
3-
import * as colors from 'colors';
4-
import * as webpackMiddleware from 'webpack-dev-middleware';
5-
import * as webpackHotMiddleware from 'webpack-hot-middleware';
6-
import * as webpack from 'webpack';
7-
import * as webpackConfig from '../webpack.config.demo.dev';
8-
import * as opn from 'opn';
9-
const packageJson = require('../package.json');
1+
import * as fs from "fs";
2+
import * as express from "express";
3+
import * as colors from "colors";
4+
import * as webpackMiddleware from "webpack-dev-middleware";
5+
import * as webpackHotMiddleware from "webpack-hot-middleware";
6+
import * as webpack from "webpack";
7+
import * as webpackConfig from "../webpack.config.demo.dev";
8+
import * as opn from "opn";
9+
const packageJson = require("../package.json");
1010

1111
const webpackCompiler = webpack(webpackConfig as any);
1212
const port = 4000;
1313

14-
require.extensions['.html'] = (module, filename) => {
15-
module.exports = fs.readFileSync(filename, 'utf8');
14+
require.extensions[".html"] = (module, filename) => {
15+
module.exports = fs.readFileSync(filename, "utf8");
1616
};
1717

1818
const app = express();
1919

2020
app.use(webpackMiddleware(webpackCompiler));
2121
app.use(webpackHotMiddleware(webpackCompiler));
22-
app.use((req, res) => res.status(200).send(require('./index.html')));
22+
app.use((req, res) => res.status(200).send(require("./index.html")));
2323

24-
app.listen(port, '0.0.0.0', () => {
24+
app.listen(port, "0.0.0.0", () => {
2525
const demoUrl = `http://localhost:${port}/`;
26+
// tslint:disable-next-line
2627
console.log(colors.green(`${packageJson.name} at ${demoUrl}`));
2728
opn(demoUrl);
2829
});

src/ReactMdePreview.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ export class ReactMdePreview extends React.Component<ReactMdePreviewProps, React
1515
converter: Showdown.Converter;
1616
preview: HTMLDivElement;
1717

18-
static defaultProps: Partial<ReactMdePreviewProps> = {
19-
previewRef: (() => {
20-
}),
21-
}
22-
2318
constructor(props) {
2419
super(props);
2520
const {showdownOptions} = props;
@@ -30,14 +25,15 @@ export class ReactMdePreview extends React.Component<ReactMdePreviewProps, React
3025
const {markdown, previewRef} = this.props;
3126
const html = this.converter.makeHtml(markdown) || "<p>&nbsp</p>";
3227
return (
33-
<div className="mde-preview"
34-
>
28+
<div className="mde-preview">
3529
<div
3630
className="mde-preview-content"
3731
dangerouslySetInnerHTML={{__html: html}}
3832
ref={(p) => {
3933
this.preview = p;
40-
previewRef(p);
34+
if (previewRef) {
35+
previewRef(p);
36+
}
4137
}}
4238
/>
4339
<div className="mde-help">
@@ -47,4 +43,3 @@ export class ReactMdePreview extends React.Component<ReactMdePreviewProps, React
4743
);
4844
}
4945
}
50-

src/ReactMdeTextArea.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ export interface ReactMdeTextAreaState {
1616
export class ReactMdeTextArea extends React.Component<ReactMdeTextAreaProps, ReactMdeTextAreaState> {
1717
textArea: HTMLTextAreaElement;
1818

19-
static defaultProps:Partial<ReactMdeTextAreaProps> = {
20-
textAreaRef: () => {},
19+
static defaultProps: Partial<ReactMdeTextAreaProps> = {
2120
textAreaProps: {},
22-
}
21+
};
2322

2423
/**
2524
* Handler for the textArea value change
@@ -47,12 +46,13 @@ export class ReactMdeTextArea extends React.Component<ReactMdeTextAreaProps, Rea
4746
value={text}
4847
ref={(c) => {
4948
this.textArea = c;
50-
textAreaRef(c);
49+
if (textAreaRef) {
50+
textAreaRef(c);
51+
}
5152
}}
5253
{...textAreaProps}
5354
/>
5455
</div>
5556
);
5657
}
5758
}
58-

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"include": [
2121
"./src/**/*.ts",
2222
"./src/**/*.tsx",
23-
"./test/**/*.ts"
23+
"./test/**/*.ts",
24+
"./demo/**/*.ts"
2425
]
2526
}

tslint.json

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
11
{
2-
"extends": [
3-
"tslint:latest",
4-
"tslint-react"
2+
"extends": [
3+
"tslint:latest",
4+
"tslint-react"
5+
],
6+
"rules": {
7+
"quotemark": [
8+
true,
9+
"double",
10+
"jsx-double"
511
],
6-
"rules": {
7-
"quotemark": [
8-
true,
9-
"double",
10-
"jsx-double"
11-
],
12-
"max-line-length": [
13-
false
14-
],
15-
"interface-name": [
16-
true,
17-
"never-prefix"
18-
],
19-
"curly": false,
20-
"object-literal-sort-keys": false,
21-
"member-ordering": false,
22-
"jsx-no-lambda": [
23-
false
24-
],
25-
"jsx-no-multiline-js": [
26-
false
27-
],
28-
"max-classes-per-file": [
29-
false
30-
],
31-
"member-access": false,
32-
"no-var-requires": false,
33-
"ordered-imports": false,
34-
"space-before-function-paren": false,
35-
"no-empty-interface": false
36-
}
12+
"max-line-length": [
13+
false
14+
],
15+
"interface-name": [
16+
true,
17+
"never-prefix"
18+
],
19+
"curly": false,
20+
"object-literal-sort-keys": false,
21+
"member-ordering": false,
22+
"jsx-no-lambda": [
23+
false
24+
],
25+
"jsx-no-multiline-js": [
26+
false
27+
],
28+
"max-classes-per-file": [
29+
false
30+
],
31+
"member-access": false,
32+
"no-var-requires": false,
33+
"ordered-imports": false,
34+
"space-before-function-paren": false,
35+
"no-empty-interface": false,
36+
"no-implicit-dependencies": [
37+
true,
38+
"dev"
39+
]
40+
}
3741
}

0 commit comments

Comments
 (0)