Skip to content

Commit 71dd4fa

Browse files
pichlermarcpichlermarc
authored
Merge branch 'main' into capture-arn-sns-instrumnentation
2 parents 8be9180 + 2698bb1 commit 71dd4fa

File tree

9 files changed

+85
-12
lines changed

9 files changed

+85
-12
lines changed

‎plugins/web/opentelemetry-instrumentation-document-load/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"description": "OpenTelemetry document-load automatic instrumentation package.",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
7+
"esnext": "build/esnext/index.js",
78
"types": "build/src/index.d.ts",
89
"repository": "open-telemetry/opentelemetry-js-contrib",
910
"scripts": {
10-
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-document-load --include-dependencies",
1415
"prewatch": "npm run precompile",
1516
"version:update": "node ../../../scripts/version-update.js",
16-
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
17+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1718
"prepare": "npm run compile",
1819
"tdd": "karma start",
1920
"test:browser": "nyc karma start --single-run",
20-
"watch": "tsc --build -watch tsconfig.json tsconfig.esm.json"
21+
"watch": "tsc --build -watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
2122
},
2223
"keywords": [
2324
"opentelemetry",
@@ -36,6 +37,9 @@
3637
"build/esm/**/*.js",
3738
"build/esm/**/*.map",
3839
"build/esm/**/*.d.ts",
40+
"build/esnext/**/*.js",
41+
"build/esnext/**/*.map",
42+
"build/esnext/**/*.d.ts",
3943
"build/src/**/*.js",
4044
"build/src/**/*.map",
4145
"build/src/**/*.d.ts",

‎plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esnext.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "../../../tsconfig.base.esnext.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esnext",
6+
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
7+
},
8+
"include": [
9+
"src/**/*.ts"
10+
]
11+
}

‎plugins/web/opentelemetry-instrumentation-long-task/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"description": "OpenTelemetry long task API automatic instrumentation package.",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
7+
"esnext": "build/esnext/index.js",
78
"types": "build/src/index.d.ts",
89
"repository": "open-telemetry/opentelemetry-js-contrib",
910
"scripts": {
1011
"lint": "eslint . --ext .ts",
1112
"lint:fix": "eslint . --ext .ts --fix",
12-
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
13+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1314
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies",
1415
"prewatch": "npm run precompile",
1516
"version:update": "node ../../../scripts/version-update.js",
16-
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
17+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1718
"prepare": "npm run compile",
1819
"tdd": "karma start",
1920
"test:browser": "nyc karma start --single-run",
20-
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
21+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
2122
},
2223
"keywords": [
2324
"opentelemetry",
@@ -36,6 +37,9 @@
3637
"build/esm/**/*.js",
3738
"build/esm/**/*.map",
3839
"build/esm/**/*.d.ts",
40+
"build/esnext/**/*.js",
41+
"build/esnext/**/*.map",
42+
"build/esnext/**/*.d.ts",
3943
"build/src/**/*.js",
4044
"build/src/**/*.map",
4145
"build/src/**/*.d.ts",

‎plugins/web/opentelemetry-instrumentation-long-task/tsconfig.esnext.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "../../../tsconfig.base.esnext.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esnext",
6+
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
7+
},
8+
"files": [ "node_modules/zone.js/dist/zone.js.d.ts"],
9+
"include": [
10+
"src/**/*.ts"
11+
]
12+
}

‎plugins/web/opentelemetry-instrumentation-user-interaction/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"description": "OpenTelemetry UserInteraction automatic instrumentation package.",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
7+
"esnext": "build/esnext/index.js",
78
"types": "build/src/index.d.ts",
89
"repository": "open-telemetry/opentelemetry-js-contrib",
910
"scripts": {
1011
"lint": "eslint . --ext .ts",
1112
"lint:fix": "eslint . --ext .ts --fix",
12-
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
13+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1314
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/instrumentation-user-interaction --include-dependencies",
1415
"prewatch": "npm run precompile",
1516
"version:update": "node ../../../scripts/version-update.js",
16-
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
17+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1718
"prepare": "npm run compile",
1819
"tdd": "karma start",
1920
"test:browser": "nyc karma start --single-run",
20-
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
21+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
2122
},
2223
"keywords": [
2324
"opentelemetry",
@@ -36,6 +37,9 @@
3637
"build/esm/**/*.js",
3738
"build/esm/**/*.map",
3839
"build/esm/**/*.d.ts",
40+
"build/esnext/**/*.js",
41+
"build/esnext/**/*.map",
42+
"build/esnext/**/*.d.ts",
3943
"build/src/**/*.js",
4044
"build/src/**/*.map",
4145
"build/src/**/*.d.ts",

‎plugins/web/opentelemetry-instrumentation-user-interaction/tsconfig.esnext.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": "../../../tsconfig.base.esnext.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esnext",
6+
"skipLibCheck": true,
7+
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
8+
},
9+
"files": [ "node_modules/zone.js/dist/zone.js.d.ts"],
10+
"include": [
11+
"src/**/*.ts"
12+
]
13+
}

‎plugins/web/opentelemetry-plugin-react-load/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"description": "OpenTelemetry React loading automatic instrumentation package.",
55
"main": "build/src/index.js",
66
"module": "build/esm/index.js",
7+
"esnext": "build/esnext/index.js",
78
"types": "build/src/index.d.ts",
89
"repository": "open-telemetry/opentelemetry-js-contrib",
910
"scripts": {
10-
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
11+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1112
"lint": "eslint . --ext .ts",
1213
"lint:fix": "eslint . --ext .ts --fix",
1314
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/plugin-react-load --include-dependencies",
1415
"prewatch": "npm run precompile",
1516
"version:update": "node ../../../scripts/version-update.js",
16-
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
17+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
1718
"prepare": "npm run compile",
1819
"tdd": "karma start",
1920
"test:browser": "nyc karma start --single-run",
20-
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
21+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
2122
},
2223
"keywords": [
2324
"opentelemetry",
@@ -36,6 +37,9 @@
3637
"build/esm/**/*.js",
3738
"build/esm/**/*.map",
3839
"build/esm/**/*.d.ts",
40+
"build/esnext/**/*.js",
41+
"build/esnext/**/*.map",
42+
"build/esnext/**/*.d.ts",
3943
"build/src/**/*.js",
4044
"build/src/**/*.map",
4145
"build/src/**/*.d.ts",

‎plugins/web/opentelemetry-plugin-react-load/tsconfig.esnext.json

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"extends": "../../../tsconfig.base.esnext.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esnext",
6+
"jsx": "react",
7+
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
8+
},
9+
"include": [
10+
"src/**/*.ts"
11+
]
12+
}

‎tsconfig.base.esnext.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "./tsconfig.base.json",
3+
"compilerOptions": {
4+
"module": "esnext",
5+
// target should be aligned with tsconfig.base.json
6+
"target": "es2017",
7+
"moduleResolution": "node"
8+
},
9+
}

0 commit comments

Comments
 (0)