Skip to content

Commit f5baada

Browse files
committed
fix tslint config, but it wont print errors for some reason
1 parent 3309398 commit f5baada

File tree

4 files changed

+118
-49
lines changed

4 files changed

+118
-49
lines changed

index.d.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
// @types/react-color exists but doesn't work
2-
declare module 'react-color' {
3-
export const PhotoshopPicker: any;
4-
export const SketchPicker: any;
5-
export const ChromePicker: any;
6-
}

package-lock.json

Lines changed: 81 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"verify": "npm run lint && npm run typecheck && npm test"
1919
},
2020
"dependencies": {
21+
"@types/react-color": "^2.13.5",
2122
"express": "^4.16.3",
2223
"lodash": "^4.17.10",
2324
"minimist": "^1.2.0",
@@ -37,7 +38,7 @@
3738
"@types/webpack": "^4.4.8",
3839
"@types/webpack-dev-server": "^2.4.0",
3940
"@types/ws": "0.0.41",
40-
"awesome-typescript-loader": "^3.1.3",
41+
"awesome-typescript-loader": "^5.2.0",
4142
"core-js": "^2.4.1",
4243
"css-loader": "^0.23.1",
4344
"file-loader": "^0.9.0",
@@ -57,7 +58,7 @@
5758
"style-loader": "^0.13.1",
5859
"ts-node": "^3.1.0",
5960
"tslint": "^4.5.1",
60-
"tslint-loader": "^3.5.3",
61+
"tslint-loader": "^3.6.0",
6162
"typescript": "^3.0.1",
6263
"webpack": "^4.16.3",
6364
"webpack-dev-server": "^3.1.5"

src/server/webpack_configs.ts

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,18 @@ export function getDevConfig(config: BuildConfig = {}): webpack.Configuration {
2727
rules: [
2828
{
2929
test: /\.tsx?$/,
30+
enforce: 'pre',
3031
use: [
31-
'react-hot-loader', 'awesome-typescript-loader', 'tslint-loader',
32+
{
33+
loader: 'tslint-loader',
34+
options: { emitErrors: false, failOnHint: false, }
35+
},
36+
],
37+
},
38+
{
39+
test: /\.tsx?$/,
40+
use: [
41+
'react-hot-loader', 'awesome-typescript-loader',
3242
],
3343
include: srcdir
3444
},
@@ -58,10 +68,6 @@ export function getDevConfig(config: BuildConfig = {}): webpack.Configuration {
5868
new CheckerPlugin(),
5969
new webpack.LoaderOptionsPlugin({
6070
options: {
61-
tslint: {
62-
emitErrors: true,
63-
failOnHint: true
64-
},
6571
css: {
6672
sourceMap: true,
6773
root: '/build',
@@ -73,6 +79,7 @@ export function getDevConfig(config: BuildConfig = {}): webpack.Configuration {
7379
resolve: {
7480
extensions: ['.jsx', '.js', '.tsx', '.ts']
7581
},
82+
stats: 'verbose'
7683
};
7784
}
7885

@@ -84,10 +91,20 @@ export function getProdConfig(config: BuildConfig = {}): webpack.Configuration {
8491
entry: `${srcdir}/assets/ts/app.tsx`,
8592
module: {
8693
rules: [
94+
{
95+
test: /\.tsx?$/,
96+
enforce: 'pre',
97+
use: [
98+
{
99+
loader: 'tslint-loader',
100+
options: { emitErrors: true, failOnHint: true, }
101+
},
102+
],
103+
},
87104
{
88105
test: /\.tsx?$/,
89106
use: [
90-
'awesome-typescript-loader', 'tslint-loader',
107+
'awesome-typescript-loader',
91108
],
92109
include: srcdir
93110
},
@@ -119,10 +136,6 @@ export function getProdConfig(config: BuildConfig = {}): webpack.Configuration {
119136
new CheckerPlugin(),
120137
new webpack.LoaderOptionsPlugin({
121138
options: {
122-
tslint: {
123-
emitErrors: true,
124-
failOnHint: true
125-
},
126139
css: {
127140
sourceMap: true,
128141
root: '/build',
@@ -153,10 +166,20 @@ export function getProdServerConfig(config: BuildConfig = {}): webpack.Configura
153166
externals: nodeModules,
154167
module: {
155168
rules: [
169+
{
170+
test: /\.tsx?$/,
171+
enforce: 'pre',
172+
use: [
173+
{
174+
loader: 'tslint-loader',
175+
options: { emitErrors: true, failOnHint: true, }
176+
},
177+
],
178+
},
156179
{
157180
test: /\.ts$/,
158181
use: [
159-
'awesome-typescript-loader', 'tslint-loader',
182+
'awesome-typescript-loader'
160183
],
161184
include: srcdir
162185
},
@@ -172,14 +195,6 @@ export function getProdServerConfig(config: BuildConfig = {}): webpack.Configura
172195
},
173196
plugins: [
174197
new CheckerPlugin(),
175-
new webpack.LoaderOptionsPlugin({
176-
options: {
177-
tslint: {
178-
emitErrors: true,
179-
failOnHint: true
180-
},
181-
}
182-
}),
183198
],
184199
resolve: {
185200
extensions: ['.js', '.ts']

0 commit comments

Comments
 (0)