Skip to content
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

EOL semantics by adding .gitattributes and changing tsconfig.json #1550

Merged
merged 6 commits into from
Sep 29, 2020
Merged

EOL semantics by adding .gitattributes and changing tsconfig.json #1550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4bdab0a
style(opentelemetry-js): .gitattribute and tsconfig changes for EOL n…
MarkSeufert Sep 18, 2020
f059d60
fix(opentelemetry-js): moved 'newLine': 'LF' into tsconfig.base inste…
MarkSeufert Sep 21, 2020
9060626
fix(opentelemetry-js): changed version script to use LF instead of OS…
MarkSeufert Sep 21, 2020
018d902
fix(opentelemetry-js): simplified version script
MarkSeufert Sep 21, 2020
a20a54c
Merge branch 'master' into normalization-EOL
MarkSeufert Sep 23, 2020
8c58b10
Merge branch 'master' into normalization-EOL
MarkSeufert Sep 28, 2020
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
39 changes: 39 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
## This .gitattributes file automatically formats the EOL character in certain filetypes within the repository

## Source code
# JavaScript, TypeScript, c, and h source files
*.js text eol=lf
*.ts text eol=lf
*.h text eol=lf diff=cpp
*.c text eol=lf diff=cpp

# Shell scripts
*.sh text eol=lf
*.bash text eol=lf

# Windows batch and PowerShell scripts
*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf

##### Other file types #####

## Text files and documentation
*.txt text
README* text
RELEASING* text
CHANGELOG* text
CONTRIBUTING* text
INSTALL* text
LICENSE* text

## Non-text documentation
*.html text diff=html
*.pdf binary
*.json text
*.rtf binary

## Git Properties
.gitignore text
.gitmodules text
.gitattributes text
3 changes: 2 additions & 1 deletion packages/opentelemetry-api/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.es5",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-context-async-hooks/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-context-base/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.es5",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-context-zone-peer-dep/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
"skipLibCheck": true
"skipLibCheck": true,
"newLine": "LF"
},
"files": [ "node_modules/zone.js/dist/zone.js.d.ts"],
"include": [
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-context-zone/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
"skipLibCheck": true
"skipLibCheck": true,
"newLine": "LF"
},
"files": [ "node_modules/zone.js/dist/zone.js.d.ts"],
"include": [
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-core/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-collector-grpc/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-collector-proto/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-collector/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-jaeger/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-prometheus/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-exporter-zipkin/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-grpc-utils/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-metrics/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-node/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-fetch/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
"skipLibCheck": true
"skipLibCheck": true,
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-grpc-js/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-grpc/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-http/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-https/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-plugin-xml-http-request/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
"skipLibCheck": true
"skipLibCheck": true,
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-resource-detector-aws/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": ["src/**/*.ts", "test/**/*.ts"]
}
3 changes: 2 additions & 1 deletion packages/opentelemetry-resource-detector-gcp/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": ["src/**/*.ts", "test/**/*.ts"]
}
3 changes: 2 additions & 1 deletion packages/opentelemetry-resources/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": ["src/**/*.ts", "test/**/*.ts"]
}
3 changes: 2 additions & 1 deletion packages/opentelemetry-sdk-node/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-semantic-conventions/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.es5",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": ["src/**/*.ts", "test/**/*.ts"]
}
3 changes: 2 additions & 1 deletion packages/opentelemetry-shim-opentracing/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-tracing/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"extends": "../tsconfig.base",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
"outDir": "build",
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/opentelemetry-web/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
"skipLibCheck": true
"skipLibCheck": true,
"newLine": "LF"
},
"include": [
"src/**/*.ts",
Expand Down