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

superset-frontend/temporary_superset_ui/superset-ui/packages/generator-superset/generators/plugin-chart/templates/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/packages/generator-superset/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-chart-controls/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-core/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/packages/superset-ui-core/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-country-map/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-event-flow/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sunburst/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-time-table/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-big-number/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-echarts/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-pivot-table/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-table/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/plugin-chart-word-cloud/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/plugins/preset-chart-xy/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/test/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/temporary-plugins/plugin-chart-choropleth-map/tsconfig.json

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

superset-frontend/temporary_superset_ui/superset-ui/tsconfig.eslint.json

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

superset-frontend/temporary_superset_ui/superset-ui/tsconfig.json

@@ -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"
 }

superset-frontend/temporary_superset_ui/superset-ui/tsconfig.options.json

@@ -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"
-    ]
-  }
-}