Skip to content

Commit ca1a51f

Browse files
author
Austin Green
committed
Update build to use ts-loader with babel
1 parent 63d6b02 commit ca1a51f

File tree

11 files changed

+14
-42
lines changed

11 files changed

+14
-42
lines changed

babel.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ module.exports = {
1313
targets: '> 0.5%, last 2 versions, Firefox ESR, not dead'
1414
}
1515
],
16-
'@babel/preset-react',
17-
'@babel/preset-typescript'
16+
'@babel/preset-react'
1817
],
1918
plugins: [
2019
'@babel/plugin-transform-object-assign',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"@babel/polyfill": "7.4.4",
3535
"@babel/preset-env": "7.4.5",
3636
"@babel/preset-react": "7.0.0",
37-
"@babel/preset-typescript": "7.3.3",
3837
"@svgr/webpack": "4.3.0",
3938
"@testing-library/react": "8.0.1",
4039
"@types/classnames": "2.2.8",

packages/dropdowns/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dist"
1515
],
1616
"scripts": {
17-
"build": "../../utils/scripts/build.sh && tsc -p tsconfig.build.json",
17+
"build": "../../utils/scripts/build.sh",
1818
"build:demo": "../../utils/scripts/build-demo.sh",
1919
"start": "../../utils/scripts/start.sh"
2020
},

packages/dropdowns/styleguide.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const reactDocgen = require('react-docgen');
1515
*/
1616
module.exports = {
1717
propsParser: reactDocgenTypescript.withCustomConfig(
18-
path.resolve(__dirname, '../../utils/styleguide/tsconfig.styleguide.json'),
18+
path.resolve(__dirname, '../../tsconfig.json'),
1919
{
2020
propFilter: props => {
2121
return props.parent.fileName.indexOf('node_modules') === -1;

packages/dropdowns/tsconfig.build.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"noEmit": false,
54
"rootDir": "src",
65
"declarationDir": "dist/typings",
76
"declaration": true,
8-
"emitDeclarationOnly": true,
7+
"sourceMap": false
98
},
109
"include": ["src/**/*"],
1110
"exclude": ["**/*.spec.tsx", "**/*.spec.ts"]

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"compilerOptions": {
33
"target": "esnext",
44
"module": "esnext",
5-
"jsx": "react",
5+
"jsx": "preserve",
66
"sourceMap": true,
7-
"noEmit": true,
87
"strict": true,
98
"moduleResolution": "node",
109
"baseUrl": "./",

utils/build/webpack.base.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ found at http://www.apache.org/licenses/LICENSE-2.0
7878
{
7979
loader: 'babel-loader',
8080
options: babelOptions
81+
},
82+
{
83+
loader: 'ts-loader',
84+
options: {
85+
configFile: path.resolve('tsconfig.build.json')
86+
}
8187
}
8288
]
8389
},

utils/scripts/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ set -x
33
set -e
44

55
rimraf dist
6-
webpack --config ../../utils/build/webpack.commonjs.js --config ../../utils/build/webpack.umd.js --hide-modules
6+
webpack --config ../../utils/build/webpack.commonjs.js --hide-modules
7+
webpack --config ../../utils/build/webpack.umd.js --hide-modules

utils/styleguide/styleguide.base.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ const defaultStyleguideConfig = {
187187
{
188188
loader: require.resolve('ts-loader'),
189189
options: {
190-
configFile: path.resolve(__dirname, 'tsconfig.styleguide.json')
190+
configFile: path.resolve(__dirname, '../../tsconfig.json')
191191
}
192192
}
193193
]

utils/styleguide/tsconfig.styleguide.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)