Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let isTestFile = filename =>
module.exports = api => {
api.cache(true)
return {
presets: ['babel-preset-emotion-dev'],
presets: ['babel-preset-emotion-dev', '@babel/preset-typescript'],
overrides: [
{
test: filename =>
Expand Down
35 changes: 21 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@
],
"eslintConfig": {
"extends": [
"standard",
"standard-react",
"prettier"
"prettier",
"plugin:@typescript-eslint/eslint-recommended"
],
"plugins": [
"prettier",
"@emotion"
"@emotion",
"react",
"@typescript-eslint"
],
"parser": "babel-eslint",
"parser": "@typescript-eslint/parser",
"rules": {
"camelcase": 0,
"no-template-curly-in-string": 0,
"prefer-const": 0,
"no-unused-vars": 0,
"import/no-duplicates": 0,
"prettier/prettier": [
"error",
{
Expand All @@ -75,7 +75,6 @@
"react/no-unused-prop-types": 0,
"react/prop-types": 0,
"react/react-in-jsx-scope": 0,
"standard/computed-property-even-spacing": 0,
"@emotion/pkg-renaming": 2
},
"env": {
Expand All @@ -93,11 +92,19 @@
},
{
"files": [
"**/packages/*/src/*",
"**/packages/*/src/**/*"
"**/packages/**/*.ts",
"**/packages/**/*.tsx"
],
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
"import/no-commonjs": 2
"prettier/prettier": [
"error",
{
"parser": "typescript"
}
]
}
},
{
Expand Down Expand Up @@ -179,6 +186,7 @@
"@babel/plugin-transform-react-jsx": "^7.12.17",
"@babel/preset-env": "^7.13.10",
"@babel/preset-react": "^7.12.13",
"@babel/preset-typescript": "^7.13.0",
"@babel/register": "^7.13.8",
"@babel/runtime": "^7.13.10",
"@changesets/changelog-github": "^0.4.0",
Expand All @@ -191,6 +199,8 @@
"@types/jest": "^26.0.14",
"@types/node": "^10.11.4",
"@types/react": "^16.9.11",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"babel-check-duplicated-nodes": "^1.0.0",
"babel-eslint": "^10.1.0",
"babel-jest": "^26.3.0",
Expand All @@ -212,15 +222,11 @@
"eslint": "^7.10.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-react": "^1.1.7",
"eslint-config-standard": "^14.1.1",
"eslint-config-standard-react": "^9.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.21.3",
"eslint-plugin-react-hooks": "^4.1.2",
"eslint-plugin-standard": "^4.0.1",
"html-tag-names": "^1.1.2",
"husky": "^3.0.9",
"jest": "^26.4.2",
Expand Down Expand Up @@ -254,6 +260,7 @@
"react-test-renderer": "16.8.6",
"svg-tag-names": "^1.1.1",
"through": "^2.3.8",
"typescript": "^4.2.4",
"unified": "^6.1.6",
"unist-util-visit": "^1.2.0",
"webpack-bundle-analyzer": "3.3.2",
Expand Down
4 changes: 4 additions & 0 deletions packages/babel-plugin-jsx-pragmatic/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/babel-plugin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/babel-preset-css-prop/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't leave a comment on the diff but packages/babel-plugin-jsx-pragmatic/tsconfig.json being empty looks to be the cause for the Flow CI issue.

"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/cache/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/css/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/eslint-plugin/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/hash/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
1 change: 0 additions & 1 deletion packages/is-prop-valid/src/props.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ const props = {
class: true,
autofocus: true
}
// eslint-disable-next-line import/no-commonjs
module.exports = `/^((${Object.keys(props).join(
'|'
)})|(([Dd][Aa][Tt][Aa]|[Aa][Rr][Ii][Aa]|x)-.*))$/`
4 changes: 4 additions & 0 deletions packages/is-prop-valid/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/jest/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/memoize/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/native/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/primitives-core/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/primitives/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
5 changes: 5 additions & 0 deletions packages/react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"extends": "../../tsconfig.json",
"include": ["src"],
"exclude": ["./types/css-prop.d.ts"]
}
4 changes: 4 additions & 0 deletions packages/serialize/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/sheet/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/styled/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/unitless/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions packages/weak-memoize/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions scripts/benchmarks/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
4 changes: 4 additions & 0 deletions scripts/test-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"extends": "../../tsconfig.json",
"include": ["src"]
}
1 change: 0 additions & 1 deletion site/src/components/live/compiler.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// eslint-disable-next-line import/no-webpack-loader-syntax
import BabelWorker from 'worker-loader!./worker'

let worker
Expand Down
3 changes: 3 additions & 0 deletions site/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.json"
}
15 changes: 15 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"compilerOptions": {
"forceConsistentCasingInFileNames": true,
"isolatedModules": true,
"jsx": "react",
"lib": ["es6", "dom"],
"module": "commonjs",
"noEmit": true,
"skipDefaultLibCheck": true,
"strict": true,
"target": "es5"
},
"include": ["packages", "scripts", "site", "test", "playgrounds"],
"exclude": ["node_modules", "packages/*/types/test/*"]
}
Loading