chore: use yarn workspaces

dyladan · dyladan · commit c9958840fcee · 2019-11-08T16:29:01.000-05:00
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,7 @@
 {
   "lerna": "3.13.4",
   "npmClient": "yarn",
+  "useWorkspaces": true,
   "packages": [
     "benchmark/*",
     "packages/*",
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "opentelemetry-base",
+  "private": true,
   "version": "0.1.1",
   "description": "OpenTelemetry is a distributed tracing and stats collection framework.",
   "main": "build/src/index.js",
@@ -48,5 +49,9 @@
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
-  }
+  },
+  "workspaces": [
+    "packages/*",
+    "packages/opentelemetry-plugin-postgres/*"
+  ]
 }
diff --git a/packages/opentelemetry-base/tslint.json b/packages/opentelemetry-base/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-core/tslint.json b/packages/opentelemetry-core/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+  "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-exporter-jaeger/tslint.json b/packages/opentelemetry-exporter-jaeger/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-exporter-zipkin/tslint.json b/packages/opentelemetry-exporter-zipkin/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-metrics/tslint.json b/packages/opentelemetry-metrics/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-node/tslint.json b/packages/opentelemetry-node/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-dns/tslint.json b/packages/opentelemetry-plugin-dns/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-document-load/tslint.json b/packages/opentelemetry-plugin-document-load/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-grpc/tslint.json b/packages/opentelemetry-plugin-grpc/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-http/tslint.json b/packages/opentelemetry-plugin-http/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-http2/tslint.json b/packages/opentelemetry-plugin-http2/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-https/tslint.json b/packages/opentelemetry-plugin-https/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-mongodb/tslint.json b/packages/opentelemetry-plugin-mongodb/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+  "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+  "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-plugin-redis/tslint.json b/packages/opentelemetry-plugin-redis/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-scope-async-hooks/tslint.json b/packages/opentelemetry-scope-async-hooks/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-scope-base/tslint.json b/packages/opentelemetry-scope-base/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-shim-opentracing/tslint.json b/packages/opentelemetry-shim-opentracing/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-   "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+   "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-tracing/tslint.json b/packages/opentelemetry-tracing/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-types/tslint.json b/packages/opentelemetry-types/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }
diff --git a/packages/opentelemetry-web/tslint.json b/packages/opentelemetry-web/tslint.json
@@ -1,4 +1,4 @@
 {
-  "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],
-  "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]
+    "rulesDirectory": ["tslint-microsoft-contrib"],
+  "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"lerna": "3.13.4",`
`3`	`3`	`"npmClient": "yarn",`
	`4`	`+ "useWorkspaces": true,`
`4`	`5`	`"packages": [`
`5`	`6`	`"benchmark/*",`
`6`	`7`	`"packages/*",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "opentelemetry-base",`
	`3`	`+ "private": true,`
`3`	`4`	`"version": "0.1.1",`
`4`	`5`	`"description": "OpenTelemetry is a distributed tracing and stats collection framework.",`
`5`	`6`	`"main": "build/src/index.js",`
`@@ -48,5 +49,9 @@`
`48`	`49`	`"hooks": {`
`49`	`50`	`"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"`
`50`	`51`	`}`
`51`		`- }`
	`52`	`+ },`
	`53`	`+ "workspaces": [`
	`54`	`+ "packages/*",`
	`55`	`+ "packages/opentelemetry-plugin-postgres/*"`
	`56`	`+ ]`
`52`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],`
`3`		`- "extends": ["../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]`
	`2`	`+ "rulesDirectory": ["tslint-microsoft-contrib"],`
	`3`	`+ "extends": ["../../tslint.base.js", "tslint-consistent-codestyle"]`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "rulesDirectory": ["node_modules/tslint-microsoft-contrib"],`
`3`		`- "extends": ["../../../tslint.base.js", "./node_modules/tslint-consistent-codestyle"]`
	`2`	`+ "rulesDirectory": ["tslint-microsoft-contrib"],`
	`3`	`+ "extends": ["../../../tslint.base.js", "tslint-consistent-codestyle"]`
`4`	`4`	`}`