diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 4a2a7f5a6ce..d107ca084d0 100644 --- a/experimental/packages/exporter-trace-otlp-http/package.json +++ b/experimental/packages/exporter-trace-otlp-http/package.json @@ -15,8 +15,8 @@ }, "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", @@ -25,7 +25,7 @@ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../../scripts/peer-api-check.js", diff --git a/experimental/packages/exporter-trace-otlp-http/tsconfig.all.json b/experimental/packages/exporter-trace-otlp-http/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/exporter-trace-otlp-http/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/exporter-trace-otlp-http/tsconfig.default.json b/experimental/packages/exporter-trace-otlp-http/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/exporter-trace-otlp-http/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/exporter-trace-otlp-http/tsconfig.json b/experimental/packages/exporter-trace-otlp-http/tsconfig.json index 087c804079c..ba92048690b 100644 --- a/experimental/packages/exporter-trace-otlp-http/tsconfig.json +++ b/experimental/packages/exporter-trace-otlp-http/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json index fdc8f762201..89ce9ecea13 100644 --- a/experimental/packages/opentelemetry-api-metrics/package.json +++ b/experimental/packages/opentelemetry-api-metrics/package.json @@ -15,8 +15,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", "test:browser": "nyc karma start --single-run", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", @@ -25,7 +25,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.default.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.docs.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.docs.json deleted file mode 100644 index 627fa3ff3e5..00000000000 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.docs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts" - ], - "typedocOptions": { - "name": "OpenTelemetry API for JavaScript", - "out": "docs/out", - "mode": "file", - "hideGenerator": true - } -} diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.json index ed9d0830bdd..2ed5fd1841c 100644 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.json +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.json @@ -1,11 +1,15 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" + "files": [], + "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, ] } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index bd77d96d2ce..301be2727f3 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -15,8 +15,8 @@ }, "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", @@ -25,7 +25,7 @@ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../../scripts/peer-api-check.js", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.default.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json index 132af2033a1..0c1e9f138aa 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index f65a0c66151..33faf1b6bcd 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -9,15 +9,15 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "version": "node ../../../scripts/version-update.js", "tdd": "karma start", "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", "peer-api-check": "node ../../../scripts/peer-api-check.js" diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.default.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.default.json new file mode 100644 index 00000000000..c88349e8e39 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.default.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json index 6bbf1dbea54..379f547a469 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esm.json" - } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json index 1289248d952..cb78dd6ff39 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esnext.json" - } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json index b228a2080af..df578bf698b 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -1,15 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-context-zone" }, diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index e8b38a23325..0563b2100c9 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -9,15 +9,15 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "version": "node ../../../scripts/version-update.js", "tdd": "karma start", "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", "peer-api-check": "node ../../../scripts/peer-api-check.js" diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.default.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.default.json new file mode 100644 index 00000000000..c88349e8e39 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.default.json @@ -0,0 +1,12 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json index 6bbf1dbea54..379f547a469 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esm.json" - } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json index 1289248d952..cb78dd6ff39 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esnext.json" - } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json index b228a2080af..df578bf698b 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -1,15 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-context-zone" }, diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index b448b1f7726..4db7116af66 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -38,8 +38,8 @@ ], "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "lint": "eslint . --ext .ts", @@ -50,7 +50,7 @@ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", "peer-api-check": "node ../../../scripts/peer-api-check.js" diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.default.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json index 5b297a614a0..cb78dd6ff39 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics/tsconfig.esnext.json" - } ] } diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.json index 948abef3ceb..a0c1d2b87ca 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-api-metrics" } diff --git a/experimental/packages/opentelemetry-sdk-metrics/package.json b/experimental/packages/opentelemetry-sdk-metrics/package.json index 1ac68ec4713..a5234375e07 100644 --- a/experimental/packages/opentelemetry-sdk-metrics/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics/package.json @@ -9,8 +9,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run test -- --watch-extensions ts --watch", @@ -19,7 +19,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "node ../../../scripts/version-update.js", "peer-api-check": "node ../../../scripts/peer-api-check.js" diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.all.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.default.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json index 53f9deefd02..379f547a469 100644 --- a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics/tsconfig.esm.json" - } ] } diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json index 5b297a614a0..cb78dd6ff39 100644 --- a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json +++ b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics/tsconfig.esnext.json" - } ] } diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json index 53d44a09df6..2483b8783c7 100644 --- a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 17f8920fada..68316d06b81 100644 --- a/experimental/packages/otlp-exporter-base/package.json +++ b/experimental/packages/otlp-exporter-base/package.json @@ -15,8 +15,8 @@ }, "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../", "lint": "eslint . --ext .ts", @@ -26,7 +26,7 @@ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile" }, diff --git a/experimental/packages/otlp-exporter-base/tsconfig.all.json b/experimental/packages/otlp-exporter-base/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/otlp-exporter-base/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/otlp-exporter-base/tsconfig.default.json b/experimental/packages/otlp-exporter-base/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/otlp-exporter-base/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/otlp-exporter-base/tsconfig.json b/experimental/packages/otlp-exporter-base/tsconfig.json index 3e284c16fce..041ec2d00e5 100644 --- a/experimental/packages/otlp-exporter-base/tsconfig.json +++ b/experimental/packages/otlp-exporter-base/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-core" } diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index d87efda4ed7..db735f46757 100644 --- a/experimental/packages/otlp-transformer/package.json +++ b/experimental/packages/otlp-transformer/package.json @@ -13,14 +13,14 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", "test:browser": "nyc karma start --single-run", - "watch": "tsc --build -w tsconfig.all.json", + "watch": "tsc --build -w tsconfig.json", "peer-api-check": "node ../../../scripts/peer-api-check.js", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../" }, diff --git a/experimental/packages/otlp-transformer/tsconfig.all.json b/experimental/packages/otlp-transformer/tsconfig.all.json deleted file mode 100644 index 06c54913342..00000000000 --- a/experimental/packages/otlp-transformer/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/experimental/packages/otlp-transformer/tsconfig.default.json b/experimental/packages/otlp-transformer/tsconfig.default.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/otlp-transformer/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/experimental/packages/otlp-transformer/tsconfig.json b/experimental/packages/otlp-transformer/tsconfig.json index a396bcb48fa..4d5f1f6f018 100644 --- a/experimental/packages/otlp-transformer/tsconfig.json +++ b/experimental/packages/otlp-transformer/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../../../packages/opentelemetry-core" }, diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 827b3e869b1..fce44049f5d 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -9,15 +9,15 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", "tdd": "karma start", "test:browser": "nyc karma start --single-run", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.default.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.default.json new file mode 100644 index 00000000000..479d4bc0d2e --- /dev/null +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.default.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.json index 479d4bc0d2e..780021078e7 100644 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.json +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.json @@ -1,15 +1,15 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], - "include": [ - "src/**/*.ts", - "test/**/*.ts" + "files": [], + "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, ] } diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index bac9ce7f4c4..880aa17d993 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -9,12 +9,12 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-context-zone/tsconfig.all.json b/packages/opentelemetry-context-zone/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-context-zone/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-context-zone/tsconfig.default.json b/packages/opentelemetry-context-zone/tsconfig.default.json new file mode 100644 index 00000000000..479d4bc0d2e --- /dev/null +++ b/packages/opentelemetry-context-zone/tsconfig.default.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-context-zone/tsconfig.esm.json b/packages/opentelemetry-context-zone/tsconfig.esm.json index ffc5a7aac23..a94adff6aa8 100644 --- a/packages/opentelemetry-context-zone/tsconfig.esm.json +++ b/packages/opentelemetry-context-zone/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-context-zone/tsconfig.esnext.json b/packages/opentelemetry-context-zone/tsconfig.esnext.json index 65674b8c676..65a918cf6bb 100644 --- a/packages/opentelemetry-context-zone/tsconfig.esnext.json +++ b/packages/opentelemetry-context-zone/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-context-zone/tsconfig.json b/packages/opentelemetry-context-zone/tsconfig.json index e714c6958f5..a376a71fc52 100644 --- a/packages/opentelemetry-context-zone/tsconfig.json +++ b/packages/opentelemetry-context-zone/tsconfig.json @@ -1,18 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "files": [ - "node_modules/zone.js/dist/zone.js.d.ts" - ], - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-context-zone-peer-dep" } diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index a5cd6192272..7fc64787cf7 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -15,8 +15,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts --exclude 'test/platform/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", @@ -27,7 +27,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-core/tsconfig.all.json b/packages/opentelemetry-core/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-core/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-core/tsconfig.default.json b/packages/opentelemetry-core/tsconfig.default.json new file mode 100644 index 00000000000..bdc94d22137 --- /dev/null +++ b/packages/opentelemetry-core/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-core/tsconfig.esm.json b/packages/opentelemetry-core/tsconfig.esm.json index 0b6bbbb13d8..a94adff6aa8 100644 --- a/packages/opentelemetry-core/tsconfig.esm.json +++ b/packages/opentelemetry-core/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-core/tsconfig.esnext.json b/packages/opentelemetry-core/tsconfig.esnext.json index 3931d37fb61..65a918cf6bb 100644 --- a/packages/opentelemetry-core/tsconfig.esnext.json +++ b/packages/opentelemetry-core/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-core/tsconfig.json b/packages/opentelemetry-core/tsconfig.json index 0717beecbfb..ec083a00065 100644 --- a/packages/opentelemetry-core/tsconfig.json +++ b/packages/opentelemetry-core/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-semantic-conventions" } diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 845aed0df78..fef2245582e 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -15,8 +15,8 @@ }, "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "lint": "eslint . --ext .ts", @@ -25,7 +25,7 @@ "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.all.json b/packages/opentelemetry-exporter-zipkin/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.default.json b/packages/opentelemetry-exporter-zipkin/tsconfig.default.json new file mode 100644 index 00000000000..bdc94d22137 --- /dev/null +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json index 812ff19a365..a94adff6aa8 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esm.json @@ -7,19 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json index a8750d0b62e..65a918cf6bb 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json @@ -7,19 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.json b/packages/opentelemetry-exporter-zipkin/tsconfig.json index 8b45d214a9a..19d7800b126 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-core" }, diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 805637b7d05..42b85b3c1b4 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -9,14 +9,14 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-propagator-b3/tsconfig.all.json b/packages/opentelemetry-propagator-b3/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-propagator-b3/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.default.json b/packages/opentelemetry-propagator-b3/tsconfig.default.json new file mode 100644 index 00000000000..bdc94d22137 --- /dev/null +++ b/packages/opentelemetry-propagator-b3/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esm.json b/packages/opentelemetry-propagator-b3/tsconfig.esm.json index c809d9c9aaf..a94adff6aa8 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.esm.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esnext.json b/packages/opentelemetry-propagator-b3/tsconfig.esnext.json index 14b360b6535..65a918cf6bb 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.esnext.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-propagator-b3/tsconfig.json b/packages/opentelemetry-propagator-b3/tsconfig.json index 789e61fc86b..09795e6ecd7 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-core" } diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index a7b2d39f854..3fc87184e7f 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -8,18 +8,18 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", + "compile": "tsc --build tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/index-webpack.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "clean": "tsc --build --clean tsconfig.all.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.all.json b/packages/opentelemetry-propagator-jaeger/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-propagator-jaeger/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.default.json b/packages/opentelemetry-propagator-jaeger/tsconfig.default.json new file mode 100644 index 00000000000..4078877ce62 --- /dev/null +++ b/packages/opentelemetry-propagator-jaeger/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json b/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json index c809d9c9aaf..a94adff6aa8 100644 --- a/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json +++ b/packages/opentelemetry-propagator-jaeger/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.esnext.json b/packages/opentelemetry-propagator-jaeger/tsconfig.esnext.json index 14b360b6535..65a918cf6bb 100644 --- a/packages/opentelemetry-propagator-jaeger/tsconfig.esnext.json +++ b/packages/opentelemetry-propagator-jaeger/tsconfig.esnext.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-propagator-jaeger/tsconfig.json b/packages/opentelemetry-propagator-jaeger/tsconfig.json index a6c0bb26171..09795e6ecd7 100644 --- a/packages/opentelemetry-propagator-jaeger/tsconfig.json +++ b/packages/opentelemetry-propagator-jaeger/tsconfig.json @@ -1,14 +1,16 @@ { - "extends": "../../tsconfig.base", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "extends": "../../tsconfig.base.json", + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-core" } diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 4eded5097f2..1c0f69eeb81 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -15,8 +15,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "lint": "eslint . --ext .ts", diff --git a/packages/opentelemetry-resources/tsconfig.all.json b/packages/opentelemetry-resources/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-resources/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-resources/tsconfig.default.json b/packages/opentelemetry-resources/tsconfig.default.json new file mode 100644 index 00000000000..bdc94d22137 --- /dev/null +++ b/packages/opentelemetry-resources/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-resources/tsconfig.esm.json b/packages/opentelemetry-resources/tsconfig.esm.json index aa276f4b435..a94adff6aa8 100644 --- a/packages/opentelemetry-resources/tsconfig.esm.json +++ b/packages/opentelemetry-resources/tsconfig.esm.json @@ -7,13 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-resources/tsconfig.esnext.json b/packages/opentelemetry-resources/tsconfig.esnext.json index 458395ca173..65a918cf6bb 100644 --- a/packages/opentelemetry-resources/tsconfig.esnext.json +++ b/packages/opentelemetry-resources/tsconfig.esnext.json @@ -7,13 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-resources/tsconfig.json b/packages/opentelemetry-resources/tsconfig.json index 51dcc3ed88e..85ff3663ca6 100644 --- a/packages/opentelemetry-resources/tsconfig.json +++ b/packages/opentelemetry-resources/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-core" }, diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index d81cbfb9cc4..5bb851aad9e 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -15,8 +15,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "test:webworker": "nyc karma start karma.worker.js --single-run", @@ -28,7 +28,7 @@ "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "codecov:webworker": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.all.json b/packages/opentelemetry-sdk-trace-base/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.default.json b/packages/opentelemetry-sdk-trace-base/tsconfig.default.json new file mode 100644 index 00000000000..bdc94d22137 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json index 5f0156d6611..a94adff6aa8 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esm.json @@ -7,16 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json index 09baee3e800..65a918cf6bb 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json @@ -7,16 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.json b/packages/opentelemetry-sdk-trace-base/tsconfig.json index b16c7037b42..84d557ea045 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.json @@ -1,14 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-core" }, diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 421283f0d17..4a6d3dab56d 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -9,8 +9,8 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", @@ -19,7 +19,7 @@ "tdd": "karma start", "test:browser": "nyc karma start --single-run", "test:webworker": "nyc karma start karma.worker.js --single-run", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.all.json b/packages/opentelemetry-sdk-trace-web/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.default.json b/packages/opentelemetry-sdk-trace-web/tsconfig.default.json new file mode 100644 index 00000000000..a2847b6a1e1 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.default.json @@ -0,0 +1,12 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json index 57e4813bbdc..a94adff6aa8 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esm.json @@ -7,25 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-propagator-b3/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm.json" - } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json index 0dd807e8669..65a918cf6bb 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json @@ -7,25 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-core/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-propagator-b3/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esnext.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" - } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.json b/packages/opentelemetry-sdk-trace-web/tsconfig.json index f317cb38d10..2f2096483a2 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.json @@ -1,15 +1,16 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + }, { "path": "../opentelemetry-context-zone" }, diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 82554158ae8..58d846f826c 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -9,12 +9,12 @@ "repository": "open-telemetry/opentelemetry-js", "scripts": { "prepublishOnly": "npm run compile", - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.all.json", + "watch": "tsc --build --watch tsconfig.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies", "prewatch": "npm run precompile", "peer-api-check": "node ../../scripts/peer-api-check.js" diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.all.json b/packages/opentelemetry-semantic-conventions/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/opentelemetry-semantic-conventions/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.default.json b/packages/opentelemetry-semantic-conventions/tsconfig.default.json new file mode 100644 index 00000000000..6eb4162cd32 --- /dev/null +++ b/packages/opentelemetry-semantic-conventions/tsconfig.default.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.json b/packages/opentelemetry-semantic-conventions/tsconfig.json index a388bb16f97..73b5d4c4018 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.json +++ b/packages/opentelemetry-semantic-conventions/tsconfig.json @@ -1,8 +1,9 @@ { - "extends": "../../tsconfig.es5.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": ["src/**/*.ts", "test/**/*.ts"] + "extends": "../../tsconfig.base.json", + "files": [], + "references": [ + { "path": "./tsconfig.default.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esnext.json" } + ] } diff --git a/packages/template/package.json b/packages/template/package.json index be638a87420..f3334a0b3de 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -45,11 +45,11 @@ "watch": "tsc --build --watch" }, "Add/change these to scripts if browser is supported": { - "compile": "tsc --build tsconfig.all.json", - "clean": "tsc --build --clean tsconfig.all.json", + "compile": "tsc --build tsconfig.json", + "clean": "tsc --build --clean tsconfig.json", "test:browser": "nyc karma start --single-run", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", - "watch": "tsc --build --watch tsconfig.all.json" + "watch": "tsc --build --watch tsconfig.json" }, "keywords": [ "opentelemetry", diff --git a/packages/template/tsconfig.all.json b/packages/template/tsconfig.all.json deleted file mode 100644 index 4d28a993d3e..00000000000 --- a/packages/template/tsconfig.all.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "files": [], - "references": [ - { "path": "./tsconfig.json" }, - { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esnext.json" } - ] -} diff --git a/packages/template/tsconfig.default.json b/packages/template/tsconfig.default.json new file mode 100644 index 00000000000..4ffdbb48ce6 --- /dev/null +++ b/packages/template/tsconfig.default.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + ] +} diff --git a/packages/template/tsconfig.json b/packages/template/tsconfig.json index 4ffdbb48ce6..92b00d512e7 100644 --- a/packages/template/tsconfig.json +++ b/packages/template/tsconfig.json @@ -1,13 +1,15 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ + { + "path": "./tsconfig.default.json" + }, + { + "path": "./tsconfig.esm.json" + }, + { + "path": "./tsconfig.esnext.json" + } ] }