Merge pull request #39 from bullhorn/revert-38-bh10-update-packages

Revert "fix dependencies"

.gitignore

@@ -62,5 +62,3 @@ typings/
 
 # IDEs and editors
 /.idea
-
-.vscode

package.json

@@ -30,16 +30,16 @@
     "npm": ">= 5"
   },
   "peerDependencies": {
-    "rxjs": ">=6"
+    "@bullhorn/bullhorn-types": "^0.3.0",
+    "rxjs": "^6.0.0"
   },
   "dependencies": {
     "axios": "^0.18.0",
     "localforage": "1.7.3",
-    "rxjs": "^6.4.0",
     "uuid-random": "1.0.9"
   },
   "devDependencies": {
-    "@bullhorn/bullhorn-types": "^1.10.0",
+    "@bullhorn/bullhorn-types": "^0.3.0",
     "@types/jest": "^22.2.0",
     "@types/node": "^8.10.10",
     "jest": "^22.4.3",
@@ -55,16 +55,18 @@
     "rollup-plugin-sourcemaps": "^0.4.0",
     "rollup-plugin-typescript2": "^0.13.0",
     "rollup-plugin-uglify": "^3.0.0",
+    "rxjs": "^6.0.0",
     "semantic-release": "^15.13.2",
     "sinon": "^4.5.0",
     "temp-dir": "^1.0.0",
     "travis-deploy-once": "^4.3.2",
     "ts-jest": "^22.4.0",
     "ts-node": "^6.0.0",
     "tslib": "^1.9.0",
-    "tslint": "^5.19.0",
+    "tslint": "^5.9.0",
+    "tslint-xo": "^0.7.0",
     "typedoc": "^0.11.0",
-    "typescript": "3.2.4"
+    "typescript": "~3.1.6"
   },
   "scripts": {
     "build": "npm run clean && rollup -c",

src/core/EntityListOptions.ts

@@ -33,8 +33,8 @@ export function observeListOptions(options: EntityListOptions, audit: boolean =
     return of(null);
   }
 
-  return new Observable((observer: Observer<SerializedListOptions>) => {
-    let combined = combineLatest([
+  return Observable.create((observer: Observer<SerializedListOptions>) => {
+    let combined = combineLatest(
       getOrCreateObservable('fields', options),
       getOrCreateObservable('layout', options),
       getOrCreateObservable('meta', options),
@@ -43,7 +43,7 @@ export function observeListOptions(options: EntityListOptions, audit: boolean =
       getOrCreateObservable('limitTo', options),
       getOrCreateObservable('filter', options),
       getOrCreateObservable('params', options),
-    ]);
+    );
     if (audit) {
       combined = combined.pipe(auditTime(0));
     }

src/core/EntityOptions.ts

@@ -35,8 +35,8 @@ export function observeOptions(options: EntityOptions, audit: boolean = true): O
     return of(null);
   }
 
-  return new Observable((observer: Observer<SerializedOptions>) => {
-    let combined = combineLatest([
+  return Observable.create((observer: Observer<SerializedOptions>) => {
+    let combined = combineLatest(
       getOrCreateObservable('id', options),
       getOrCreateObservable('fields', options),
       getOrCreateObservable('layout', options),
@@ -45,7 +45,7 @@ export function observeOptions(options: EntityOptions, audit: boolean = true): O
       getOrCreateObservable('showReadOnly', options),
       getOrCreateObservable('executeFormTriggers', options),
       getOrCreateObservable('params', options),
-    ]);
+    );
     if (audit) {
       combined = combined.pipe(auditTime(0));
     }
@@ -89,6 +89,7 @@ export function observeOptions(options: EntityOptions, audit: boolean = true): O
   });
 }
 
+// tslint:disable-next-line:only-arrow-functions
 export function getOrCreateObservable(key: string, options: EntityOptions): Observable<Primitive> {
   if (isObservable(options[key])) {
     return options[key];

tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
     "moduleResolution": "node",
-    "target": "es2015",
-    "module": "esnext",
-    "lib": ["es2017", "dom"],
+    "target": "es5",
+    "module":"es2015",
+    "lib": ["es2015", "es2016", "es2017", "dom"],
     "sourceMap": true,
     "declaration": true,
     "allowSyntheticDefaultImports": true,
@@ -12,9 +12,15 @@
     "noStrictGenericChecks": true,
     "declarationDir": "lib/types",
     "outDir": "lib/es2015",
-    "typeRoots": ["node_modules/@types"]
+    "typeRoots": [
+      "node_modules/@types"
+    ]
   },
-  "include": ["src/**/*.ts"],
-  "exclude": ["node_modules/**"],
+  "include": [
+    "src/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules/**"
+  ],
   "compileOnSave": false
 }

tslint.json

@@ -1,11 +1,13 @@
 {
+  "extends": "tslint-xo/space",
   "rules": {
     "arrow-parens": false,
     "no-import-side-effect": false,
     "newline-before-return": false,
     "no-unnecessary-type-annotation": false,
     "no-stateless-class": false,
     "space-before-function-paren": false,
-    "variable-name": [true, "check-format", "ban-keywords", "allow-leading-underscore"]
+    "variable-name": [true, "check-format", "ban-keywords", "allow-leading-underscore"],
+    "object-curly-spacing": [true, "always"]
   }
 }