diff --git a/api/tsconfig.all.json b/api/tsconfig.all.json deleted file mode 100644 index 4aa747e89f..0000000000 --- a/api/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/api/tsconfig.default.json b/api/tsconfig.default.json new file mode 100644 index 0000000000..a64cf98dfa --- /dev/null +++ b/api/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/api/tsconfig.json b/api/tsconfig.json index 088086278b..67a250c545 100644 --- a/api/tsconfig.json +++ b/api/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" + } ] } diff --git a/experimental/examples/prometheus/package.json b/experimental/examples/prometheus/package.json index 837fcf9b61..918f8fa14f 100644 --- a/experimental/examples/prometheus/package.json +++ b/experimental/examples/prometheus/package.json @@ -1,6 +1,7 @@ { "name": "prometheus-example", "version": "0.33.0", + "private": true, "description": "Example of using @opentelemetry/sdk-metrics and @opentelemetry/exporter-prometheus", "main": "index.js", "scripts": { diff --git a/experimental/packages/api-logs/package.json b/experimental/packages/api-logs/package.json index fe0a0cb73e..b1d43c75f2 100644 --- a/experimental/packages/api-logs/package.json +++ b/experimental/packages/api-logs/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/api-logs/tsconfig.all.json b/experimental/packages/api-logs/tsconfig.all.json deleted file mode 100644 index 06c5491334..0000000000 --- a/experimental/packages/api-logs/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/api-logs/tsconfig.default.json b/experimental/packages/api-logs/tsconfig.default.json new file mode 100644 index 0000000000..ed9d0830bd --- /dev/null +++ b/experimental/packages/api-logs/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/api-logs/tsconfig.docs.json b/experimental/packages/api-logs/tsconfig.docs.json deleted file mode 100644 index 18c131e2b9..0000000000 --- a/experimental/packages/api-logs/tsconfig.docs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts" - ], - "typedocOptions": { - "name": "OpenTelemetry Logs API for JavaScript", - "out": "docs/out", - "mode": "file", - "hideGenerator": true - } -} diff --git a/experimental/packages/api-logs/tsconfig.json b/experimental/packages/api-logs/tsconfig.json index e22548584a..f339fe0b16 100644 --- a/experimental/packages/api-logs/tsconfig.json +++ b/experimental/packages/api-logs/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": "../../../api" } diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json index 3883b148fb..47434b6a92 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 bb73fd2a34..bb33438154 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": "../../../api" }, diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json index 3629d3de90..20ca7dff47 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 627fa3ff3e..0000000000 --- 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 e22548584a..f339fe0b16 100644 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.json +++ b/experimental/packages/opentelemetry-api-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": "../../../api" } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 0740d5913e..c5661b85dd 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 1f981132ba..845c94a76d 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": "../../../api" }, diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 3e7e3336fc..820cf8b7b4 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 06c5491334..0000000000 --- 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 0000000000..c88349e8e3 --- /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 6bbf1dbea5..379f547a46 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 1289248d95..cb78dd6ff3 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 9b921df4d9..89561afb57 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": "../../../api" }, diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 40b340b5cd..ca6be933c8 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 06c5491334..0000000000 --- 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 0000000000..c88349e8e3 --- /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 6bbf1dbea5..379f547a46 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 1289248d95..cb78dd6ff3 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 9b921df4d9..89561afb57 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": "../../../api" }, diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index abc09deb23..6056a8fb0b 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 5b297a614a..cb78dd6ff3 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 af53bd1755..b0eadc47c8 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": "../../../api" }, diff --git a/experimental/packages/opentelemetry-sdk-metrics/package.json b/experimental/packages/opentelemetry-sdk-metrics/package.json index f53dc3cacf..9ee8b8380a 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 53f9deefd0..379f547a46 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 5b297a614a..cb78dd6ff3 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 c56be210db..c73fcf348c 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": "../../../api" }, diff --git a/experimental/packages/otlp-exporter-base/package.json b/experimental/packages/otlp-exporter-base/package.json index 0d6eadfb0b..20eb9b140e 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 fbb799ec14..c8759f65a8 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": "../../../api" }, diff --git a/experimental/packages/otlp-transformer/package.json b/experimental/packages/otlp-transformer/package.json index 471c94cda9..53f9a7befc 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 06c5491334..0000000000 --- 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 0000000000..ed9d0830bd --- /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 e06d7404a5..7eb1c10c93 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": "../../../api" }, diff --git a/package.json b/package.json index a83a8c46a5..22f6ae554c 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "lint:markdown": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md", "lint:markdown:fix": "./node_modules/.bin/markdownlint $(git ls-files '*.md') -i ./CHANGELOG.md --fix", "reset": "lerna clean -y && rm -rf node_modules && npm i && npm run compile && npm run lint:fix", - "update-ts-references": "update-ts-references" + "update-ts-references": "node scripts/update-ts-references.js" }, "repository": "open-telemetry/opentelemetry-js", "keywords": [ @@ -60,8 +60,7 @@ "markdownlint-cli": "0.32.2", "semver": "7.3.5", "typedoc": "0.22.10", - "typescript": "4.4.4", - "update-ts-references": "2.4.1" + "typescript": "4.4.4" }, "changelog": { "repo": "open-telemetry/opentelemetry-js", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 550f3adc63..a6ae9d1eb5 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 4d28a993d3..0000000000 --- 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 0000000000..479d4bc0d2 --- /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 da6d2b6486..c0c9dc5419 100644 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.json +++ b/packages/opentelemetry-context-zone-peer-dep/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": "../../api" } diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index acfe75bec9..13bd5cc6cb 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 4d28a993d3..0000000000 --- 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 0000000000..479d4bc0d2 --- /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 ffc5a7aac2..a94adff6aa 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 65674b8c67..65a918cf6b 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 e714c6958f..ad8f9ab75d 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 8334561f5b..973e5dd761 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /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 0b6bbbb13d..a94adff6aa 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 3931d37fb6..65a918cf6b 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 101baf4195..155480f36c 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": "../../api" }, diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index fbed197c0d..10ea566b60 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /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 812ff19a36..a94adff6aa 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 a8750d0b62..65a918cf6b 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 ce2661c050..a54c7a550d 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": "../../api" }, diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index a54d56e95e..2b238fd4f7 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /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 c809d9c9aa..a94adff6aa 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 14b360b653..65a918cf6b 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 f60209f8c4..82afcd0f1a 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": "../../api" }, diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 98aba129a6..fae16d1ab4 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 4d28a993d3..0000000000 --- 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 0000000000..4078877ce6 --- /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 c809d9c9aa..a94adff6aa 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 14b360b653..65a918cf6b 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 a942b2b6aa..f3a0da1ea9 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" - ], + "files": [], "references": [ + { + "path": "tsconfig.default.json" + }, + { + "path": "tsconfig.esm.json" + }, + { + "path": "tsconfig.esnext.json" + }, { "path": "../../api" }, diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 84cb29a7af..501873439c 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /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 aa276f4b43..a94adff6aa 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 458395ca17..65a918cf6b 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 bbd7dbbe43..e7740fc726 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": "../../api" }, diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index a062b9c4d7..1c647ec9da 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /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 5f0156d661..a94adff6aa 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 09baee3e80..65a918cf6b 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 fa14714abd..0bed89b743 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": "../../api" }, diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 65afa52b30..62b59544e8 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 4d28a993d3..0000000000 --- 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 0000000000..a2847b6a1e --- /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 57e4813bbd..a94adff6aa 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 0dd807e866..65a918cf6b 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 09ac19a176..ffcb1d7cc5 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": "../../api" }, diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index c7cbcc040b..f971e3e848 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 4d28a993d3..0000000000 --- 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 0000000000..6eb4162cd3 --- /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 a388bb16f9..5c5b2c9243 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.json +++ b/packages/opentelemetry-semantic-conventions/tsconfig.json @@ -1,8 +1,15 @@ { - "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 77493ccde3..2cb4659ae9 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 4d28a993d3..0000000000 --- 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 0000000000..bdc94d2213 --- /dev/null +++ b/packages/template/tsconfig.default.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ] +} diff --git a/packages/template/tsconfig.json b/packages/template/tsconfig.json index 4ffdbb48ce..5c5b2c9243 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" + } ] } diff --git a/scripts/update-ts-references.js b/scripts/update-ts-references.js new file mode 100644 index 0000000000..88bdab9747 --- /dev/null +++ b/scripts/update-ts-references.js @@ -0,0 +1,191 @@ +/* + * Copyright The OpenTelemetry Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const fs = require('fs'); +const path = require('path'); + +let dryRun = false; +const argv = process.argv.slice(2); +while (argv.length) { + switch (argv[0]) { + case '--dry': { + dryRun = true; + } + default: {} + } + argv.shift(); +} +updateTsReferences(); + +function updateTsReferences() { + const appRoot = process.cwd(); + const projectRoot = findProjectRoot(appRoot); + const lernaProjects = resolveLernaProjects(projectRoot); + + generateTsconfig(projectRoot, lernaProjects, appRoot, true); + for (const projMeta of lernaProjects.values()) { + generateTsconfig(projectRoot, lernaProjects, path.join(projectRoot, projMeta.dir), false); + } +} + +function generateTsconfig(projectRoot, lernaProjects, appRoot, isLernaRoot) { + const pjson = readJSON(path.join(appRoot, 'package.json')); + const tsconfigPath = path.join(appRoot, 'tsconfig.json'); + let tsconfig; + try { + tsconfig = readJSON(tsconfigPath); + } catch { + return; + } + + let newReferences + if (isLernaRoot) { + newReferences = Array.from(lernaProjects.values()) + .filter(it => it.tsProject) + .map(it => path.relative(appRoot, path.join(projectRoot, it.dir))).sort(); + } else { + const otelDependencies = getOtelDependencies(pjson); + const subTsconfigFiles = getSubTsconfigFiles(appRoot); + const dependenciesDir = resolveDependencyDirs(lernaProjects, otelDependencies); + newReferences = [ + ...subTsconfigFiles, + ...dependenciesDir.map(it => path.relative(appRoot, path.join(projectRoot, it))).sort(), + ]; + } + + tsconfig.references = newReferences.map(path => { + return { path } + }); + if (isLernaRoot) { + tsconfig.typedocOptions.entryPoints = Array.from(lernaProjects.values()) + .filter(it => !it.private && it.tsProject) + .map(it => path.relative(appRoot, path.join(projectRoot, it.dir))).sort(); + } + + writeJSON(tsconfigPath, tsconfig, dryRun); +} + +function findProjectRoot(appRoot) { + let dir; + let parent = appRoot; + do { + dir = parent; + + try { + const stat = fs.statSync(path.join(dir, 'lerna.json')); + if (stat.isFile()) { + return dir; + } + } catch (e) { + /* ignore */ + } + + parent = path.dirname(dir); + } while (dir !== parent) +} + +function getOtelDependencies(packageJson) { + const deps = new Set(); + for (const type of ['dependencies', 'peerDependencies', 'devDependencies']) { + if (packageJson[type] == null) { + continue; + } + Object.keys(packageJson[type]).filter(it => it.startsWith('@opentelemetry')) + .forEach(it => deps.add(it)) + } + return Array.from(deps.values()); +} + +function getSubTsconfigFiles(appRoot) { + const files = fs.readdirSync(appRoot); + return files.filter(it => it.startsWith('tsconfig') && it !== 'tsconfig.json'); +} + +function resolveLernaProjects(projectRoot) { + const map = new Map(); + const lernaJson = readJSON(`${projectRoot}/lerna.json`); + for (const pkgDefinition of lernaJson.packages) { + if (pkgDefinition.endsWith('*')) { + const relDir = path.dirname(pkgDefinition) + const pkgs = fs.readdirSync(path.join(projectRoot, relDir)).filter(it => !it.startsWith('.')); + for (const pkg of pkgs) { + const pkgDir = path.join(relDir, pkg); + const meta = resolvePackageMeta(path.join(projectRoot, pkgDir)); + if (meta == null) { + continue; + } + map.set(meta.name, { + ...meta, + dir: pkgDir, + }); + } + } else { + const meta = resolvePackageMeta(path.join(projectRoot, pkgDefinition)); + if (meta == null) { + continue; + } + map.set(meta.name, { + ...meta, + dir: pkgDefinition, + }); + } + } + return map; +} + +function resolveDependencyDirs(lernaProjectMap, deps) { + const results = []; + for (const dep of deps) { + const meta = lernaProjectMap.get(dep); + if (meta == null) { + continue; + } + results.push(meta.dir); + } + return results; +} + +function resolvePackageMeta(pkgDir) { + try { + const pkgJson = readJSON(path.join(pkgDir, 'package.json')); + let tsProject = false; + try { + tsProject = fs.statSync(path.join(pkgDir, 'tsconfig.json')).isFile() + } catch {/** ignore */} + return { + name: pkgJson.name, + private: pkgJson.private, + tsProject, + }; + } catch (e) { + return null + } +} + +function readJSON(filepath) { + const fileContent = fs.readFileSync(filepath, 'utf8'); + const json = JSON.parse(fileContent); + return json; +} + +function writeJSON(filepath, content, dry) { + const text = JSON.stringify(content, null, 2); + if (dry) { + console.log(text); + } else { + fs.writeFileSync(filepath, text + '\n', 'utf8'); + } +} diff --git a/tsconfig.json b/tsconfig.json index 10419db907..d3a7e25b14 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,6 +5,7 @@ "entryPointStrategy": "packages", "entryPoints": [ "api", + "experimental/packages/api-logs", "experimental/packages/exporter-trace-otlp-grpc", "experimental/packages/exporter-trace-otlp-http", "experimental/packages/exporter-trace-otlp-proto", @@ -13,11 +14,11 @@ "experimental/packages/opentelemetry-exporter-metrics-otlp-http", "experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "experimental/packages/opentelemetry-exporter-prometheus", + "experimental/packages/opentelemetry-instrumentation", "experimental/packages/opentelemetry-instrumentation-fetch", "experimental/packages/opentelemetry-instrumentation-grpc", "experimental/packages/opentelemetry-instrumentation-http", "experimental/packages/opentelemetry-instrumentation-xml-http-request", - "experimental/packages/opentelemetry-instrumentation", "experimental/packages/opentelemetry-sdk-metrics", "experimental/packages/opentelemetry-sdk-node", "experimental/packages/otlp-exporter-base", @@ -25,8 +26,8 @@ "experimental/packages/otlp-proto-exporter-base", "experimental/packages/otlp-transformer", "packages/opentelemetry-context-async-hooks", - "packages/opentelemetry-context-zone-peer-dep", "packages/opentelemetry-context-zone", + "packages/opentelemetry-context-zone-peer-dep", "packages/opentelemetry-core", "packages/opentelemetry-exporter-jaeger", "packages/opentelemetry-exporter-zipkin", @@ -54,118 +55,118 @@ "path": "api" }, { - "path": "packages/opentelemetry-context-async-hooks" + "path": "experimental/backwards-compatability/node14" }, { - "path": "packages/opentelemetry-context-zone-peer-dep" + "path": "experimental/backwards-compatability/node16" }, { - "path": "packages/opentelemetry-context-zone" + "path": "experimental/packages/api-logs" }, { - "path": "packages/opentelemetry-core" + "path": "experimental/packages/exporter-trace-otlp-grpc" }, { - "path": "packages/opentelemetry-exporter-jaeger" + "path": "experimental/packages/exporter-trace-otlp-http" }, { - "path": "packages/opentelemetry-exporter-zipkin" + "path": "experimental/packages/exporter-trace-otlp-proto" }, { - "path": "packages/opentelemetry-propagator-b3" + "path": "experimental/packages/opentelemetry-api-metrics" }, { - "path": "packages/opentelemetry-propagator-jaeger" + "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc" }, { - "path": "packages/opentelemetry-resources" + "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-http" }, { - "path": "packages/opentelemetry-sdk-trace-base" + "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-proto" }, { - "path": "packages/opentelemetry-sdk-trace-node" + "path": "experimental/packages/opentelemetry-exporter-prometheus" }, { - "path": "packages/opentelemetry-sdk-trace-web" + "path": "experimental/packages/opentelemetry-instrumentation" }, { - "path": "packages/opentelemetry-semantic-conventions" + "path": "experimental/packages/opentelemetry-instrumentation-fetch" }, { - "path": "packages/opentelemetry-shim-opentracing" + "path": "experimental/packages/opentelemetry-instrumentation-grpc" }, { - "path": "packages/template" + "path": "experimental/packages/opentelemetry-instrumentation-http" }, { - "path": "experimental/packages/api-logs" + "path": "experimental/packages/opentelemetry-instrumentation-xml-http-request" }, { - "path": "experimental/packages/exporter-trace-otlp-grpc" + "path": "experimental/packages/opentelemetry-sdk-metrics" }, { - "path": "experimental/packages/exporter-trace-otlp-http" + "path": "experimental/packages/opentelemetry-sdk-node" }, { - "path": "experimental/packages/exporter-trace-otlp-proto" + "path": "experimental/packages/otlp-exporter-base" }, { - "path": "experimental/packages/opentelemetry-api-metrics" + "path": "experimental/packages/otlp-grpc-exporter-base" }, { - "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc" + "path": "experimental/packages/otlp-proto-exporter-base" }, { - "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-http" + "path": "experimental/packages/otlp-transformer" }, { - "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-proto" + "path": "integration-tests/propagation-validation-server" }, { - "path": "experimental/packages/opentelemetry-exporter-prometheus" + "path": "packages/opentelemetry-context-async-hooks" }, { - "path": "experimental/packages/opentelemetry-instrumentation-fetch" + "path": "packages/opentelemetry-context-zone" }, { - "path": "experimental/packages/opentelemetry-instrumentation-grpc" + "path": "packages/opentelemetry-context-zone-peer-dep" }, { - "path": "experimental/packages/opentelemetry-instrumentation-http" + "path": "packages/opentelemetry-core" }, { - "path": "experimental/packages/opentelemetry-instrumentation-xml-http-request" + "path": "packages/opentelemetry-exporter-jaeger" }, { - "path": "experimental/packages/opentelemetry-instrumentation" + "path": "packages/opentelemetry-exporter-zipkin" }, { - "path": "experimental/packages/opentelemetry-sdk-metrics" + "path": "packages/opentelemetry-propagator-b3" }, { - "path": "experimental/packages/opentelemetry-sdk-node" + "path": "packages/opentelemetry-propagator-jaeger" }, { - "path": "experimental/packages/otlp-exporter-base" + "path": "packages/opentelemetry-resources" }, { - "path": "experimental/packages/otlp-grpc-exporter-base" + "path": "packages/opentelemetry-sdk-trace-base" }, { - "path": "experimental/packages/otlp-proto-exporter-base" + "path": "packages/opentelemetry-sdk-trace-node" }, { - "path": "experimental/packages/otlp-transformer" + "path": "packages/opentelemetry-sdk-trace-web" }, { - "path": "experimental/backwards-compatability/node14" + "path": "packages/opentelemetry-semantic-conventions" }, { - "path": "experimental/backwards-compatability/node16" + "path": "packages/opentelemetry-shim-opentracing" }, { - "path": "integration-tests/propagation-validation-server" + "path": "packages/template" } ] }