ref(angular): bump node version to 10, allow rxjs 6 and 7

Lms24 · Lms24 · commit 78746fb0d4f6 · 2022-04-20T12:11:42.000+02:00
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -18,7 +18,8 @@
   "peerDependencies": {
     "@angular/common": "10.x || 11.x || 12.x || 13.x",
     "@angular/core": "10.x || 11.x || 12.x || 13.x",
-    "@angular/router": "10.x || 11.x || 12.x || 13.x"
+    "@angular/router": "10.x || 11.x || 12.x || 13.x",
+    "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
     "@angular/animations": "~10.2.5",
diff --git a/packages/angular/tsconfig.cjs.json b/packages/angular/tsconfig.cjs.json
@@ -3,10 +3,6 @@
 
   "compilerOptions": {
     "module": "commonjs",
-<<<<<<< HEAD
     "outDir": "cjs"
-=======
-    "outDir": "dist"
->>>>>>> 8d33927ad (ref(angular): re-introduce tsc compile option for "legacy" package)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,6 @@`
`3`	`3`
`4`	`4`	`"compilerOptions": {`
`5`	`5`	`"module": "commonjs",`
`6`		`-<<<<<<< HEAD`
`7`	`6`	`"outDir": "cjs"`
`8`		`-=======`
`9`		`- "outDir": "dist"`
`10`		`->>>>>>> 8d33927ad (ref(angular): re-introduce tsc compile option for "legacy" package)`
`11`	`7`	`}`
`12`	`8`	`}`