From d6e812958829693786095404084ebeae7140e079 Mon Sep 17 00:00:00 2001 From: Tobias Skarhed Date: Wed, 10 Jul 2019 12:50:52 +0200 Subject: [PATCH] Packages: create shared tsconfig.json (#18010) --- packages/grafana-data/tsconfig.json | 14 +++----------- packages/grafana-runtime/tsconfig.json | 14 +++----------- .../grafana-toolkit/src/cli/tasks/changelog.ts | 1 - .../grafana-toolkit/src/cli/tasks/plugin.build.ts | 2 -- .../grafana-toolkit/src/cli/tasks/plugin.ci.ts | 1 - .../grafana-toolkit/src/cli/tasks/plugin/bundle.ts | 2 -- .../grafana-toolkit/src/cli/tasks/plugin/tests.ts | 1 - .../src/cli/tasks/searchTestDataSetup.ts | 1 - .../grafana-toolkit/src/cli/tasks/toolkit.build.ts | 2 +- .../src/config/webpack.plugin.config.ts | 3 ++- .../src/config/webpack/loaders.test.ts | 1 - .../grafana-toolkit/src/config/webpack/loaders.ts | 3 --- packages/grafana-toolkit/tsconfig.json | 8 ++------ packages/grafana-ui/tsconfig.json | 14 +++----------- packages/tsconfig.json | 13 +++++++++++++ 15 files changed, 27 insertions(+), 53 deletions(-) create mode 100644 packages/tsconfig.json diff --git a/packages/grafana-data/tsconfig.json b/packages/grafana-data/tsconfig.json index dcc4fd97436..a7d3e870c45 100644 --- a/packages/grafana-data/tsconfig.json +++ b/packages/grafana-data/tsconfig.json @@ -1,19 +1,11 @@ { - "extends": "../../tsconfig.json", + "extends": "../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx", "../../public/app/types/jquery/*.ts"], "exclude": ["dist", "node_modules"], "compilerOptions": { "rootDirs": ["."], - "module": "esnext", - "outDir": "compiled", - "declaration": true, - "declarationDir": "dist", - "strict": true, - "alwaysStrict": true, - "noImplicitAny": true, - "strictNullChecks": true, "typeRoots": ["./node_modules/@types", "types"], - "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors, - "removeComments": false + "declarationDir": "dist", + "outDir": "compiled" } } diff --git a/packages/grafana-runtime/tsconfig.json b/packages/grafana-runtime/tsconfig.json index dcc4fd97436..a7d3e870c45 100644 --- a/packages/grafana-runtime/tsconfig.json +++ b/packages/grafana-runtime/tsconfig.json @@ -1,19 +1,11 @@ { - "extends": "../../tsconfig.json", + "extends": "../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx", "../../public/app/types/jquery/*.ts"], "exclude": ["dist", "node_modules"], "compilerOptions": { "rootDirs": ["."], - "module": "esnext", - "outDir": "compiled", - "declaration": true, - "declarationDir": "dist", - "strict": true, - "alwaysStrict": true, - "noImplicitAny": true, - "strictNullChecks": true, "typeRoots": ["./node_modules/@types", "types"], - "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors, - "removeComments": false + "declarationDir": "dist", + "outDir": "compiled" } } diff --git a/packages/grafana-toolkit/src/cli/tasks/changelog.ts b/packages/grafana-toolkit/src/cli/tasks/changelog.ts index 004ea46603a..36649d8e718 100644 --- a/packages/grafana-toolkit/src/cli/tasks/changelog.ts +++ b/packages/grafana-toolkit/src/cli/tasks/changelog.ts @@ -1,4 +1,3 @@ -import axios from 'axios'; // @ts-ignore import * as _ from 'lodash'; import { Task, TaskRunner } from './task'; diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts index 40b4e946e5a..0266b308a84 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.build.ts @@ -4,7 +4,6 @@ import execa = require('execa'); import path = require('path'); import fs = require('fs'); import glob = require('glob'); -import util = require('util'); import { Linter, Configuration, RuleFailure } from 'tslint'; import * as prettier from 'prettier'; @@ -17,7 +16,6 @@ interface PluginBuildOptions { export const bundlePlugin = useSpinner('Compiling...', async options => await bundleFn(options)); -const readFileAsync = util.promisify(fs.readFile); // @ts-ignore export const clean = useSpinner('Cleaning', async () => await execa('rimraf', [`${process.cwd()}/dist`])); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts index 9a5834de9dc..c9ce6db4e65 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin.ci.ts @@ -1,6 +1,5 @@ import { Task, TaskRunner } from './task'; import { pluginBuildRunner } from './plugin.build'; -import { useSpinner } from '../utils/useSpinner'; import { restoreCwd } from '../utils/cwd'; import { getPluginJson } from '../../config/utils/pluginValidation'; diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts index b6ba6d9bda0..a5fb1d37a74 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin/bundle.ts @@ -1,5 +1,3 @@ -import path = require('path'); -import fs = require('fs'); import webpack = require('webpack'); import { getWebpackConfig } from '../../../config/webpack.plugin.config'; import formatWebpackMessages = require('react-dev-utils/formatWebpackMessages'); diff --git a/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts b/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts index eba45d6c24a..a5926b9f4b4 100644 --- a/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts +++ b/packages/grafana-toolkit/src/cli/tasks/plugin/tests.ts @@ -1,4 +1,3 @@ -import path = require('path'); import * as jestCLI from 'jest-cli'; import { useSpinner } from '../../utils/useSpinner'; import { jestConfig } from '../../../config/jest.plugin.config'; diff --git a/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts b/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts index 915f431a957..0e051dc2dff 100644 --- a/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts +++ b/packages/grafana-toolkit/src/cli/tasks/searchTestDataSetup.ts @@ -46,7 +46,6 @@ export async function getTeam(team: any): Promise { } export async function addToTeam(team: any, user: any): Promise { - const members = await client.get(`/teams/${team.id}/members`); console.log(`Adding user ${user.name} to team ${team.name}`); await client.post(`/teams/${team.id}/members`, { userId: user.id }); } diff --git a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts index 0bee4054994..f76ea28e7d4 100644 --- a/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts +++ b/packages/grafana-toolkit/src/cli/tasks/toolkit.build.ts @@ -1,6 +1,6 @@ import execa = require('execa'); import * as fs from 'fs'; -import { changeCwdToGrafanaUi, restoreCwd, changeCwdToGrafanaToolkit } from '../utils/cwd'; +import { restoreCwd, changeCwdToGrafanaToolkit } from '../utils/cwd'; import chalk from 'chalk'; import { useSpinner } from '../utils/useSpinner'; import { Task, TaskRunner } from './task'; diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts index 8d1c6bde235..5e48b2d3a66 100644 --- a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts +++ b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts @@ -7,7 +7,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); import * as webpack from 'webpack'; -import { hasThemeStylesheets, getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders'; +import { getStyleLoaders, getStylesheetEntries, getFileLoaders } from './webpack/loaders'; interface WebpackConfigurationOptions { watch?: boolean; @@ -51,6 +51,7 @@ const getManualChunk = (id: string) => { }; } } + return null; }; const getEntries = () => { diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.test.ts b/packages/grafana-toolkit/src/config/webpack/loaders.test.ts index af30c990ffe..58913d20c1a 100644 --- a/packages/grafana-toolkit/src/config/webpack/loaders.test.ts +++ b/packages/grafana-toolkit/src/config/webpack/loaders.test.ts @@ -3,7 +3,6 @@ import { getStylesheetEntries, hasThemeStylesheets } from './loaders'; describe('Loaders', () => { describe('stylesheet helpers', () => { const logSpy = jest.spyOn(console, 'log').mockImplementation(); - const errorSpy = jest.spyOn(console, 'error').mockImplementation(); afterAll(() => { logSpy.mockRestore(); diff --git a/packages/grafana-toolkit/src/config/webpack/loaders.ts b/packages/grafana-toolkit/src/config/webpack/loaders.ts index 30941f7972e..aab0846b45d 100644 --- a/packages/grafana-toolkit/src/config/webpack/loaders.ts +++ b/packages/grafana-toolkit/src/config/webpack/loaders.ts @@ -1,6 +1,3 @@ -import { getPluginJson } from '../utils/pluginValidation'; - -const path = require('path'); const fs = require('fs'); const MiniCssExtractPlugin = require('mini-css-extract-plugin'); diff --git a/packages/grafana-toolkit/tsconfig.json b/packages/grafana-toolkit/tsconfig.json index 28b734aa9cd..d7c48a886b9 100644 --- a/packages/grafana-toolkit/tsconfig.json +++ b/packages/grafana-toolkit/tsconfig.json @@ -1,17 +1,13 @@ { + "extends": "../tsconfig.json", "include": ["src/**/*.ts"], "exclude": ["dist", "node_modules"], "compilerOptions": { "module": "commonjs", "rootDirs": ["."], "outDir": "dist/src", - "strict": true, - "alwaysStrict": true, - "noImplicitAny": true, - "strictNullChecks": true, + "declaration": false, "typeRoots": ["./node_modules/@types"], - "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors, - "removeComments": false, "esModuleInterop": true, "lib": ["es2015", "es2017.string"] } diff --git a/packages/grafana-ui/tsconfig.json b/packages/grafana-ui/tsconfig.json index 0089f89d194..d6dbfc1e0b7 100644 --- a/packages/grafana-ui/tsconfig.json +++ b/packages/grafana-ui/tsconfig.json @@ -1,19 +1,11 @@ { - "extends": "../../tsconfig.json", + "extends": "../tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["dist", "node_modules"], "compilerOptions": { "rootDirs": [".", "stories"], - "module": "esnext", - "outDir": "compiled", - "declaration": true, - "declarationDir": "dist", - "strict": true, - "alwaysStrict": true, - "noImplicitAny": true, - "strictNullChecks": true, "typeRoots": ["./node_modules/@types", "types"], - "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors, - "removeComments": false + "declarationDir": "dist", + "outDir": "compiled" } } diff --git a/packages/tsconfig.json b/packages/tsconfig.json new file mode 100644 index 00000000000..a82659b1e37 --- /dev/null +++ b/packages/tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "module": "esnext", + "declaration": true, + "strict": true, + "alwaysStrict": true, + "noImplicitAny": true, + "strictNullChecks": true, + "skipLibCheck": true, // Temp workaround for Duplicate identifier tsc errors, + "removeComments": false + } +}