chore: merge tsconfig.json and tsconfig.options.json (#1459)

This commit is contained in:
Yongjie Zhao 2021-11-09 10:38:44 +00:00
parent 1896c842d6
commit 0d219533b2
46 changed files with 77 additions and 80 deletions

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "../../../"
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -5,7 +5,7 @@
"noEmit": true,
"rootDir": "."
},
"extends": "../../../tsconfig.options.json",
"extends": "../../../tsconfig.json",
"include": [
"**/*",
"../types/**/*",

View File

@ -8,7 +8,7 @@
"lib",
"test"
],
"extends": "../../tsconfig.options.json",
"extends": "../../tsconfig.json",
"include": [
"src/**/*",
"types/**/*",

View File

@ -1,5 +1,5 @@
{
"extends": "./tsconfig.options.json",
"extends": "./tsconfig.json",
"include": [
"types/**/*",
"packages/*/src/**/*",

View File

@ -1,4 +1,36 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"declaration": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": false,
"jsx": "react",
"lib": [
"dom",
"esnext"
],
"module": "esnext",
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitReturns": true,
"noUnusedLocals": true,
"pretty": true,
"removeComments": false,
"strict": true,
"target": "es2015",
"useDefineForClassFields": false,
"composite": true,
"declarationMap": true,
"rootDir": ".",
"skipLibCheck": true,
"emitDeclarationOnly": true,
"resolveJsonModule": true,
"types": ["@emotion/react/types/css-prop", "jest", "jsdom"],
"typeRoots": [
"./node_modules/@types"
]
},
"files": [],
"references": [
{
@ -115,6 +147,5 @@
{
"path": "plugins/preset-chart-xy/test"
}
],
"extends": "./tsconfig.options.json"
]
}

View File

@ -1,34 +0,0 @@
{
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"declaration": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"isolatedModules": false,
"jsx": "react",
"lib": [
"dom",
"esnext"
],
"module": "esnext",
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitReturns": true,
"noUnusedLocals": true,
"pretty": true,
"removeComments": false,
"strict": true,
"target": "es2015",
"useDefineForClassFields": false,
"composite": true,
"declarationMap": true,
"rootDir": ".",
"skipLibCheck": true,
"emitDeclarationOnly": true,
"resolveJsonModule": true,
"types": ["@emotion/react/types/css-prop", "jest", "jsdom"],
"typeRoots": [
"./node_modules/@types"
]
}
}