Skip to content

Commit 35845c1

Browse files
committed
Fix(at-loader): fix at-loader not respecting 'exclude' property in tsconfig.json issue
1 parent 932be0d commit 35845c1

File tree

11 files changed

+65
-32
lines changed

11 files changed

+65
-32
lines changed

frontend/src/pages/HomePage/components/ContentLoader/__tests__/contentLoader.spec.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ import ContentLoader from '../contentLoader';
66
describe('ContentLoader', () => {
77
it('should renders correctly', () => {
88
const renderer = ShallowRenderer.createRenderer();
9+
const props = {
10+
isLoading: false,
11+
pastDelay: false,
12+
timedOut: false,
13+
error: null,
14+
retry: () => { return; },
15+
};
916
const result = renderer.render(
10-
<ContentLoader />,
17+
<ContentLoader {...props} />,
1118
);
1219
expect(result).toMatchSnapshot();
1320
renderer.unmount();

frontend/src/pages/HomePage/components/ContentLoader/contentLoader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import ContentLoader, { ContentLoaderProps } from 'react-content-loader';
2+
import ContentLoader from 'react-content-loader';
3+
import { LoadingComponentProps } from 'react-loadable';
34

45
const styles = require('./contentLoader.scss');
56

6-
export default (props: ContentLoaderProps) => (
7+
export default (_: LoadingComponentProps) => (
78
<div className={styles.contentLoader}>
89
<ContentLoader
910
height={400}
1011
width={400}
1112
speed={2}
1213
primaryColor='#f3f3f3'
1314
secondaryColor='#ecebeb'
14-
{...props}
1515
>
1616
<rect x='160.5' y='11' rx='4' ry='4' width='76.63000000000001' height='15.093' />
1717
<rect x='60.5' y='35.05' rx='1' ry='1' width='275.40000000000003' height='151.35999999999999' />

frontend/src/pages/NotFoundPage/components/ContentLoader/__tests__/contentLoader.spec.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ import ContentLoader from '../contentLoader';
66
describe('ContentLoader', () => {
77
it('should renders correctly', () => {
88
const renderer = ShallowRenderer.createRenderer();
9+
const props = {
10+
isLoading: false,
11+
pastDelay: false,
12+
timedOut: false,
13+
error: null,
14+
retry: () => { return; },
15+
};
916
const result = renderer.render(
10-
<ContentLoader />,
17+
<ContentLoader {...props} />,
1118
);
1219
expect(result).toMatchSnapshot();
1320
renderer.unmount();

frontend/src/pages/NotFoundPage/components/ContentLoader/contentLoader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import ContentLoader, { ContentLoaderProps } from 'react-content-loader';
2+
import ContentLoader from 'react-content-loader';
3+
import { LoadingComponentProps } from 'react-loadable';
34

45
const styles = require('./contentLoader.scss');
56

6-
export default (props: ContentLoaderProps) => (
7+
export default (_: LoadingComponentProps) => (
78
<div className={styles.contentLoader}>
89
<ContentLoader
910
height={326}
1011
width={400}
1112
speed={2}
1213
primaryColor='#f3f3f3'
1314
secondaryColor='#ecebeb'
14-
{...props}
1515
>
1616
<rect x='93' y='24' rx='4' ry='4' width='210' height='30.68' />
1717
<rect x='36' y='92.05' rx='4' ry='4' width='330.24' height='193.63' />

frontend/src/pages/ParallaxPage/components/ContentLoader/__tests__/contentLoader.spec.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ import ContentLoader from '../contentLoader';
66
describe('ContentLoader', () => {
77
it('should renders correctly', () => {
88
const renderer = ShallowRenderer.createRenderer();
9+
const props = {
10+
isLoading: false,
11+
pastDelay: false,
12+
timedOut: false,
13+
error: null,
14+
retry: () => { return; },
15+
};
916
const result = renderer.render(
10-
<ContentLoader />,
17+
<ContentLoader {...props} />,
1118
);
1219
expect(result).toMatchSnapshot();
1320
renderer.unmount();

frontend/src/pages/ParallaxPage/components/ContentLoader/contentLoader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import ContentLoader, { ContentLoaderProps } from 'react-content-loader';
2+
import ContentLoader from 'react-content-loader';
3+
import { LoadingComponentProps } from 'react-loadable';
34

45
const styles = require('./contentLoader.scss');
56

6-
export default (props: ContentLoaderProps) => (
7+
export default (_: LoadingComponentProps) => (
78
<div className={styles.contentLoader}>
89
<ContentLoader
910
height={500}
1011
width={400}
1112
speed={2}
1213
primaryColor='#f3f3f3'
1314
secondaryColor='#ecebeb'
14-
{...props}
1515
>
1616
<rect x='160' y='12' rx='4' ry='4' width='80' height='15.6468' />
1717
<rect x='0' y='41.05' rx='4' ry='4' width='399.5904' height='112.7321' />

frontend/src/pages/ReactPage/components/ContentLoader/__tests__/contentLoader.spec.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ import ContentLoader from '../contentLoader';
66
describe('ContentLoader', () => {
77
it('should renders correctly', () => {
88
const renderer = ShallowRenderer.createRenderer();
9+
const props = {
10+
isLoading: false,
11+
pastDelay: false,
12+
timedOut: false,
13+
error: null,
14+
retry: () => { return; },
15+
};
916
const result = renderer.render(
10-
<ContentLoader />,
17+
<ContentLoader {...props} />,
1118
);
1219
expect(result).toMatchSnapshot();
1320
renderer.unmount();

frontend/src/pages/ReactPage/components/ContentLoader/contentLoader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import ContentLoader, { ContentLoaderProps } from 'react-content-loader';
2+
import ContentLoader from 'react-content-loader';
3+
import { LoadingComponentProps } from 'react-loadable';
34

45
const styles = require('./contentLoader.scss');
56

6-
export default (props: ContentLoaderProps) => (
7+
export default (_: LoadingComponentProps) => (
78
<div className={styles.contentLoader}>
89
<ContentLoader
910
height={400}
1011
width={400}
1112
speed={2}
1213
primaryColor='#f3f3f3'
1314
secondaryColor='#ecebeb'
14-
{...props}
1515
>
1616
<rect x='93' y='24' rx='4' ry='4' width='210' height='30.68' />
1717
<rect x='0' y='76.05' rx='4' ry='4' width='400' height='304' />

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lib": [
99
"dom",
1010
"dom.iterable",
11-
"es2015"
11+
"es6"
1212
],
1313
"jsx": "react",
1414
"allowSyntheticDefaultImports": true,

webpack.config.base.babel.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ export default {
3636
test: /\.tsx?$/,
3737
use: [
3838
{ loader: 'babel-loader' },
39-
// Use those two flags to speed up babel compilation
40-
// https://github.com/s-panferov/awesome-typescript-loader#differences-between-ts-loader
4139
{
4240
loader: 'awesome-typescript-loader',
4341
options: {
42+
silent: true,
43+
// Use those two flags to speed up babel compilation
44+
// https://github.com/s-panferov/awesome-typescript-loader#differences-between-ts-loader
4445
useBabel: true,
4546
useCache: true,
46-
silent: true,
47+
// Workaround for at-loader not respecting "exclude" property
48+
// https://github.com/s-panferov/awesome-typescript-loader/issues/492
49+
reportFiles: [
50+
'frontend/src/**/*.{ts,tsx}',
51+
],
4752
},
4853
},
4954
// Alternatively, we can use ts-loader

0 commit comments

Comments
 (0)