Skip to content

chore: sort entries in tsconfig #2402

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
vmarchaud merged 4 commits into from
Aug 7, 2021
Merged

chore: sort entries in tsconfig #2402

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61d28f1
chore: sort entries in tsconfig
Flarna Aug 6, 2021
b4bbeee
Merge branch 'main' into correct-tsconfigs
dyladan Aug 6, 2021
2ad8340
Merge branch 'main' into correct-tsconfigs
Flarna Aug 6, 2021
ff07058
Merge branch 'main' into correct-tsconfigs
vmarchaud Aug 7, 2021
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
Next Next commit
chore: sort entries in tsconfig 
Seems the entried in tsconfig.json files needs to be sorted otherwise I end up with
modified files after npm install.
  • Loading branch information
@Flarna
Flarna committed Aug 6, 2021
commit 61d28f1ca3d92b41c3c2a17f1464f93a1337cdd0
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-grpc/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"path": "../opentelemetry-exporter-collector"
},
{
"path": "../opentelemetry-sdk-metrics-base"
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-resources"
"path": "../opentelemetry-sdk-metrics-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector-proto/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"path": "../opentelemetry-exporter-collector"
},
{
"path": "../opentelemetry-sdk-metrics-base"
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-resources"
"path": "../opentelemetry-sdk-metrics-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-collector/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-sdk-metrics-base"
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-resources"
"path": "../opentelemetry-sdk-metrics-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-jaeger/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-exporter-zipkin/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-instrumentation-fetch/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
{
"path": "../opentelemetry-propagator-b3"
},
{
"path": "../opentelemetry-semantic-conventions"
},
{
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-web"
},
{
"path": "../opentelemetry-semantic-conventions"
}
]
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-instrumentation-grpc/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"path": "../opentelemetry-instrumentation"
},
{
"path": "../opentelemetry-sdk-trace-node"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-node"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-instrumentation-http/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
"path": "../opentelemetry-instrumentation"
},
{
"path": "../opentelemetry-sdk-trace-node"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-node"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
6 changes: 3 additions & 3 deletions packages/opentelemetry-instrumentation-xml-http-request/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
{
"path": "../opentelemetry-propagator-b3"
},
{
"path": "../opentelemetry-semantic-conventions"
},
{
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-web"
},
{
"path": "../opentelemetry-semantic-conventions"
}
]
}
12 changes: 6 additions & 6 deletions packages/opentelemetry-sdk-node/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@
{
"path": "../opentelemetry-instrumentation"
},
{
"path": "../opentelemetry-sdk-metrics-base"
},
{
"path": "../opentelemetry-sdk-trace-node"
},
{
"path": "../opentelemetry-resource-detector-aws"
},
Expand All @@ -36,8 +30,14 @@
{
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-sdk-metrics-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-node"
}
]
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-node/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-sdk-trace-web/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"path": "../opentelemetry-resources"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
4 changes: 2 additions & 2 deletions packages/opentelemetry-shim-opentracing/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"path": "../opentelemetry-propagator-jaeger"
},
{
"path": "../opentelemetry-semantic-conventions"
"path": "../opentelemetry-sdk-trace-base"
},
{
"path": "../opentelemetry-sdk-trace-base"
"path": "../opentelemetry-semantic-conventions"
}
]
}
22 changes: 11 additions & 11 deletions tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@
{
"path": "packages/opentelemetry-instrumentation"
},
{
"path": "packages/opentelemetry-sdk-metrics-base"
},
{
"path": "packages/opentelemetry-sdk-trace-node"
},
{
"path": "packages/opentelemetry-propagator-b3"
},
Expand All @@ -122,25 +116,31 @@
"path": "packages/opentelemetry-resources"
},
{
"path": "packages/opentelemetry-sdk-node"
"path": "packages/opentelemetry-sdk-metrics-base"
},
{
"path": "packages/opentelemetry-semantic-conventions"
"path": "packages/opentelemetry-sdk-node"
},
{
"path": "packages/opentelemetry-shim-opentracing"
"path": "packages/opentelemetry-sdk-trace-base"
},
{
"path": "packages/opentelemetry-sdk-trace-base"
"path": "packages/opentelemetry-sdk-trace-node"
},
{
"path": "packages/opentelemetry-sdk-trace-web"
},
{
"path": "packages/opentelemetry-semantic-conventions"
},
{
"path": "packages/opentelemetry-shim-opentracing"
},
{
"path": "packages/template"
},
{
"path": "integration-tests/propagation-validation-server"
}
]
}
}