Skip to content

Commit

Permalink
TypeScript project references for APM
Browse files Browse the repository at this point in the history
  • Loading branch information
smith committed Feb 2, 2021
1 parent 2dcf39e commit 52e8bab
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 216 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ npm-debug.log*
.ci/bash_standard_lib.sh
.gradle

# apm plugin
/x-pack/plugins/apm/tsconfig.json
apm.tsconfig.json
## @cypress/snapshot from apm plugin
snapshots.js

Expand Down
11 changes: 0 additions & 11 deletions x-pack/plugins/apm/dev_docs/typescript.md

This file was deleted.

17 changes: 7 additions & 10 deletions x-pack/plugins/apm/kibana.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,16 @@
],
"server": true,
"ui": true,
"configPath": [
"xpack",
"apm"
],
"extraPublicDirs": [
"public/style/variables"
],
"configPath": ["xpack", "apm"],
"extraPublicDirs": ["public/style/variables"],
"requiredBundles": [
"home",
"index_pattern_management",
"kibanaReact",
"kibanaUtils",
"observability",
"home",
"maps",
"ml"
"ml",
"observability",
"reporting"
]
}
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ _Note: Run the following commands from `kibana/`._
### Typescript

```
yarn tsc --noEmit --project x-pack/tsconfig.json --skipLibCheck
yarn tsc --noEmit --project x-pack/plugins/apm/tsconfig.json --skipLibCheck
```

### Prettier
Expand Down
12 changes: 0 additions & 12 deletions x-pack/plugins/apm/scripts/optimize-tsconfig.js

This file was deleted.

90 changes: 0 additions & 90 deletions x-pack/plugins/apm/scripts/optimize-tsconfig/optimize.js

This file was deleted.

24 changes: 0 additions & 24 deletions x-pack/plugins/apm/scripts/optimize-tsconfig/paths.js

This file was deleted.

15 changes: 0 additions & 15 deletions x-pack/plugins/apm/scripts/optimize-tsconfig/tsconfig.json

This file was deleted.

25 changes: 0 additions & 25 deletions x-pack/plugins/apm/scripts/optimize-tsconfig/unoptimize.js

This file was deleted.

13 changes: 0 additions & 13 deletions x-pack/plugins/apm/scripts/tsconfig.json

This file was deleted.

12 changes: 0 additions & 12 deletions x-pack/plugins/apm/scripts/unoptimize-tsconfig.js

This file was deleted.

45 changes: 45 additions & 0 deletions x-pack/plugins/apm/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"composite": true,
"outDir": "./target/types",
"emitDeclarationOnly": true,
"declaration": true,
"declarationMap": true
},
"include": [
"../../typings/**/*",
"common/**/*",
"public/**/*",
"scripts/**/*",
"server/**/*",
"typings/**/*",
// have to declare *.json explicitly due to https://github.com/microsoft/TypeScript/issues/25636
"public/**/*.json",
"server/**/*.json"
],
"references": [
{ "path": "../../../src/core/tsconfig.json" },
{ "path": "../../../src/plugins/apm_oss/tsconfig.json" },
{ "path": "../../../src/plugins/data/tsconfig.json" },
{ "path": "../../../src/plugins/embeddable/tsconfig.json" },
{ "path": "../../../src/plugins/home/tsconfig.json" },
{ "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
{ "path": "../../../src/plugins/kibana_react/tsconfig.json" },
{ "path": "../../../src/plugins/kibana_utils/tsconfig.json" },
{ "path": "../../../src/plugins/usage_collection/tsconfig.json" },
{ "path": "../actions/tsconfig.json" },
{ "path": "../alerts/tsconfig.json" },
{ "path": "../cloud/tsconfig.json" },
{ "path": "../features/tsconfig.json" },
// { "path": "../infra/tsconfig.json" },
{ "path": "../licensing/tsconfig.json" },
{ "path": "../maps/tsconfig.json" },
// { "path": "../ml/tsconfig.json" },
{ "path": "../observability/tsconfig.json" },
{ "path": "../reporting/tsconfig.json" },
{ "path": "../security/tsconfig.json" },
{ "path": "../task_manager/tsconfig.json" },
{ "path": "../triggers_actions_ui/tsconfig.json" }
]
}
1 change: 1 addition & 0 deletions x-pack/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

{ "path": "../plugins/actions/tsconfig.json" },
{ "path": "../plugins/alerts/tsconfig.json" },
{ "path": "../plugins/apm/tsconfig.json" },
{ "path": "../plugins/code/tsconfig.json" },
{ "path": "../plugins/console_extensions/tsconfig.json" },
{ "path": "../plugins/data_enhanced/tsconfig.json" },
Expand Down
2 changes: 2 additions & 0 deletions x-pack/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"exclude": [
"plugins/actions/**/*",
"plugins/alerts/**/*",
"plugins/apm/**/*",
"plugins/apm/e2e/cypress/**/*",
"plugins/apm/ftr_e2e/**/*",
"plugins/apm/scripts/**/*",
Expand Down Expand Up @@ -92,6 +93,7 @@
{ "path": "../src/plugins/usage_collection/tsconfig.json" },
{ "path": "./plugins/actions/tsconfig.json" },
{ "path": "./plugins/alerts/tsconfig.json" },
{ "path": "./plugins/apm/tsconfig.json" },
{ "path": "./plugins/beats_management/tsconfig.json" },
{ "path": "./plugins/canvas/tsconfig.json" },
{ "path": "./plugins/cloud/tsconfig.json" },
Expand Down
1 change: 1 addition & 0 deletions x-pack/tsconfig.refs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"references": [
{ "path": "./plugins/actions/tsconfig.json" },
{ "path": "./plugins/alerts/tsconfig.json" },
{ "path": "./plugins/apm/tsconfig.json" },
{ "path": "./plugins/beats_management/tsconfig.json" },
{ "path": "./plugins/canvas/tsconfig.json" },
{ "path": "./plugins/cloud/tsconfig.json" },
Expand Down

0 comments on commit 52e8bab

Please sign in to comment.