Merge branch 'master' into mrschmidt-onblocked

Author: schmidt-sebastian

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.0.4"
+    "firebase": "5.1.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc index.ts --outDir dist"
   },
   "dependencies": {
-    "firebase": "5.0.4"
+    "firebase": "5.1.0"
   },
   "devDependencies": {
     "typescript": "2.8.1"

integration/messaging/package.json

@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "5.0.4"
+    "firebase": "5.1.0"
   },
   "devDependencies": {
     "chai": "4.1.2",

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.0.4"
+    "firebase": "5.1.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "5.0.4"
+    "firebase": "5.1.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.47",

packages/auth-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth-types",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "@firebase/auth Types",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/auth",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "main": "dist/auth.js",
   "module": "dist/auth.esm.js",
   "description": "Javascript library for Firebase Auth SDK",
@@ -19,7 +19,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/auth-types": "0.3.3"
+    "@firebase/auth-types": "0.3.4"
   },
   "devDependencies": {
     "closure-builder": "2.2.39",

packages/database/src/core/util/libs/parser.ts

@@ -43,7 +43,7 @@ function decodePath(pathString: string): string {
  */
 function decodeQuery(queryString: string): { [key: string]: string } {
   let results = {};
-  if (queryString.startsWith('?')) {
+  if (queryString.charAt(0) === '?') {
     queryString = queryString.substring(1);
   }
   for (const segment of queryString.split('&')) {

packages/firebase/index.d.ts

@@ -132,7 +132,7 @@ declare namespace firebase.app {
     options: Object;
     storage(url?: string): firebase.storage.Storage;
     firestore(): firebase.firestore.Firestore;
-    functions(): firebase.functions.Functions;
+    functions(region?: string): firebase.functions.Functions;
   }
 }
 

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "5.0.4",
+  "version": "5.1.0",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -36,11 +36,11 @@
   "react-native": "dist/index.rn.cjs.js",
   "dependencies": {
     "@firebase/app": "0.3.3",
-    "@firebase/auth": "0.5.3",
+    "@firebase/auth": "0.7.0",
     "@firebase/database": "0.3.3",
-    "@firebase/firestore": "0.5.4",
+    "@firebase/firestore": "0.5.5",
     "@firebase/functions": "0.2.4",
-    "@firebase/messaging": "0.3.4",
+    "@firebase/messaging": "0.3.5",
     "@firebase/polyfill": "0.3.3",
     "@firebase/storage": "0.2.3"
   },

packages/firestore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {

packages/functions-types/index.d.ts

@@ -44,6 +44,15 @@ export class FirebaseFunctions {
    * @return The `HttpsCallable` instance.
    */
   httpsCallable(name: string): HttpsCallable;
+
+  /**
+   * Changes this instance to point to a Cloud Functions emulator running
+   * locally. See https://firebase.google.com/docs/functions/local-emulator
+   *
+   * @param origin The origin of the local emulator, such as
+   * "http://localhost:5005".
+   */
+  useFunctionsEmulator(origin: string);
 }
 
 /**

packages/functions/index.ts

@@ -58,6 +58,6 @@ declare module '@firebase/app-types' {
     };
   }
   interface FirebaseApp {
-    functions?(): types.FirebaseFunctions;
+    functions?(region?: string): types.FirebaseFunctions;
   }
 }

packages/functions/package.json

@@ -16,6 +16,7 @@
     "test:browser": "karma start --single-run",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "nyc --reporter lcovonly -- mocha 'test/{,!(browser)/**/}*.test.ts' --require ts-node/register --require index.node.ts --retries 5 --timeout 5000 --exit",
+    "test:emulator": "env FIREBASE_FUNCTIONS_EMULATOR_ORIGIN=http://localhost:5005 run-p test:node",
     "prepare": "npm run build"
   },
   "license": "Apache-2.0",

packages/functions/src/api/service.ts

@@ -40,6 +40,7 @@ interface HttpResponse {
 export class Service implements FirebaseFunctions {
   private readonly contextProvider: ContextProvider;
   private readonly serializer = new Serializer();
+  private emulatorOrigin: string | null = null;
 
   /**
    * Creates a new Functions service for the given app and (optional) region.
@@ -64,9 +65,24 @@ export class Service implements FirebaseFunctions {
   _url(name: string): string {
     const projectId = this.app_.options.projectId;
     const region = this.region_;
+    if (this.emulatorOrigin !== null) {
+      const origin = this.emulatorOrigin;
+      return `${origin}/${projectId}/${region}/${name}`;
+    }
     return `https://${region}-${projectId}.cloudfunctions.net/${name}`;
   }
 
+  /**
+   * Changes this instance to point to a Cloud Functions emulator running
+   * locally. See https://firebase.google.com/docs/functions/local-emulator
+   *
+   * @param origin The origin of the local emulator, such as
+   * "http://localhost:5005".
+   */
+  useFunctionsEmulator(origin: string) {
+    this.emulatorOrigin = origin;
+  }
+
   /**
    * Returns a reference to the callable https trigger with the given name.
    * @param name The name of the trigger.

packages/functions/test/callable.test.ts

@@ -51,7 +51,10 @@ describe('Firebase Functions > Call', () => {
   let functions: Service;
 
   before(() => {
-    const projectId = TEST_PROJECT.projectId;
+    const useEmulator = !!process.env.FIREBASE_FUNCTIONS_EMULATOR_ORIGIN;
+    const projectId = useEmulator
+      ? 'functions-integration-test'
+      : TEST_PROJECT.projectId;
     const messagingSenderId = 'messaging-sender-id';
     const region = 'us-central1';
     try {
@@ -63,6 +66,11 @@ describe('Firebase Functions > Call', () => {
       );
     }
     functions = new Service(app, region);
+    if (useEmulator) {
+      functions.useFunctionsEmulator(
+        process.env.FIREBASE_FUNCTIONS_EMULATOR_ORIGIN
+      );
+    }
   });
 
   it('simple data', async () => {

packages/functions/test/service.test.ts

@@ -31,6 +31,15 @@ describe('Firebase Functions > Service', () => {
         'https://us-central1-my-project.cloudfunctions.net/foo'
       );
     });
+
+    it('can use emulator', () => {
+      service.useFunctionsEmulator('http://localhost:5005');
+      assert.equal(
+        service._url('foo'),
+        'http://localhost:5005/my-project/us-central1/foo'
+      );
+      service.useFunctionsEmulator(null);
+    });
   });
 
   describe('custom region constructor', () => {

packages/messaging/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/messaging",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

yarn.lock

@@ -516,12 +516,6 @@
     "@firebase/util" "0.1.10"
     tslib "^1.9.0"
 
-"@firebase/[email protected]":
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/@firebase/auth/-/auth-0.5.3.tgz#4f0d83cd5a7c173d3a7a06f904bb1084acd8a0c4"
-  dependencies:
-    "@firebase/auth-types" "0.3.3"
-
 "@firebase/[email protected]":
   version "0.2.1"
   resolved "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.2.1.tgz#f83a6d03af5f8c93276ceb89e1f31e4664c9df1b"