Merge

Author: schmidt-sebastian

.github/workflows/test-all.yml

@@ -1,6 +1,6 @@
 name: Run All Tests
 
-on:
+on: 
   pull_request:
     branches:
       - master
@@ -20,6 +20,10 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: 10.x
+    - name: install Chrome stable
+      run: |
+        sudo apt-get update
+        sudo apt-get install google-chrome-stable
     - name: Test setup and yarn install
       run: |
         cp config/ci.config.json config/project.json

.github/workflows/test-changed.yml

@@ -13,6 +13,10 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: 10.x
+    - name: install Chrome stable
+      run: |
+        sudo apt-get update
+        sudo apt-get install google-chrome-stable
     - name: Test setup and yarn install
       run: |
         cp config/ci.config.json config/project.json

integration/browserify/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.8.1"
+    "firebase": "7.8.2"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",

integration/firebase-typings/package.json

@@ -6,7 +6,7 @@
     "test": "tsc"
   },
   "dependencies": {
-    "firebase": "7.8.1"
+    "firebase": "7.8.2"
   },
   "devDependencies": {
     "typescript": "3.7.5"

integration/firestore/gulpfile.js

@@ -42,7 +42,7 @@ function copyTests() {
   const firebaseFirestoreSdk = resolve(
     __dirname,
     isPersistenceEnabled()
-      ? '../../packages/firestore/dist/index.esm.min.js'
+      ? '../../packages/firestore/dist/index.esm.js'
       : '../../packages/firestore/dist/index.memory.esm.js'
   );
   return gulp

integration/messaging/package.json

@@ -8,7 +8,7 @@
     "test:manual": "mocha --exit"
   },
   "dependencies": {
-    "firebase": "7.8.1"
+    "firebase": "7.8.2"
   },
   "devDependencies": {
     "chai": "4.2.0",

integration/typescript/package.json

@@ -6,7 +6,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.8.1"
+    "firebase": "7.8.2"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",

integration/webpack/package.json

@@ -7,7 +7,7 @@
     "test": "karma start --single-run"
   },
   "dependencies": {
-    "firebase": "7.8.1"
+    "firebase": "7.8.2"
   },
   "devDependencies": {
     "@babel/core": "7.7.7",

packages/firebase/firestore/index.min.ts

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "7.8.1",
+  "version": "7.8.2",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -42,7 +42,7 @@
     "@firebase/app-types": "0.5.1",
     "@firebase/auth": "0.13.5",
     "@firebase/database": "0.5.21",
-    "@firebase/firestore": "1.10.1",
+    "@firebase/firestore": "1.10.2",
     "@firebase/functions": "0.4.32",
     "@firebase/installations": "0.4.2",
     "@firebase/messaging": "0.6.4",

packages/firebase/package.json

@@ -147,12 +147,6 @@ const componentBuilds = pkg.components
   })
   .reduce((a, b) => a.concat(b), []);
 
-const firestoreMinifiedBuild = {
-  input: `firestore/index.min.ts`,
-  output: createUmdOutputConfig(`firebase-firestore.min.js`),
-  plugins: [...plugins, uglify()],
-  external: ['@firebase/app']
-};
 
 const firestoreMemoryBuild = {
   input: `firestore/index.memory.ts`,
@@ -277,7 +271,6 @@ const completeBuilds = [
 export default [
   ...appBuilds,
   ...componentBuilds,
-  firestoreMinifiedBuild,
   firestoreMemoryBuild,
   ...completeBuilds
 ];

packages/firebase/rollup.config.js

@@ -1,4 +1,12 @@
 # Unreleased
+- [fixed] Fixed an issue where auth credentials were not respected in Cordova
+  environments (#2626).
+- [fixed] Fixed a performance regression introduced by the addition of
+  `Query.limitToLast(n: number)` in Firestore 1.7.0 (Firebase 7.3.0) (#2620).
+- [fixed] Fixed an issue where `CollectionReference.add()` would reject
+  custom types when using `withConverter()` (#2606).
+
+# 1.9.3
 - [fixed] Fixed an issue where auth credentials were not respected in some
   Firefox or Chrome extensions. (#1491)
 - [changed] Firestore previously required that every document read in a

packages/firestore/CHANGELOG.md

@@ -1,5 +1,6 @@
 {
   "externs" :  [
+    "node_modules/@types/node/base.d.ts",
     "node_modules/typescript/lib/lib.es5.d.ts",
     "node_modules/typescript/lib/lib.dom.d.ts",
     "node_modules/typescript/lib/lib.es2015.promise.d.ts",

packages/firestore/externs.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/firestore",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "scripts": {
@@ -26,13 +26,10 @@
   "main": "dist/index.node.cjs.js",
   "mainMemoryPersistence": "dist/index.node.memory.cjs.js",
   "browser": "dist/index.cjs.js",
-  "browserMinified": "dist/index.cjs.min.js",
   "browserMemoryPersistence": "dist/index.memory.cjs.js",
   "module": "dist/index.esm.js",
-  "moduleMinified": "dist/index.esm.min.js",
   "moduleMemoryPersistence": "dist/index.memory.esm.js",
   "esm2017": "dist/index.esm2017.js",
-  "esm2017Minified": "dist/index.esm2017.min.js",
   "esm2017MemoryPersistence": "dist/index.memory.esm2017.js",
   "license": "Apache-2.0",
   "files": [

packages/firestore/package.json

@@ -64,14 +64,6 @@ const terserOptions = {
  * ES5 Builds
  */
 const es5BuildPlugins = [
-  typescriptPlugin({
-    typescript,
-    cacheRoot: './.cache/es5/'
-  }),
-  json()
-];
-
-const es5MinifiedBuildPlugins = [
   typescriptPlugin({
     typescript,
     transformers,
@@ -150,15 +142,6 @@ const es5Builds = [
     plugins: es5BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
   },
-  {
-    input: 'index.ts',
-    output: [
-      { file: pkg.browserMinified, format: 'cjs', sourcemap: true },
-      { file: pkg.moduleMinified, format: 'es', sourcemap: true }
-    ],
-    plugins: es5MinifiedBuildPlugins,
-    external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
-  },
   {
     input: 'index.memory.ts',
     output: [
@@ -190,19 +173,6 @@ const es5Builds = [
  * ES2017 Builds
  */
 const es2017BuildPlugins = [
-  typescriptPlugin({
-    typescript,
-    tsconfigOverride: {
-      compilerOptions: {
-        target: 'es2017'
-      }
-    },
-    cacheRoot: './.cache/es2017/'
-  }),
-  json({ preferConst: true })
-];
-
-const es2017MinifiedBuildPlugins = [
   typescriptPlugin({
     typescript,
     tsconfigOverride: {
@@ -230,6 +200,7 @@ const es2017Builds = [
     },
     plugins: es2017BuildPlugins,
     external: id => deps.some(dep => id === dep || id.startsWith(`${dep}/`))
+<<<<<<< HEAD
   },
   {
     input: 'index.ts',
@@ -256,6 +227,8 @@ const es2017Builds = [
       }
       return deps.some(dep => id === dep || id.startsWith(`${dep}/`));
     }
+=======
+>>>>>>> master
   }
 ];
 

packages/firestore/rollup.config.js

@@ -2405,7 +2405,10 @@ export class CollectionReference<T = firestore.DocumentData> extends Query<T>
 
   add(value: T): Promise<firestore.DocumentReference<T>> {
     validateExactNumberOfArgs('CollectionReference.add', arguments, 1);
-    validateArgType('CollectionReference.add', 'object', 1, value);
+    const convertedValue = this._converter
+      ? this._converter.toFirestore(value)
+      : value;
+    validateArgType('CollectionReference.add', 'object', 1, convertedValue);
     const docRef = this.doc();
     return docRef.set(value).then(() => docRef);
   }

packages/firestore/src/api/database.ts

@@ -29,6 +29,7 @@ import {
   isBrowserExtension,
   isElectron,
   isIE,
+  isMobileCordova,
   isReactNative,
   isUWP
 } from '@firebase/util';
@@ -275,6 +276,7 @@ export class WebChannelConnection implements Connection {
     // known to (sometimes) not include an Origin. See
     // https://github.com/firebase/firebase-js-sdk/issues/1491.
     if (
+      !isMobileCordova() &&
       !isReactNative() &&
       !isElectron() &&
       !isIE() &&

packages/firestore/src/platform_browser/webchannel_connection.ts

@@ -135,6 +135,13 @@ export class SortedSet<T> {
 
   unionWith(other: SortedSet<T>): SortedSet<T> {
     let result: SortedSet<T> = this;
+
+    // Make sure `result` always refers to the larger one of the two sets.
+    if (result.size < other.size) {
+      result = other;
+      other = this;
+    }
+
     other.forEach(elem => {
       result = result.add(elem);
     });

packages/firestore/src/util/sorted_set.ts

@@ -1219,12 +1219,9 @@ apiDescribe('Database', (persistence: boolean) => {
 
     it('for CollectionReference.withConverter()', () => {
       return withTestDb(persistence, async db => {
-        const docRef = db
-          .collection('posts')
-          .withConverter(postConverter)
-          .doc();
+        const coll = db.collection('posts').withConverter(postConverter);
 
-        await docRef.set(new Post('post', 'author'));
+        const docRef = await coll.add(new Post('post', 'author'));
         const postData = await docRef.get();
         const post = postData.data();
         expect(post).to.not.equal(undefined);

packages/firestore/test/integration/api/database.test.ts

@@ -167,6 +167,12 @@ export class WindowController implements FirebaseMessaging, FirebaseService {
             scope: DEFAULT_SW_SCOPE
           }
         );
+        
+        // The timing when browser updates sw when sw has an update is unreliable by my experiment. 
+        // It leads to version conflict when the SDK upgrades to a newer version in the main page, but 
+        // sw is stuck with the old version. For example, https://github.com/firebase/firebase-js-sdk/issues/2590
+        // The following line reliably updates sw if there was an update.
+        this.swRegistration.update().catch(() => { /* it is non blocking and we don't care if it failed */ });
       } catch (e) {
         throw ERROR_FACTORY.create(ErrorCode.FAILED_DEFAULT_REGISTRATION, {
           browserErrorMessage: e.message

packages/messaging/src/controllers/window-controller.ts

@@ -1,6 +1,6 @@
 {
   "name": "rxfire",
-  "version": "3.9.10",
+  "version": "3.9.11",
   "private": false,
   "description": "Firebase JavaScript library RxJS",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
@@ -41,7 +41,7 @@
     "rxjs": "6.x.x"
   },
   "devDependencies": {
-    "firebase": "7.8.1",
+    "firebase": "7.8.2",
     "rollup": "1.28.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0",

packages/rxfire/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/testing",
-  "version": "0.16.8",
+  "version": "0.16.9",
   "description": "",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -15,7 +15,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "firebase": "7.8.1",
+    "firebase": "7.8.2",
     "@firebase/logger": "0.1.35",
     "@firebase/util": "0.2.40",
     "@types/request": "2.48.4",

packages/testing/package.json

@@ -134,7 +134,7 @@ function initializeApp(
         ({
           getToken: async () => ({ accessToken: accessToken }),
           getUid: () => null,
-          addAuthTokenListener: (listener) => {
+          addAuthTokenListener: listener => {
             // Call listener once immediately with predefined accessToken.
             listener(accessToken);
           },

packages/testing/src/api/index.ts

@@ -26,7 +26,7 @@ export class FirestoreEmulator extends Emulator {
       // Use locked version of emulator for test to be deterministic.
       // The latest version can be found from firestore emulator doc:
       // https://firebase.google.com/docs/firestore/security/test-rules-emulator
-      'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.10.4.jar',
+      'https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.8.2.jar',
       port
     );
     this.projectId = projectId;