Skip to content

Commit

Permalink
Typescript config tweaks (#623)
Browse files Browse the repository at this point in the history
* Fixed tsc checking libs

* Removed docgen-typescript as it was casuing errors
  • Loading branch information
Michael Marszalek authored and vnys committed Nov 13, 2020
1 parent 16762fd commit 7677cd4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 39 deletions.
4 changes: 1 addition & 3 deletions libraries/core-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
"@types/styled-components": "^5.1.2",
"@types/testing-library__jest-dom": "^5.9.2",
"babel-plugin-react-docgen": "^4.1.0",
"babel-plugin-react-docgen-typescript": "^1.4.2",
"babel-plugin-styled-components": "^1.10.7",
"jest": "^26.0.1",
"jest-styled-components": "^6.3.4",
Expand All @@ -66,9 +65,8 @@
"react-dom": "^16.13.1",
"rollup": "^2.15.0",
"rollup-plugin-polyfill": "^3.0.0",
"ts-jest": "^26.3.0",
"rollup-plugin-typescript2": "^0.27.2",
"styled-components": "4.4.1",
"ts-jest": "^26.3.0",
"tslib": "^2.0.1",
"typescript": "^4.0.2"
},
Expand Down
20 changes: 0 additions & 20 deletions libraries/core-react/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 1 addition & 13 deletions libraries/core-react/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,7 @@ export default [
babelHelpers: 'bundled',
presets: ['@babel/preset-env', '@babel/preset-react'],
extensions,
plugins: [
'babel-plugin-styled-components',
...(buildForStorybook
? [
[
'babel-plugin-react-docgen-typescript',
{
skipPropsWithName: ['ref', 'key', 'className'],
},
],
]
: []),
],
plugins: ['babel-plugin-styled-components'],
}),
commonjs(),
polyfill(['focus-visible']),
Expand Down
2 changes: 1 addition & 1 deletion libraries/core-react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"include": ["./src"],
"include": ["./src/**/*.ts*"],
"exclude": ["node_modules"]
}
5 changes: 3 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"compilerOptions": {
/* do we really understand the implications of these settings? 🙄 */
"target": "es5",
"target": "ES2015",
"module": "esnext",
"lib": ["dom", "es2015"],
"lib": ["dom", "ES2015"],
"moduleResolution": "node",
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
"sourceMap": false,
"allowJs": true,
"checkJs": true,
Expand Down

0 comments on commit 7677cd4

Please sign in to comment.