From bb99e8d9c7578db782b5c2a876334820e6df6407 Mon Sep 17 00:00:00 2001
From: David East <deast@google.com>
Date: Wed, 28 Dec 2016 05:48:12 -0800
Subject: [PATCH] chore(build): Remove obsolete manual typings

---
 docs/broccoli-system-js-cli-setup.md          |  11 +-
 manual_typings/firebase3/firebase3.d.ts       | 415 ------------------
 manual_typings/manual_typings.d.ts            |   2 -
 .../mock-promises/mock-promises.d.ts          |  11 -
 pack.sh                                       |   2 +
 package.json                                  |   3 -
 6 files changed, 8 insertions(+), 436 deletions(-)
 delete mode 100644 manual_typings/firebase3/firebase3.d.ts
 delete mode 100644 manual_typings/manual_typings.d.ts
 delete mode 100644 manual_typings/mock-promises/mock-promises.d.ts
 create mode 100755 pack.sh

diff --git a/docs/broccoli-system-js-cli-setup.md b/docs/broccoli-system-js-cli-setup.md
index 3552f8438..8902a91d1 100644
--- a/docs/broccoli-system-js-cli-setup.md
+++ b/docs/broccoli-system-js-cli-setup.md
@@ -10,7 +10,7 @@
 
 ```bash
 npm install -g angular-cli
-npm install -g typings 
+npm install -g typings
 ```
 
 ### 1. Create a new project
@@ -54,7 +54,7 @@ module.exports = function(defaults) {
       // above are the existing entries
       // below are the AngularFire entries
       'angularfire2/**/*.js',
-      'firebase/*.js'      
+      'firebase/*.js'
     ]
   });
 };
@@ -92,7 +92,7 @@ AngularFire 2 and Firebase need to be mapped with System.js for module loading.
 
 ### 6. Set up @NgModule
 
-Open `/src/main.ts`, inject the Firebase providers, and specify your Firebase configuration. 
+Open `/src/main.ts`, inject the Firebase providers, and specify your Firebase configuration.
 This can be found in your project at [the Firebase Console](https://console.firebase.google.com):
 
 ```ts
@@ -107,7 +107,8 @@ export const firebaseConfig = {
   apiKey: "<your-key>",
   authDomain: "<your-project-authdomain>",
   databaseURL: "<your-database-URL>",
-  storageBucket: "<your-storage-bucket>"
+  storageBucket: "<your-storage-bucket>",
+  messagingSenderId: '<your-messaging-sender-id>'
 };
 
 @NgModule({
@@ -138,7 +139,7 @@ import { AngularFire, FirebaseListObservable } from 'angularfire2';
 })
 export class <MyApp>Component {
   constructor(af: AngularFire) {
-    
+
   }
 }
 
diff --git a/manual_typings/firebase3/firebase3.d.ts b/manual_typings/firebase3/firebase3.d.ts
deleted file mode 100644
index d4c9334ec..000000000
--- a/manual_typings/firebase3/firebase3.d.ts
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
-
-1. Delete goog namespaces
-2. Delete look of disaproval
-3. typealias firebase.Promise to Promise
-4. Union type FirebaseOAuthProvider
-5. Remove _noStructuralTyping from Promise classes
-6. Remove catch() and then() declarations from firebase.Thenable, and extend Promise<t>.
-
-*/
-declare interface FirebaseService {
-  INTERNAL: Object;
-  app: firebase.app.App;
-}
-
-declare interface FirebaseServiceNamespace {
-  app(app?: firebase.app.App): FirebaseService;
-}
-
-declare interface Observer {
-  complete(): any;
-  error(error: Object): any;
-  next(value: any): any;
-}
-
-
-declare type FirebaseOAuthProvider = firebase.auth.GithubAuthProvider |
-                                     firebase.auth.GoogleAuthProvider |
-                                     firebase.auth.FacebookAuthProvider;
-
-declare class Promise_Instance<TYPE> implements PromiseLike<TYPE> {
-  constructor(resolver: (a: (a?: TYPE | PromiseLike<TYPE> | { then: any }) => any, b: (a?: any) => any) => any);
-  catch<RESULT>(onRejected: (a: any) => RESULT): Promise<RESULT>;
-  then<VALUE, RESULT>(opt_onFulfilled?: (a: TYPE) => VALUE, opt_onRejected?: (a: any) => any): RESULT;
-}
-
-declare namespace firebase {
-  type AuthTokenData = { accessToken: string, expirationTime: number, refreshToken: string };
-}
-declare namespace firebase {
-  type AuthTokenListener = (a: string) => void;
-}
-declare namespace firebase {
-  type CompleteFn = () => void;
-}
-declare namespace firebase {
-  type ErrorFn = (a: Object) => void;
-}
-declare namespace firebase {
-  interface FirebaseError {
-    code: string;
-    message: string;
-    name: string;
-    stack: string;
-  }
-}
-declare namespace firebase {
-  type NextFn = (a: any) => void;
-}
-declare namespace firebase {
-  class Promise<T> extends Promise_Instance<T> {
-    static all(values: firebase.Promise<any>[]): firebase.Promise<any[]>;
-    static reject(error: Object): firebase.Promise<any>;
-    static resolve<T>(value: T): firebase.Promise<T>;
-  }
-  class Promise_Instance<T> implements firebase.Thenable<any> {
-    constructor(resolver: (a?: (a: T) => void, b?: (a: Object) => void) => any);
-    catch(onReject?: (a: Object) => any): firebase.Thenable<any>;
-    then(onResolve?: (a: T) => any, onReject?: (a: Object) => any): firebase.Promise<any>;
-  }
-}
-declare namespace firebase {
-  var SDK_VERSION: string;
-}
-declare namespace firebase {
-  type Subscribe = (a?: ((a: any) => void) | Observer, b?: (a: Object) => void, c?: () => void) => () => void;
-}
-declare namespace firebase {
-  interface Thenable<T> extends Promise<T> {
-    //Removed definitions of catch() and then(), and extended Promise.
-  }
-}
-declare namespace firebase {
-  type Unsubscribe = () => void;
-}
-declare namespace firebase {
-  interface User extends firebase.UserInfo {
-    delete(): firebase.Promise<void>;
-    emailVerified: boolean;
-    getToken(opt_forceRefresh?: boolean): firebase.Promise<string>;
-    isAnonymous: boolean;
-    link(credential: firebase.auth.AuthCredential): firebase.Promise<firebase.User>;
-    linkWithPopup(provider: firebase.auth.AuthProvider): firebase.Promise<{ credential: firebase.auth.AuthCredential, user: firebase.User }>;
-    linkWithRedirect(provider: firebase.auth.AuthProvider): firebase.Promise<void>;
-    providerData: (firebase.UserInfo)[];
-    reauthenticate(credential: firebase.auth.AuthCredential): firebase.Promise<void>;
-    refreshToken: string;
-    reload(): firebase.Promise<void>;
-    sendEmailVerification(): firebase.Promise<void>;
-    unlink(providerId: string): firebase.Promise<firebase.User>;
-    updateEmail(newEmail: string): firebase.Promise<void>;
-    updatePassword(newPassword: string): firebase.Promise<void>;
-    updateProfile(profile: { displayName: string, photoURL: string }): firebase.Promise<void>;
-  }
-}
-declare namespace firebase {
-  interface UserInfo {
-    displayName: string;
-    email: string;
-    photoURL: string;
-    providerId: string;
-    uid: string;
-  }
-}
-declare namespace firebase {
-  function app(name: string): firebase.app.App;
-}
-declare namespace firebase.app {
-  interface App {
-    INTERNAL: Object;
-    auth(): firebase.auth.Auth;
-    database(): firebase.database.Database;
-    delete(): firebase.Promise<any>;
-    name: string;
-    options: Object;
-    storage(): firebase.storage.Storage;
-  }
-}
-declare namespace firebase {
-  var apps: (firebase.app.App)[];
-}
-declare namespace firebase {
-  function auth(app?: firebase.app.App): firebase.auth.Auth;
-}
-declare namespace firebase.auth {
-  interface ActionCodeInfo {
-  }
-}
-declare namespace firebase.auth {
-  interface Auth {
-    app: firebase.app.App;
-    applyActionCode(code: string): firebase.Promise<void>;
-    checkActionCode(code: string): firebase.Promise<firebase.auth.ActionCodeInfo>;
-    confirmPasswordReset(code: string, newPassword: string): firebase.Promise<void>;
-    createUserWithEmailAndPassword(email: string, password: string): firebase.Promise<firebase.User>;
-    currentUser: firebase.User;
-    fetchProvidersForEmail(email: string): firebase.Promise<string[]>;
-    getRedirectResult(): firebase.Promise<{ credential: firebase.auth.AuthCredential, user: firebase.User }>;
-    onAuthStateChanged(nextOrObserver: Object, opt_error?: (a: firebase.auth.Error) => any, opt_completed?: () => any): () => any;
-    sendPasswordResetEmail(email: string): firebase.Promise<void>;
-    signInAnonymously(): firebase.Promise<firebase.User>;
-    signInWithCredential(credential: firebase.auth.AuthCredential): firebase.Promise<firebase.User>;
-    signInWithCustomToken(token: string): firebase.Promise<firebase.User>;
-    signInWithEmailAndPassword(email: string, password: string): firebase.Promise<firebase.User>;
-    signInWithPopup(provider: firebase.auth.AuthProvider): firebase.Promise<{ credential: firebase.auth.AuthCredential, user: firebase.User }>;
-    signInWithRedirect(provider: firebase.auth.AuthProvider): firebase.Promise<void>;
-    signOut(): firebase.Promise<void>;
-    verifyPasswordResetCode(code: string): firebase.Promise<string>;
-  }
-}
-declare namespace firebase.auth {
-  interface AuthCredential {
-    provider: string;
-  }
-}
-declare namespace firebase.auth {
-  interface AuthProvider {
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  class EmailAuthProvider extends EmailAuthProvider_Instance {
-    static PROVIDER_ID: string;
-  }
-  class EmailAuthProvider_Instance implements firebase.auth.AuthProvider {
-    private noStructuralTyping_: any;
-    credential(email: string, password: string): firebase.auth.AuthCredential;
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  interface Error {
-    code: string;
-    message: string;
-  }
-}
-declare namespace firebase.auth {
-  class FacebookAuthProvider extends FacebookAuthProvider_Instance {
-    static PROVIDER_ID: string;
-  }
-  class FacebookAuthProvider_Instance implements firebase.auth.AuthProvider {
-    private noStructuralTyping_: any;
-    addScope(scope: string): any;
-    credential(token: string): firebase.auth.AuthCredential;
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  class GithubAuthProvider extends GithubAuthProvider_Instance {
-    static PROVIDER_ID: string;
-    // TODO fix upstream
-    static credential(token: string): firebase.auth.AuthCredential;
-  }
-  class GithubAuthProvider_Instance implements firebase.auth.AuthProvider {
-    private noStructuralTyping_: any;
-    addScope(scope: string): any;
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  class GoogleAuthProvider extends GoogleAuthProvider_Instance {
-    static PROVIDER_ID: string;
-  }
-  class GoogleAuthProvider_Instance implements firebase.auth.AuthProvider {
-    private noStructuralTyping_: any;
-    addScope(scope: string): any;
-    credential(idToken?: string, accessToken?: string): firebase.auth.AuthCredential;
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  class TwitterAuthProvider extends TwitterAuthProvider_Instance {
-    static PROVIDER_ID: string;
-    // TODO fix this upstream
-    static credential(token: string, secret: string): firebase.auth.AuthCredential;
-  }
-  class TwitterAuthProvider_Instance implements firebase.auth.AuthProvider {
-    private noStructuralTyping_: any;
-    providerId: string;
-  }
-}
-declare namespace firebase.auth {
-  type UserCredential = { credential: firebase.auth.AuthCredential, user: firebase.User };
-}
-declare namespace firebase {
-  function database(app?: firebase.app.App): firebase.database.Database;
-}
-declare namespace firebase.database {
-  interface DataSnapshot {
-    child(path: string): firebase.database.DataSnapshot;
-    exists(): boolean;
-    exportVal(): any;
-    forEach(action: (a: firebase.database.DataSnapshot) => boolean): boolean;
-    getPriority(): string | number;
-    hasChild(path: string): boolean;
-    hasChildren(): boolean;
-    key: string;
-    numChildren(): number;
-    ref: firebase.database.Reference;
-    val(): any;
-  }
-}
-declare namespace firebase.database {
-  interface Database {
-    app: firebase.app.App;
-    goOffline(): any;
-    goOnline(): any;
-    ref(path?: string): firebase.database.Reference;
-    refFromURL(url: string): firebase.database.Reference;
-  }
-}
-declare namespace firebase.database {
-  interface OnDisconnect {
-    cancel(onComplete?: (a: Object) => any): firebase.Promise<void>;
-    remove(onComplete?: (a: Object) => any): firebase.Promise<void>;
-    set(value: any, onComplete?: (a: Object) => any): firebase.Promise<void>;
-    setWithPriority(value: any, priority: number | string, onComplete?: (a: Object) => any): firebase.Promise<void>;
-    update(values: Object, onComplete?: (a: Object) => any): firebase.Promise<void>;
-  }
-}
-declare namespace firebase.database {
-  interface Query {
-    endAt(value: number | string | boolean, key?: string): firebase.database.Query;
-    equalTo(value: number | string | boolean, key?: string): firebase.database.Query;
-    limitToFirst(limit: number): firebase.database.Query;
-    limitToLast(limit: number): firebase.database.Query;
-    off(eventType?: string, callback?: (a: firebase.database.DataSnapshot, b?: string) => any, context?: Object): any;
-    on(eventType: string, callback: (a: firebase.database.DataSnapshot, b?: string) => any, cancelCallbackOrContext?: Object, context?: Object): (a: firebase.database.DataSnapshot, b?: string) => any;
-    once(eventType: string, callback?: (a: firebase.database.DataSnapshot, b?: string) => any): firebase.Promise<any>;
-    orderByChild(path: string): firebase.database.Query;
-    orderByKey(): firebase.database.Query;
-    orderByPriority(): firebase.database.Query;
-    orderByValue(): firebase.database.Query;
-    ref: firebase.database.Reference;
-    startAt(value: number | string | boolean, key?: string): firebase.database.Query;
-    toString(): string;
-  }
-}
-declare namespace firebase.database {
-  interface Reference extends firebase.database.Query {
-    child(path: string): firebase.database.Reference;
-    key: string;
-    onDisconnect(): firebase.database.OnDisconnect;
-    parent: firebase.database.Reference;
-    push(value?: any, onComplete?: (a: Object) => any): firebase.database.ThenableReference;
-    remove(onComplete?: (a: Object) => any): firebase.Promise<void>;
-    root: firebase.database.Reference;
-    set(value: any, onComplete?: (a: Object) => any): firebase.Promise<void>;
-    setPriority(priority: string | number, onComplete: (a: Object) => any): firebase.Promise<void>;
-    setWithPriority(newVal: any, newPriority: string | number, onComplete?: (a: Object) => any): firebase.Promise<void>;
-    transaction(transactionUpdate: (a: any) => any, onComplete?: (a: Object, b: boolean, c: firebase.database.DataSnapshot) => any, applyLocally?: boolean): firebase.Promise<{ committed: boolean, snapshot: firebase.database.DataSnapshot }>;
-    update(values: Object, onComplete?: (a: Object) => any): firebase.Promise<void>;
-  }
-}
-declare namespace firebase.database.ServerValue {
-}
-declare namespace firebase.database {
-  interface ThenableReference extends firebase.database.Reference, firebase.Thenable<void> {
-  }
-}
-declare namespace firebase.database {
-  function enableLogging(logger?: any, persistent?: boolean): any;
-}
-declare namespace firebase {
-  function initializeApp(options: Object, name?: string): firebase.app.App;
-}
-declare namespace firebase {
-  function storage(app?: firebase.app.App): firebase.storage.Storage;
-}
-declare namespace firebase.storage {
-  interface FullMetadata extends firebase.storage.UploadMetadata {
-    bucket: string;
-    downloadURLs: string[];
-    fullPath: string;
-    generation: string;
-    metageneration: string;
-    name: string;
-    size: number;
-    timeCreated: string;
-    updated: string;
-  }
-}
-declare namespace firebase.storage {
-  interface Reference {
-    bucket: string;
-    child(path: string): firebase.storage.Reference;
-    delete(): Promise<void>;
-    fullPath: string;
-    getDownloadURL(): Promise<string>;
-    getMetadata(): Promise<firebase.storage.FullMetadata>;
-    name: string;
-    parent: firebase.storage.Reference;
-    put(blob: Blob, metadata?: firebase.storage.UploadMetadata): firebase.storage.UploadTask;
-    root: firebase.storage.Reference;
-    storage: firebase.storage.Storage;
-    toString(): string;
-    updateMetadata(metadata: firebase.storage.SettableMetadata): Promise<firebase.storage.FullMetadata>;
-  }
-}
-declare namespace firebase.storage {
-  interface SettableMetadata {
-    cacheControl: string;
-    contentDisposition: string;
-    contentEncoding: string;
-    contentLanguage: string;
-    contentType: string;
-    customMetadata: { [key: string]: string };
-  }
-}
-declare namespace firebase.storage {
-  interface Storage {
-    app: firebase.app.App;
-    maxOperationRetryTime: number;
-    maxUploadRetryTime: number;
-    ref(path?: string): firebase.storage.Reference;
-    refFromURL(url: string): firebase.storage.Reference;
-    setMaxOperationRetryTime(time: number): any;
-    setMaxUploadRetryTime(time: number): any;
-  }
-}
-declare namespace firebase.storage {
-  type TaskEvent = string;
-  var TaskEvent: {
-    STATE_CHANGED: TaskEvent,
-  };
-}
-declare namespace firebase.storage {
-  type TaskState = string;
-  var TaskState: {
-    CANCELED: TaskState,
-    ERROR: TaskState,
-    PAUSED: TaskState,
-    RUNNING: TaskState,
-    SUCCESS: TaskState,
-  };
-}
-declare namespace firebase.storage {
-  interface UploadMetadata extends firebase.storage.SettableMetadata {
-    md5Hash: string;
-  }
-}
-declare namespace firebase.storage {
-  interface UploadTask {
-    cancel(): boolean;
-    on(event: firebase.storage.TaskEvent, nextOrObserver?: Object, error?: (a: Object) => any, complete?: () => any): (...a: any[]) => any;
-    pause(): boolean;
-    resume(): boolean;
-    snapshot: firebase.storage.UploadTaskSnapshot;
-  }
-}
-declare namespace firebase.storage {
-  interface UploadTaskSnapshot {
-    bytesTransferred: number;
-    downloadURL: string;
-    metadata: firebase.storage.FullMetadata;
-    ref: firebase.storage.Reference;
-    state: firebase.storage.TaskState;
-    task: firebase.storage.UploadTask;
-    totalBytes: number;
-  }
-}
-
-declare module 'firebase' {
-  export = firebase;
-}
diff --git a/manual_typings/manual_typings.d.ts b/manual_typings/manual_typings.d.ts
deleted file mode 100644
index 11c113fd8..000000000
--- a/manual_typings/manual_typings.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/// <reference path="mock-promises/mock-promises.d.ts" />
-/// <reference path="firebase3/firebase3.d.ts" />
diff --git a/manual_typings/mock-promises/mock-promises.d.ts b/manual_typings/mock-promises/mock-promises.d.ts
deleted file mode 100644
index 37418ec39..000000000
--- a/manual_typings/mock-promises/mock-promises.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-interface MockPromises {
-  executeForPromise(p: Promise <any>): void;
-  reset(): void;
-  getMockPromise(p: any): any;
-}
-
-declare var mockPromises: MockPromises;
-
-declare module 'mock-promises' {
-	export = mockPromises;
-}
diff --git a/pack.sh b/pack.sh
new file mode 100755
index 000000000..63d689c57
--- /dev/null
+++ b/pack.sh
@@ -0,0 +1,2 @@
+# Creates a local build of AngularFire2
+npm run build_npm && npm pack dist
\ No newline at end of file
diff --git a/package.json b/package.json
index 66de3dfea..8c92b3271 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "conventional-changelog-cli": "^1.2.0",
     "es6-module-loader": "^0.17.10",
     "es6-shim": "^0.35.0",
-    "firebase-server": "^0.5.2",
     "gulp": "^3.9.0",
     "gulp-jasmine": "^2.2.1",
     "gulp-typescript": "^2.10.0",
@@ -76,10 +75,8 @@
     "systemjs": "^0.19.16",
     "systemjs-builder": "^0.15.7",
     "traceur": "0.0.96",
-    "tsd": "^0.6.5",
     "typedoc": "github:jeffbcross/typedoc",
     "typescript": "^2.0.2",
-    "typings": "^1.3.2",
     "zone.js": "^0.6.26"
   },
   "typings": "index.d.ts"