Skip to content

test: transpile zone.js products in test #4423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2024
Merged

test: transpile zone.js products in test #4423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
541b5e1
test: transpile zone.js products in test
legendecas Jan 17, 2024
83f183a
Merge branch 'main' into test/zone.js
legendecas Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/

* chore(opentelemetry-context-zone-peer-dep): support zone.js ^v0.13.0 [#4320](https://github.com/open-telemetry/opentelemetry-js/pull/4320)
* refactor(core): drop unnecessary assignment of HOSTNAME [#4421](https://github.com/open-telemetry/opentelemetry-js/pull/4421) @pichlermarc
* test(opentelemetry-context-zone-peer-dep): transpile zone.js in tests [#4423](https://github.com/open-telemetry/opentelemetry-js/pull/4423) @legendecas

## 1.20.0

Expand Down
3 changes: 2 additions & 1 deletion examples/opentelemetry-web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
"url": "https://github.com/open-telemetry/opentelemetry-js/issues"
},
"devDependencies": {
"@babel/core": "^7.6.0",
"@babel/core": "^7.23.6",
"@babel/preset-env": "^7.22.20",
"babel-loader": "^8.0.6",
"ts-loader": "^9.2.6",
"typescript": "^4.5.2",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/exporter-logs-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/api-logs": "0.47.0",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/exporter-logs-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"sideEffects": false,
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/resources": "1.20.0",
"@types/mocha": "10.0.6",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/exporter-logs-otlp-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/exporter-trace-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/otlp-exporter-base": "0.47.0",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/exporter-trace-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/exporter-trace-otlp-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/opentelemetry-browser-detector/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/opentelemetry-instrumentation-fetch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-zone": "1.20.0",
"@opentelemetry/propagator-b3": "1.20.0",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/context-zone": "1.20.0",
"@opentelemetry/propagator-b3": "1.20.0",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/sdk-metrics": "1.20.0",
"@types/mocha": "10.0.6",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/otlp-exporter-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 0 additions & 1 deletion experimental/packages/otlp-grpc-exporter-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/otlp-transformer": "0.47.0",
"@opentelemetry/resources": "1.20.0",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/otlp-proto-exporter-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": "1.7.0",
"@types/mocha": "10.0.6",
"@types/node": "18.6.5",
Expand Down
1 change: 1 addition & 0 deletions experimental/packages/sdk-logs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
},
"devDependencies": {
"@babel/core": "7.23.6",
"@babel/preset-env": "7.22.20",
"@opentelemetry/api": ">=1.4.0 <1.8.0",
"@opentelemetry/api-logs": "0.47.0",
"@opentelemetry/resources_1.9.0": "npm:@opentelemetry/[email protected]",
Expand Down
16 changes: 16 additions & 0 deletions karma.webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,22 @@ module.exports = {
module: {
rules: [
{ test: /\.ts$/, use: 'ts-loader' },
{
test: /\.js$/,
exclude: {
and: [/node_modules/], // Exclude libraries in node_modules ...
not: [
// Except for a few of them that needs to be transpiled because they use modern syntax
/zone.js/,
],
},
use: {
loader: 'babel-loader',
options: {
presets: ['@babel/preset-env'],
}
},
},
{
enforce: 'post',
exclude: /(node_modules|\.test\.[tj]sx?$)/,
Expand Down
Loading