Skip to content

Commit

Permalink
Merge branch 'main' into karma-sourcemap
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmarchaud
vmarchaud authored Mar 1, 2022
2 parents a903e6b + def9ba3 commit 531f52f
Show file tree
Hide file tree
Showing 70 changed files with 349 additions and 348 deletions.
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-api-metrics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"description": "Public metrics API for OpenTelemetry",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/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/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
"./build/src/platform/index.js": "./build/src/platform/browser/index.js"
},
"repository": "open-telemetry/opentelemetry-js",
Expand Down Expand Up @@ -47,9 +47,9 @@
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/esm2015/**/*.js",
"build/esm2015/**/*.js.map",
"build/esm2015/**/*.d.ts",
"build/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-api-metrics/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
11 changes: 0 additions & 11 deletions experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json
View file

This file was deleted.

11 changes: 11 additions & 0 deletions experimental/packages/opentelemetry-api-metrics/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
]
}
10 changes: 5 additions & 5 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/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/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
"./build/src/platform/index.js": "./build/src/platform/browser/index.js"
},
"scripts": {
Expand Down Expand Up @@ -46,9 +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/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
11 changes: 0 additions & 11 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json
View file

This file was deleted.

11 changes: 11 additions & 0 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
]
}
8 changes: 4 additions & 4 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "OpenTelemetry fetch automatic instrumentation package.",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"repository": "open-telemetry/opentelemetry-js",
"scripts": {
Expand Down Expand Up @@ -38,9 +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/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
16 changes: 0 additions & 16 deletions experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json
View file

This file was deleted.

16 changes: 16 additions & 0 deletions experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-instrumentation/tsconfig.esnext.json"
}
]
}
8 changes: 4 additions & 4 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"repository": "open-telemetry/opentelemetry-js",
"scripts": {
Expand Down Expand Up @@ -38,9 +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/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
16 changes: 0 additions & 16 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json
View file

This file was deleted.

16 changes: 16 additions & 0 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-instrumentation/tsconfig.esnext.json"
}
]
}
4 changes: 2 additions & 2 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"license": "Apache-2.0",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"publishConfig": {
"access": "public"
Expand All @@ -19,7 +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/esnext/platform/index.js": "./build/esnext/platform/browser/index.js",
"./build/src/platform/index.js": "./build/src/platform/browser/index.js"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-instrumentation/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
16 changes: 0 additions & 16 deletions experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json
View file

This file was deleted.

16 changes: 16 additions & 0 deletions experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
}
]
}
8 changes: 4 additions & 4 deletions experimental/packages/opentelemetry-sdk-metrics-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Work in progress OpenTelemetry metrics SDK",
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esm2015": "build/esm2015/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"repository": "open-telemetry/opentelemetry-js",
"scripts": {
Expand Down Expand Up @@ -39,9 +39,9 @@
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/esm2015/**/*.js",
"build/esm2015/**/*.js.map",
"build/esm2015/**/*.d.ts",
"build/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts",
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
"references": [
{ "path": "./tsconfig.json" },
{ "path": "./tsconfig.esm.json" },
{ "path": "./tsconfig.esm2015.json" }
{ "path": "./tsconfig.esnext.json" }
]
}
16 changes: 0 additions & 16 deletions experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json
View file

This file was deleted.

16 changes: 16 additions & 0 deletions experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esnext.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
}
]
}
Loading

0 comments on commit 531f52f

Please sign in to comment.