Skip to content

Commit

Permalink
chore(typescript): Replace typings with @types and fixed TS issues
Browse files Browse the repository at this point in the history
  • Loading branch information
dotansimha committed Nov 3, 2016
1 parent 3c92baa commit ae96888
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions dist/MeteorObservable.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="meteor-typings" />
import { Observable } from 'rxjs';
/**
* A class with static methods, which wraps Meteor's API and returns
Expand Down
1 change: 1 addition & 0 deletions dist/ObservableCollection.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="meteor-typings" />
import { Observable } from 'rxjs';
import { ObservableCursor } from './ObservableCursor';
import Selector = Mongo.Selector;
Expand Down
1 change: 1 addition & 0 deletions dist/ObservableCursor.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="meteor-typings" />
import { Observable } from 'rxjs';
export declare class ObservableCursor<T> extends Observable<T[]> {
private _zone;
Expand Down
2 changes: 1 addition & 1 deletion dist/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function isCallbacksObject(callbacks) {
;
export var g = typeof global === 'object' ? global :
typeof window === 'object' ? window :
typeof self === 'object' ? self : this;
typeof self === 'object' ? self : undefined;
var METEOR_RXJS_ZONE = 'meteor-rxjs-zone';
var fakeZone = {
name: METEOR_RXJS_ZONE,
Expand Down
1 change: 1 addition & 0 deletions dist/zone.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/// <reference types="zone.js" />
import { Observable } from 'rxjs';
export declare function zone<T>(zone?: Zone): Observable<T>;
export interface ZoneSignature<T> {
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"rxjs": "^5.0.0-beta.12"
},
"devDependencies": {
"meteor-typings": "1.3.1",
"@types/mocha": "2.2.32",
"@types/underscore": "1.7.33",
"conventional-changelog": "1.1.0",
Expand All @@ -51,8 +52,6 @@
"rollup": "0.36.3",
"rxjs": "^5.0.0-beta.12",
"tslint": "3.15.1",
"typescript": "2.0.6",
"typings": "1.5.0",
"validate-commit-msg": "2.8.2",
"zone.js": "^0.6.22"
}
Expand Down
2 changes: 2 additions & 0 deletions src/ObservableCursor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import {Observable, Subscriber, Subject} from 'rxjs';
import {gZone, forkZone, removeObserver} from './utils';

declare let _;

export class ObservableCursor<T> extends Observable<T[]> {
private _zone: Zone;
private _data: Array <T> = [];
Expand Down
4 changes: 3 additions & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import {Subscriber} from 'rxjs';

declare let _;

export declare type CallbacksObject = {
onReady?: Function;
onError?: Function;
Expand All @@ -27,7 +29,7 @@ declare const global;
export const g =
typeof global === 'object' ? global :
typeof window === 'object' ? window :
typeof self === 'object' ? self : this;
typeof self === 'object' ? self : undefined;

const METEOR_RXJS_ZONE = 'meteor-rxjs-zone';

Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"rootDir": "./src"
},
"files": [
"src/index.ts",
"typings/index.d.ts"
"typings.d.ts",
"src/index.ts"
],
"exclude": [
"node_modules"
Expand Down
3 changes: 3 additions & 0 deletions typings.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/// <reference types="zone.js" />
/// <reference types="meteor-typings" />
/// <reference types="@types/underscore" />
6 changes: 0 additions & 6 deletions typings.json

This file was deleted.

0 comments on commit ae96888

Please sign in to comment.