diff --git a/experimental/packages/opentelemetry-api-metrics/.eslintrc.js b/experimental/packages/opentelemetry-api-metrics/.eslintrc.js index b9004d20258..f75e31dd5dc 100644 --- a/experimental/packages/opentelemetry-api-metrics/.eslintrc.js +++ b/experimental/packages/opentelemetry-api-metrics/.eslintrc.js @@ -4,5 +4,8 @@ module.exports = { "commonjs": true, "shared-node-browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json index 5cb9e1503b4..b64b3fa701c 100644 --- a/experimental/packages/opentelemetry-api-metrics/package.json +++ b/experimental/packages/opentelemetry-api-metrics/package.json @@ -4,17 +4,19 @@ "description": "Public metrics API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", + "compile": "tsc --build", + "clean": "tsc --build --clean", + "test": "nyc ts-mocha -p tsconfig.cjs.json test/**/*.test.ts", "test:browser": "nyc karma start --single-run", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", @@ -22,7 +24,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, @@ -44,6 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.cjs.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.cjs.json new file mode 100644 index 00000000000..ed9d0830bdd --- /dev/null +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.cjs.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.esm2015.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json new file mode 100644 index 00000000000..b1a5a79f6b0 --- /dev/null +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.json index ff9d6942fb6..47db0db0225 100644 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.json +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.json @@ -1,11 +1,9 @@ { - "extends": "../../../tsconfig.es5.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" + "extends": "../../../tsconfig.base.json", + "files": [], + "references": [ + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js index e41d9a9299b..7e4f66f6372 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-otlp-http/package.json index 91399c51a8d..0b69b856bd0 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-http/package.json @@ -4,25 +4,27 @@ "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test": "nyc ts-mocha -p tsconfig.cjs.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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -44,6 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.cjs.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.cjs.json new file mode 100644 index 00000000000..4d4f7f4308c --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.cjs.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-sdk-metrics-base/tsconfig.cjs.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm2015.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm2015.json new file mode 100644 index 00000000000..9e406616e2c --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm2015.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-sdk-metrics-base/tsconfig.esm2015.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json index 3c062d3feb2..47db0db0225 100644 --- a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json @@ -1,19 +1,9 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-api-metrics" - }, - { - "path": "../opentelemetry-sdk-metrics-base" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js index e41d9a9299b..7e4f66f6372 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-fetch/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 40b652afb5d..815f96708bd 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -4,18 +4,19 @@ "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, @@ -37,6 +38,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.cjs.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.cjs.json new file mode 100644 index 00000000000..2392369deae --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.cjs.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.cjs.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json new file mode 100644 index 00000000000..b3091820795 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esm2015.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json index 41fa3be2377..47db0db0225 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.json @@ -1,17 +1,9 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-instrumentation" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js index 6ad6c9f2166..13975c8ec5c 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 66d3c85f331..ad0451567a0 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -4,18 +4,19 @@ "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, @@ -37,6 +38,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.cjs.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.cjs.json new file mode 100644 index 00000000000..2392369deae --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.cjs.json @@ -0,0 +1,17 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.cjs.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json new file mode 100644 index 00000000000..b3091820795 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esm2015.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json index 41fa3be2377..47db0db0225 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json @@ -1,17 +1,9 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-instrumentation" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation/.eslintrc.js b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js index e41d9a9299b..7e4f66f6372 100644 --- a/experimental/packages/opentelemetry-instrumentation/.eslintrc.js +++ b/experimental/packages/opentelemetry-instrumentation/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 7204d0e3911..407e8ca382a 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -7,6 +7,7 @@ "license": "Apache-2.0", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "publishConfig": { "access": "public" @@ -18,6 +19,7 @@ "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "files": [ @@ -32,8 +34,8 @@ "README.md" ], "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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", @@ -41,10 +43,10 @@ "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", "tdd:browser": "karma start", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test": "nyc ts-mocha -p tsconfig.cjs.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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.cjs.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.cjs.json new file mode 100644 index 00000000000..6f928af8ddc --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.cjs.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.cjs.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json new file mode 100644 index 00000000000..90055f46c96 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm2015.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.json index 948abef3ceb..47db0db0225 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.json @@ -1,16 +1,9 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-api-metrics" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js b/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js index f756f4488b2..b9c0c3eac68 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js +++ b/experimental/packages/opentelemetry-sdk-metrics-base/.eslintrc.js @@ -3,5 +3,8 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../../eslint.config.js') + ...require('../../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json index 862e167d1d7..c76eef68d91 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/package.json @@ -4,18 +4,19 @@ "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "compile": "tsc --build", + "clean": "tsc --build --clean", + "test": "nyc ts-mocha -p tsconfig.cjs.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "node ../../../scripts/version-update.js" }, @@ -35,6 +36,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.cjs.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.cjs.json new file mode 100644 index 00000000000..6f928af8ddc --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.cjs.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.cjs.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json new file mode 100644 index 00000000000..90055f46c96 --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm2015.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json index 948abef3ceb..47db0db0225 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.json @@ -1,16 +1,9 @@ { "extends": "../../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-api-metrics" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json deleted file mode 100644 index a233a3b76d1..00000000000 --- a/experimental/tsconfig.esm.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "extends": "../tsconfig.base.esm.json", - "files": [], - "references": [ - { - "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-exporter-otlp-grpc" - }, - { - "path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-exporter-otlp-proto" - }, - { - "path": "packages/opentelemetry-exporter-prometheus" - }, - { - "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-instrumentation-grpc" - }, - { - "path": "packages/opentelemetry-instrumentation-http" - }, - { - "path": "packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-instrumentation/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-sdk-node" - }, - { - "path": "backwards-compatability/node10" - }, - { - "path": "backwards-compatability/node12" - }, - { - "path": "backwards-compatability/node8" - } - ] -} diff --git a/package.json b/package.json index 702e0cde245..79ab5afdaa4 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,10 @@ "types": "build/src/index.d.ts", "scripts": { "precompile": "lerna run version", - "compile": "tsc --build tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", "prewatch": "npm run precompile", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", + "clean": "tsc --build --clean", "bench": "node benchmark", "postinstall": "npm run update-ts-references && npm run bootstrap", "postcompile": "npm run submodule && npm run protos:copy", @@ -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 --configName tsconfig.esm.json && update-ts-references" + "update-ts-references": "update-ts-references" }, "repository": "open-telemetry/opentelemetry-js", "keywords": [ diff --git a/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js b/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js index f21c674001c..6387f494fb0 100644 --- a/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js +++ b/packages/opentelemetry-context-zone-peer-dep/.eslintrc.js @@ -7,5 +7,8 @@ module.exports = { "globals": { "Zone": "readonly" }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 94c21e2a089..c96036b4cc0 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -4,18 +4,19 @@ "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -36,6 +37,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.cjs.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.cjs.json new file mode 100644 index 00000000000..479d4bc0d2e --- /dev/null +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.cjs.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.esm2015.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json new file mode 100644 index 00000000000..e95e9f15fa3 --- /dev/null +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "files": [ + "node_modules/zone.js/dist/zone.js.d.ts" + ], + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.json index 479d4bc0d2e..5a42f72aeb5 100644 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.json +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.json @@ -1,15 +1,9 @@ { "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.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-context-zone/.eslintrc.js b/packages/opentelemetry-context-zone/.eslintrc.js index c21aa0e358a..a25d3eac116 100644 --- a/packages/opentelemetry-context-zone/.eslintrc.js +++ b/packages/opentelemetry-context-zone/.eslintrc.js @@ -3,5 +3,8 @@ module.exports = { "browser": true, "commonjs": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index f844a972d53..f32ef7b8163 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -4,15 +4,16 @@ "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -33,6 +34,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-context-zone/tsconfig.cjs.json b/packages/opentelemetry-context-zone/tsconfig.cjs.json new file mode 100644 index 00000000000..e714c6958f5 --- /dev/null +++ b/packages/opentelemetry-context-zone/tsconfig.cjs.json @@ -0,0 +1,20 @@ +{ + "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" + ], + "references": [ + { + "path": "../opentelemetry-context-zone-peer-dep" + } + ] +} diff --git a/packages/opentelemetry-context-zone/tsconfig.esm2015.json b/packages/opentelemetry-context-zone/tsconfig.esm2015.json new file mode 100644 index 00000000000..862efe751ba --- /dev/null +++ b/packages/opentelemetry-context-zone/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-context-zone/tsconfig.json b/packages/opentelemetry-context-zone/tsconfig.json index e714c6958f5..5a42f72aeb5 100644 --- a/packages/opentelemetry-context-zone/tsconfig.json +++ b/packages/opentelemetry-context-zone/tsconfig.json @@ -1,20 +1,9 @@ { "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": "../opentelemetry-context-zone-peer-dep" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-core/.eslintrc.js b/packages/opentelemetry-core/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-core/.eslintrc.js +++ b/packages/opentelemetry-core/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 573ea927be4..2cf8ae4e8a7 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -4,17 +4,19 @@ "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts --exclude 'test/platform/browser/**/*.ts'", + "compile": "tsc --build", + "clean": "tsc --build --clean", + "test": "nyc ts-mocha -p tsconfig.cjs.json test/**/*.test.ts --exclude 'test/platform/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", @@ -24,7 +26,7 @@ "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -46,6 +48,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-core/tsconfig.cjs.json b/packages/opentelemetry-core/tsconfig.cjs.json new file mode 100644 index 00000000000..7eb9c7c10cf --- /dev/null +++ b/packages/opentelemetry-core/tsconfig.cjs.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-semantic-conventions/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-core/tsconfig.esm2015.json b/packages/opentelemetry-core/tsconfig.esm2015.json new file mode 100644 index 00000000000..3f985ee8b6d --- /dev/null +++ b/packages/opentelemetry-core/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-core/tsconfig.json b/packages/opentelemetry-core/tsconfig.json index 0717beecbfb..5a42f72aeb5 100644 --- a/packages/opentelemetry-core/tsconfig.json +++ b/packages/opentelemetry-core/tsconfig.json @@ -1,16 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-semantic-conventions" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/.eslintrc.js b/packages/opentelemetry-exporter-zipkin/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-exporter-zipkin/.eslintrc.js +++ b/packages/opentelemetry-exporter-zipkin/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 653dc8a3215..69305c25efb 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -4,25 +4,27 @@ "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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", "lint:fix": "eslint . --ext .ts --fix", "tdd": "npm run test -- --watch-extensions ts --watch", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "test": "nyc ts-mocha -p tsconfig.cjs.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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -42,6 +44,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.cjs.json b/packages/opentelemetry-exporter-zipkin/tsconfig.cjs.json new file mode 100644 index 00000000000..11718a80362 --- /dev/null +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.cjs.json @@ -0,0 +1,25 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json new file mode 100644 index 00000000000..6e8bbb4a5fb --- /dev/null +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json @@ -0,0 +1,25 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.json b/packages/opentelemetry-exporter-zipkin/tsconfig.json index 8b45d214a9a..5a42f72aeb5 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.json @@ -1,25 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-propagator-b3/.eslintrc.js b/packages/opentelemetry-propagator-b3/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-propagator-b3/.eslintrc.js +++ b/packages/opentelemetry-propagator-b3/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 5015c0a74bb..66e534d01c6 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -4,17 +4,18 @@ "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts", + "compile": "tsc --build", + "clean": "tsc --build --clean", + "test": "nyc ts-mocha -p tsconfig.cjs.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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -35,6 +36,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-propagator-b3/tsconfig.cjs.json b/packages/opentelemetry-propagator-b3/tsconfig.cjs.json new file mode 100644 index 00000000000..c9bb0d4cdf5 --- /dev/null +++ b/packages/opentelemetry-propagator-b3/tsconfig.cjs.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json b/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json new file mode 100644 index 00000000000..f5d62799098 --- /dev/null +++ b/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.json b/packages/opentelemetry-propagator-b3/tsconfig.json index 789e61fc86b..5a42f72aeb5 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.json @@ -1,16 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-core" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-resources/.eslintrc.js b/packages/opentelemetry-resources/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-resources/.eslintrc.js +++ b/packages/opentelemetry-resources/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 2eb290aa59e..1fb9e7cea13 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -4,19 +4,21 @@ "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test": "nyc ts-mocha -p tsconfig.cjs.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", @@ -39,6 +41,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-resources/tsconfig.cjs.json b/packages/opentelemetry-resources/tsconfig.cjs.json new file mode 100644 index 00000000000..490e4ee5b5e --- /dev/null +++ b/packages/opentelemetry-resources/tsconfig.cjs.json @@ -0,0 +1,19 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-resources/tsconfig.esm2015.json b/packages/opentelemetry-resources/tsconfig.esm2015.json new file mode 100644 index 00000000000..6a8b824e520 --- /dev/null +++ b/packages/opentelemetry-resources/tsconfig.esm2015.json @@ -0,0 +1,19 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-resources/tsconfig.json b/packages/opentelemetry-resources/tsconfig.json index 51dcc3ed88e..5a42f72aeb5 100644 --- a/packages/opentelemetry-resources/tsconfig.json +++ b/packages/opentelemetry-resources/tsconfig.json @@ -1,19 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-semantic-conventions" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-sdk-trace-base/.eslintrc.js b/packages/opentelemetry-sdk-trace-base/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-sdk-trace-base/.eslintrc.js +++ b/packages/opentelemetry-sdk-trace-base/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 9f52b0efa04..e1de9c0cd6b 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -4,17 +4,19 @@ "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", + "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", + "compile": "tsc --build", + "clean": "tsc --build --clean", + "test": "nyc ts-mocha -p tsconfig.cjs.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", "tdd": "npm run tdd:node", "tdd:node": "npm run test -- --watch-extensions ts --watch", @@ -23,7 +25,7 @@ "lint:fix": "eslint . --ext .ts --fix", "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -44,6 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.cjs.json b/packages/opentelemetry-sdk-trace-base/tsconfig.cjs.json new file mode 100644 index 00000000000..d5e1e325627 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.cjs.json @@ -0,0 +1,22 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json new file mode 100644 index 00000000000..b3d6da6c4cb --- /dev/null +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json @@ -0,0 +1,22 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.json b/packages/opentelemetry-sdk-trace-base/tsconfig.json index b16c7037b42..5a42f72aeb5 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.json @@ -1,22 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-semantic-conventions" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/.eslintrc.js b/packages/opentelemetry-sdk-trace-web/.eslintrc.js index 01b8d097408..5c5cb543bbd 100644 --- a/packages/opentelemetry-sdk-trace-web/.eslintrc.js +++ b/packages/opentelemetry-sdk-trace-web/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "browser": true, "jquery": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index ca9cb926434..4c11084f85d 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -4,18 +4,19 @@ "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "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.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -36,6 +37,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.cjs.json b/packages/opentelemetry-sdk-trace-web/tsconfig.cjs.json new file mode 100644 index 00000000000..086092bfdc4 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.cjs.json @@ -0,0 +1,32 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build", + "skipLibCheck": true + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-core/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-propagator-b3/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.cjs.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.cjs.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json new file mode 100644 index 00000000000..d9c25d1fca2 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json @@ -0,0 +1,31 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-core/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-propagator-b3/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esm2015.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.json b/packages/opentelemetry-sdk-trace-web/tsconfig.json index f317cb38d10..5a42f72aeb5 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.json @@ -1,32 +1,9 @@ { "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build", - "skipLibCheck": true - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], + "files": [], "references": [ - { - "path": "../opentelemetry-context-zone" - }, - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-propagator-b3" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - }, - { - "path": "../opentelemetry-semantic-conventions" - } + { "path": "./tsconfig.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } ] } diff --git a/packages/opentelemetry-semantic-conventions/.eslintrc.js b/packages/opentelemetry-semantic-conventions/.eslintrc.js index 9dfe62f9b8c..7d6af74340a 100644 --- a/packages/opentelemetry-semantic-conventions/.eslintrc.js +++ b/packages/opentelemetry-semantic-conventions/.eslintrc.js @@ -5,5 +5,8 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../eslint.config.js'), + parserOptions: { + "project": "./tsconfig.cjs.json" + }, } diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 54114b923c7..c4598e4a4a3 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -4,17 +4,18 @@ "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", + "esm2015": "build/esm2015/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { - "compile": "tsc --build tsconfig.json tsconfig.esm.json", - "clean": "tsc --build --clean tsconfig.json tsconfig.esm.json", + "compile": "tsc --build", + "clean": "tsc --build --clean", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", + "test": "nyc ts-mocha -p tsconfig.cjs.json 'test/**/*.test.ts'", "tdd": "npm run test -- --watch-extensions ts --watch", "version": "node ../../scripts/version-update.js", - "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", + "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" }, @@ -34,6 +35,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", + "build/esm2015/**/*.js", + "build/esm2015/**/*.js.map", + "build/esm2015/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.cjs.json b/packages/opentelemetry-semantic-conventions/tsconfig.cjs.json new file mode 100644 index 00000000000..a388bb16f97 --- /dev/null +++ b/packages/opentelemetry-semantic-conventions/tsconfig.cjs.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.es5.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": ["src/**/*.ts", "test/**/*.ts"] +} diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json b/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json new file mode 100644 index 00000000000..06f2e5a8730 --- /dev/null +++ b/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esm2015.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm2015", + "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.json b/packages/opentelemetry-semantic-conventions/tsconfig.json index a388bb16f97..5a42f72aeb5 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.cjs.json" }, + { "path": "./tsconfig.esm.json" }, + { "path": "./tsconfig.esm2015.json" } + ] } diff --git a/tsconfig.base.esm2015.json b/tsconfig.base.esm2015.json new file mode 100644 index 00000000000..39d76c9a7e5 --- /dev/null +++ b/tsconfig.base.esm2015.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "es6", + "target": "es6", + "moduleResolution": "node" + }, +} diff --git a/tsconfig.esm.json b/tsconfig.esm.json deleted file mode 100644 index 4bbf108bfcf..00000000000 --- a/tsconfig.esm.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "extends": "./tsconfig.base.esm.json", - "files": [], - "references": [ - { - "path": "packages/opentelemetry-context-async-hooks" - }, - { - "path": "packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-context-zone/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-exporter-jaeger" - }, - { - "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-propagator-b3/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-propagator-jaeger/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-resources/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-sdk-trace-base/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-sdk-trace-node" - }, - { - "path": "packages/opentelemetry-sdk-trace-web/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-semantic-conventions/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-shim-opentracing" - }, - { - "path": "packages/template/tsconfig.esm.json" - }, - { - "path": "integration-tests/propagation-validation-server" - } - ] -}