Skip to content

Commit cf178f5

Browse files
t2t2t2t2
authored
feat: add ESM builds for packages used in browser (open-telemetry#459)
* feat: add ESM builds for packages used in browser * fix(id-generator-aws-xray): missed including esm files
1 parent 45e8751 commit cf178f5

File tree

16 files changed

+141
-24
lines changed

16 files changed

+141
-24
lines changed

‎examples/web/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
},
3636
"dependencies": {
3737
"@opentelemetry/api": "^1.0.0-rc.0",
38-
"@opentelemetry/auto-instrumentations-web": "^0.15.0",
38+
"@opentelemetry/auto-instrumentations-web": "^0.16.0",
3939
"@opentelemetry/context-zone": "^0.19.0",
4040
"@opentelemetry/core": "^0.19.0",
4141
"@opentelemetry/exporter-collector": "^0.19.0",
4242
"@opentelemetry/instrumentation": "^0.19.0",
43-
"@opentelemetry/instrumentation-document-load": "^0.15.0",
44-
"@opentelemetry/instrumentation-user-interaction": "^0.15.0",
43+
"@opentelemetry/instrumentation-document-load": "^0.16.0",
44+
"@opentelemetry/instrumentation-user-interaction": "^0.16.0",
4545
"@opentelemetry/instrumentation-xml-http-request": "^0.19.0",
4646
"@opentelemetry/propagator-b3": "^0.19.0",
4747
"@opentelemetry/tracing": "^0.19.0",

‎metapackages/auto-instrumentations-web/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
"access": "public"
1010
},
1111
"main": "build/src/index.js",
12+
"module": "build/esm/index.js",
1213
"types": "build/src/index.d.ts",
1314
"repository": "open-telemetry/opentelemetry-js-contrib",
1415
"scripts": {
15-
"clean": "tsc --build --clean",
16+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1617
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
17-
"compile": "tsc --build",
18+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
1819
"lint": "eslint . --ext .ts",
1920
"lint:fix": "eslint . --ext .ts --fix",
2021
"precompile": "tsc --version",
2122
"prepare": "npm run compile",
2223
"test:browser": "nyc karma start --single-run",
2324
"version": "node ../../scripts/version-update.js",
24-
"watch": "tsc --build --watch"
25+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
2526
},
2627
"bugs": {
2728
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"

‎metapackages/auto-instrumentations-web/tsconfig.esm.json

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

‎packages/opentelemetry-id-generator-aws-xray/package.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,25 @@
66
"publishConfig": {
77
"access": "public"
88
},
9+
"module": "build/esm/index.js",
910
"browser": {
1011
"./src/platform/index.ts": "./src/platform/browser/index.ts",
12+
"./build/esm/platform/index.js": "./build/esm/platform/browser/index.js",
1113
"./build/src/platform/index.js": "./build/src/platform/browser/index.js"
1214
},
1315
"types": "build/src/index.d.ts",
1416
"repository": "open-telemetry/opentelemetry-js-contrib",
1517
"scripts": {
1618
"precompile": "tsc --version",
17-
"compile": "tsc --build",
18-
"clean": "tsc --build --clean",
19+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
20+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1921
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
2022
"test:browser": "nyc karma start --single-run",
2123
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
2224
"lint": "eslint . --ext .ts",
2325
"lint:fix": "eslint . --ext .ts --fix",
2426
"version": "node ../../scripts/version-update.js",
25-
"watch": "tsc --build --watch",
27+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
2628
"prepare": "npm run compile"
2729
},
2830
"keywords": [
@@ -39,6 +41,9 @@
3941
"node": ">=8.5.0"
4042
},
4143
"files": [
44+
"build/esm/**/*.js",
45+
"build/esm/**/*.js.map",
46+
"build/esm/**/*.d.ts",
4247
"build/src/**/*.js",
4348
"build/src/**/*.js.map",
4449
"build/src/**/*.d.ts",

‎packages/opentelemetry-id-generator-aws-xray/tsconfig.esm.json

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

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
"version": "0.16.0",
44
"description": "OpenTelemetry document-load automatic instrumentation package.",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1011
"lint": "eslint . --ext .ts",
1112
"lint:fix": "eslint . --ext .ts --fix",
1213
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
1314
"precompile": "tsc --version",
1415
"version:update": "node ../../../scripts/version-update.js",
15-
"compile": "npm run version:update && tsc -p .",
16+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
1617
"prepare": "npm run compile",
1718
"tdd": "karma start",
1819
"test:browser": "nyc karma start --single-run",
19-
"watch": "tsc -w"
20+
"watch": "tsc --build -watch tsconfig.json tsconfig.esm.json"
2021
},
2122
"keywords": [
2223
"opentelemetry",
@@ -32,7 +33,11 @@
3233
"node": ">=8.0.0"
3334
},
3435
"files": [
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.map",
38+
"build/esm/**/*.d.ts",
3539
"build/src/**/*.js",
40+
"build/src/**/*.map",
3641
"build/src/**/*.d.ts",
3742
"doc",
3843
"LICENSE",

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

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

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
"version": "0.16.0",
44
"description": "OpenTelemetry UserInteraction automatic instrumentation package.",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
910
"lint": "eslint . --ext .ts",
1011
"lint:fix": "eslint . --ext .ts --fix",
11-
"clean": "rimraf build/*",
12+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1213
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
1314
"precompile": "tsc --version",
1415
"version:update": "node ../../../scripts/version-update.js",
15-
"compile": "npm run version:update && tsc -p .",
16+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
1617
"prepare": "npm run compile",
1718
"tdd": "karma start",
1819
"test:browser": "nyc karma start --single-run",
19-
"watch": "tsc -w"
20+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
2021
},
2122
"keywords": [
2223
"opentelemetry",
@@ -32,7 +33,11 @@
3233
"node": ">=8.0.0"
3334
},
3435
"files": [
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.map",
38+
"build/esm/**/*.d.ts",
3539
"build/src/**/*.js",
40+
"build/src/**/*.map",
3641
"build/src/**/*.d.ts",
3742
"doc",
3843
"LICENSE",

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

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": "../../../tsconfig.base.esm.json",
3+
"compilerOptions": {
4+
"rootDir": "src",
5+
"outDir": "build/esm",
6+
"skipLibCheck": true,
7+
"tsBuildInfoFile": "build/esm/tsconfig.esm.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

+8-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,21 @@
33
"version": "0.16.0",
44
"description": "OpenTelemetry React loading automatic instrumentation package.",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
9-
"clean": "rimraf build/*",
10+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1011
"lint": "eslint . --ext .ts",
1112
"lint:fix": "eslint . --ext .ts --fix",
1213
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
1314
"precompile": "tsc --version",
1415
"version:update": "node ../../../scripts/version-update.js",
15-
"compile": "npm run version:update && tsc -p .",
16+
"compile": "npm run version:update && tsc --build tsconfig.json tsconfig.esm.json",
1617
"prepare": "npm run compile",
1718
"tdd": "karma start",
1819
"test:browser": "nyc karma start --single-run",
19-
"watch": "tsc -w"
20+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
2021
},
2122
"keywords": [
2223
"opentelemetry",
@@ -32,7 +33,11 @@
3233
"node": ">=8.0.0"
3334
},
3435
"files": [
36+
"build/esm/**/*.js",
37+
"build/esm/**/*.map",
38+
"build/esm/**/*.d.ts",
3539
"build/src/**/*.js",
40+
"build/src/**/*.map",
3641
"build/src/**/*.d.ts",
3742
"doc",
3843
"LICENSE",

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

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

‎propagators/opentelemetry-propagator-aws-xray/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
"version": "0.16.0",
44
"description": "OpenTelemetry AWS Xray propagator provides context propagation for systems that are using AWS X-Ray format.",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
910
"precompile": "tsc --version",
10-
"compile": "tsc --build",
11-
"clean": "tsc --build --clean",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
12+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1213
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
1314
"test:browser": "nyc karma start --single-run",
1415
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
1516
"lint": "eslint . --ext .ts",
1617
"lint:fix": "eslint . --ext .ts --fix",
1718
"version": "node ../../scripts/version-update.js",
18-
"watch": "tsc --build --watch",
19+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
1920
"prepare": "npm run compile"
2021
},
2122
"keywords": [
@@ -31,6 +32,9 @@
3132
"node": ">=8.0.0"
3233
},
3334
"files": [
35+
"build/esm/**/*.js",
36+
"build/esm/**/*.js.map",
37+
"build/esm/**/*.d.ts",
3438
"build/src/**/*.js",
3539
"build/src/**/*.js.map",
3640
"build/src/**/*.d.ts",

‎propagators/opentelemetry-propagator-aws-xray/tsconfig.esm.json

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

‎propagators/opentelemetry-propagator-ot-trace/package.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,20 @@
33
"version": "0.16.0",
44
"description": "The OpenTelemetry OTTracepropagator implements the propagation format used by the \"basic tracer\" implementations from the OpenTracing project",
55
"main": "build/src/index.js",
6+
"module": "build/esm/index.js",
67
"types": "build/src/index.d.ts",
78
"repository": "open-telemetry/opentelemetry-js-contrib",
89
"scripts": {
910
"precompile": "tsc --version",
10-
"compile": "tsc --build",
11-
"clean": "tsc --build --clean",
11+
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
12+
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
1213
"test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
1314
"test:browser": "nyc karma start --single-run",
1415
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
1516
"lint": "eslint . --ext .ts",
1617
"lint:fix": "eslint . --ext .ts --fix",
1718
"version": "node ../../scripts/version-update.js",
18-
"watch": "tsc --build --watch",
19+
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
1920
"prepare": "npm run compile"
2021
},
2122
"keywords": [
@@ -33,6 +34,9 @@
3334
"node": ">=8.5.0"
3435
},
3536
"files": [
37+
"build/esm/**/*.js",
38+
"build/esm/**/*.js.map",
39+
"build/esm/**/*.d.ts",
3640
"build/src/**/*.js",
3741
"build/src/**/*.js.map",
3842
"build/src/**/*.d.ts",

‎propagators/opentelemetry-propagator-ot-trace/tsconfig.esm.json

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

‎tsconfig.base.esm.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"extends": "./tsconfig.base.json",
3+
"compilerOptions": {
4+
"module": "ES6",
5+
"moduleResolution": "node"
6+
}
7+
}

0 commit comments

Comments
 (0)