Merge branch 'master' into mrschmidt/rewritefieldvalue

Author: schmidt-sebastian

config/functions/package.json

@@ -3,7 +3,7 @@
   "description": "Cloud Functions for Firebase",
   "dependencies": {
     "cors": "2.8.5",
-    "firebase-admin": "8.9.2",
+    "firebase-admin": "8.10.0",
     "firebase-functions": "3.3.0"
   },
   "private": true,

integration/browserify/package.json

@@ -21,7 +21,7 @@
     "karma-mocha": "1.3.0",
     "karma-sauce-launcher": "1.2.0",
     "karma-spec-reporter": "0.0.32",
-    "mkdirp": "0.5.1",
+    "mkdirp": "0.5.3",
     "mocha": "7.1.0"
   }
 }

integration/firestore/gulpfile.js

@@ -27,6 +27,10 @@ function clean() {
   return del(['temp/**/*', 'dist/**/*']);
 }
 
+function isPersistenceEnabled() {
+  return process.env.INCLUDE_FIRESTORE_PERSISTENCE !== 'false';
+}
+
 function copyTests() {
   /**
    * NOTE: We intentionally don't copy src/ files (to make sure we are only
@@ -37,7 +41,9 @@ function copyTests() {
   const firebaseAppSdk = 'firebase/app/dist/index.esm.js';
   const firebaseFirestoreSdk = resolve(
     __dirname,
-    '../../packages/firestore/dist/index.esm.js'
+    isPersistenceEnabled()
+      ? '../../packages/firestore/dist/index.esm.js'
+      : '../../packages/firestore/dist/index.memory.esm.js'
   );
   return gulp
     .src(
@@ -63,7 +69,14 @@ function copyTests() {
          */
         /import\s+firebase\s+from\s+('|")[^\1]+firebase_export\1;?/,
         `import firebase from '${firebaseAppSdk}';
-         import '${firebaseFirestoreSdk}';`
+         import '${firebaseFirestoreSdk}';
+         
+         if (typeof process === 'undefined') {
+           process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
+         } else {
+           process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
+         }
+         `
       )
     )
     .pipe(

integration/firestore/package.json

@@ -3,13 +3,14 @@
   "version": "1.0.1",
   "private": true,
   "scripts": {
-    "build": "gulp compile-tests",
-    "build:deps": "cd ../../ ; yarn build",
-    "pretest:manual": "yarn build",
-    "pretest:debug": "yarn build:deps && yarn build",
-    "test": "echo 'Automated tests temporarily disabled, run `yarn test:manual` to execute these tests'",
-    "test:manual": "karma start --single-run",
-    "test:debug": "karma start --auto-watch --browsers Chrome"
+    "build:deps": "cd ../../packages/firestore ; yarn build",
+    "build:persistence": "INCLUDE_FIRESTORE_PERSISTENCE=true gulp compile-tests",
+    "build:memory": "INCLUDE_FIRESTORE_PERSISTENCE=false gulp compile-tests",
+    "test": "yarn build:memory; karma start --single-run; yarn build:persistence; karma start --single-run;",
+    "test:persistence": " yarn build:persistence; karma start --single-run",
+    "test:memory": "yarn build:memory; karma start --single-run",
+    "test:debug:persistence": "yarn build:deps; yarn build:persistence; karma start --auto-watch --browsers Chrome",
+    "test:debug:memory": "yarn build:deps; yarn build:memory; karma start --single-run"
   },
   "devDependencies": {
     "@types/mocha": "7.0.2",

integration/typescript/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "@babel/core": "7.8.7",
     "@babel/preset-env": "7.8.7",
-    "@types/chai": "4.2.10",
+    "@types/chai": "4.2.11",
     "@types/mocha": "7.0.2",
     "chai": "4.2.0",
     "karma": "4.4.1",

package.json

@@ -48,16 +48,16 @@
     "integration/*"
   ],
   "devDependencies": {
-    "@types/chai": "4.2.10",
+    "@types/chai": "4.2.11",
     "@types/chai-as-promised": "7.1.2",
     "@types/long": "4.0.1",
     "@types/mocha": "7.0.2",
     "@types/node": "8.10.59",
     "@types/sinon": "7.5.2",
     "@types/sinon-chai": "3.2.3",
-    "@typescript-eslint/eslint-plugin": "2.23.0",
-    "@typescript-eslint/eslint-plugin-tslint": "2.23.0",
-    "@typescript-eslint/parser": "2.23.0",
+    "@typescript-eslint/eslint-plugin": "2.24.0",
+    "@typescript-eslint/eslint-plugin-tslint": "2.24.0",
+    "@typescript-eslint/parser": "2.24.0",
     "babel-loader": "8.0.6",
     "chai": "4.2.0",
     "chai-as-promised": "7.1.1",
@@ -72,13 +72,13 @@
     "express": "4.17.1",
     "find-free-port": "2.0.0",
     "firebase-functions": "3.3.0",
-    "firebase-tools": "7.14.0",
+    "firebase-tools": "7.15.1",
     "git-rev-sync": "2.0.0",
     "glob": "7.1.6",
     "http-server": "0.12.1",
     "husky": "4.2.3",
     "indexeddbshim": "5.0.0",
-    "inquirer": "7.0.6",
+    "inquirer": "7.1.0",
     "istanbul-instrumenter-loader": "3.0.1",
     "js-yaml": "3.13.1",
     "karma": "4.4.1",
@@ -98,7 +98,7 @@
     "listr": "0.14.3",
     "long": "3.2.0",
     "merge2": "1.3.0",
-    "mkdirp": "0.5.1",
+    "mkdirp": "0.5.3",
     "mocha": "7.1.0",
     "mz": "2.7.0",
     "npm-run-all": "4.1.5",
@@ -109,18 +109,18 @@
     "protractor": "5.4.2",
     "rxjs": "6.5.4",
     "semver": "7.1.3",
-    "simple-git": "1.131.0",
-    "sinon": "9.0.0",
+    "simple-git": "1.132.0",
+    "sinon": "9.0.1",
     "sinon-chai": "3.5.0",
     "source-map-loader": "0.2.4",
     "ts-loader": "6.2.1",
     "ts-node": "8.6.2",
     "tslint": "6.1.0",
-    "typedoc": "0.16.11",
+    "typedoc": "0.17.0",
     "typescript": "3.8.3",
     "watch": "1.0.2",
     "webpack": "4.42.0",
-    "yargs": "15.3.0",
+    "yargs": "15.3.1",
     "lodash": "4.17.15"
   }
 }

packages/auth/demo/functions/package.json

@@ -9,7 +9,7 @@
     "logs": "firebase functions:log"
   },
   "dependencies": {
-    "firebase-admin": "8.9.2",
+    "firebase-admin": "8.10.0",
     "firebase-functions": "3.3.0"
   },
   "private": true

packages/auth/demo/functions/yarn.lock

@@ -674,10 +674,10 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-firebase-admin@8.9.2:
-  version "8.9.2"
-  resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.9.2.tgz#248ba184dc13b4929b043870a2067787a0dd013e"
-  integrity sha512-ix4qcx+hHnr3mnc41Z8EzQa9Mr+2nhogLEv6ktkOCCpdKJ+9HxW9vikRCElSbC8ICHLD0KIH0GVOIZK80vbvqw==
+firebase-admin@8.10.0:
+  version "8.10.0"
+  resolved "https://registry.npmjs.org/firebase-admin/-/firebase-admin-8.10.0.tgz#4a838aec52df49845eba07ad59a40b4df996e815"
+  integrity sha512-QzJZ1sBh9xzKjb44aP6m1duy0Xe1ixexwh0eaOt1CkJYCOq2b6bievK4GNWMl5yGQ7FFBEbZO6hyDi+5wrctcg==
   dependencies:
     "@firebase/database" "^0.5.17"
     "@types/node" "^8.10.59"

packages/auth/src/authcredential.js

@@ -36,7 +36,7 @@ goog.provide('fireauth.SAMLAuthCredential');
 goog.provide('fireauth.SAMLAuthProvider');
 goog.provide('fireauth.TwitterAuthProvider');
 
-goog.forwardDeclare('fireauth.RpcHandler');
+goog.requireType('fireauth.RpcHandler');
 goog.require('fireauth.ActionCodeInfo');
 goog.require('fireauth.ActionCodeURL');
 goog.require('fireauth.AuthError');

packages/firebase/firestore/memory/index.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This file serves as the public entrypoint for users that import 
+ * `firebase/firestore/memory`.
+ */
+
+import '../../../firestore/dist/index.memory.esm';

packages/firebase/firestore/memory/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "firebase/firestore/memory",
+  "description": "A memory-only build of the Cloud Firestore JS SDK.",
+  "main": "dist/index.cjs.js",
+  "module": "dist/index.esm.js",
+  "typings": "../../empty-import.d.ts",
+}

packages/firebase/firestore/package.json

@@ -1,5 +1,6 @@
 {
   "name": "firebase/firestore",
+  "description": "The Cloud Firestore component of the Firebase JS SDK.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "typings": "../empty-import.d.ts"

packages/firebase/package.json

@@ -59,7 +59,7 @@
     "rollup-plugin-license": "0.13.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-sourcemaps": "0.5.0",
-    "rollup-plugin-terser": "5.2.0",
+    "rollup-plugin-terser": "5.3.0",
     "rollup-plugin-typescript2": "0.26.0",
     "rollup-plugin-uglify": "6.0.4",
     "typescript": "3.8.3"

packages/firebase/rollup.config.js

@@ -147,6 +147,32 @@ const componentBuilds = pkg.components
   })
   .reduce((a, b) => a.concat(b), []);
 
+const firestoreMemoryBuilds = [
+  {
+    input: `firestore/memory/index.ts`,
+    output: [
+      {
+        file: resolve('firestore/memory', pkg.main),
+        format: 'cjs',
+        sourcemap: true
+      },
+      {
+        file: resolve('firestore/memory', pkg.module),
+        format: 'es',
+        sourcemap: true
+      }
+    ],
+    plugins,
+    external
+  },
+  {
+    input: `firestore/memory/index.ts`,
+    output: createUmdOutputConfig(`firebase-firestore.memory.js`),
+    plugins: [...plugins, uglify()],
+    external: ['@firebase/app']
+  }
+];
+
 /**
  * Complete Package Builds
  */
@@ -260,4 +286,9 @@ const completeBuilds = [
   }
 ];
 
-export default [...appBuilds, ...componentBuilds, ...completeBuilds];
+export default [
+  ...appBuilds,
+  ...componentBuilds,
+  ...firestoreMemoryBuilds,
+  ...completeBuilds
+];

packages/firestore/index.memory.ts

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import firebase from '@firebase/app';
+import { FirebaseNamespace } from '@firebase/app-types';
+
+import { Firestore } from './src/api/database';
+import { MemoryPersistenceProvider } from './src/local/memory_persistence';
+import { configureForFirebase } from './src/platform/config';
+
+import './register-module';
+import './src/platform_browser/browser_init';
+
+import { name, version } from './package.json';
+
+/**
+ * Registers the memory-only Firestore build with the components framework.
+ */
+export function registerFirestore(instance: FirebaseNamespace): void {
+  configureForFirebase(
+    instance,
+    (app, auth) => new Firestore(app, auth, new MemoryPersistenceProvider())
+  );
+  instance.registerVersion(name, version);
+}
+
+registerFirestore(firebase);

packages/firestore/index.node.memory.ts

@@ -0,0 +1,41 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import firebase from '@firebase/app';
+import { FirebaseNamespace } from '@firebase/app-types';
+
+import { Firestore } from './src/api/database';
+import { MemoryPersistenceProvider } from './src/local/memory_persistence';
+import { configureForFirebase } from './src/platform/config';
+import './register-module';
+import './src/platform_node/node_init';
+
+import { name, version } from './package.json';
+
+/**
+ * Registers the memory-only Firestore build for Node with the components
+ * framework.
+ */
+export function registerFirestore(instance: FirebaseNamespace): void {
+  configureForFirebase(
+    instance,
+    (app, auth) => new Firestore(app, auth, new MemoryPersistenceProvider())
+  );
+  instance.registerVersion(name, version);
+}
+
+registerFirestore(firebase);

packages/firestore/index.node.ts

@@ -15,15 +15,26 @@
  * limitations under the License.
  */
 import firebase from '@firebase/app';
+import { FirebaseNamespace } from '@firebase/app-types';
+
+import { Firestore } from './src/api/database';
+import { IndexedDbPersistenceProvider } from './src/local/indexeddb_persistence';
 import { configureForFirebase } from './src/platform/config';
+
 import './register-module';
 import './src/platform_node/node_init';
-import { FirebaseNamespace } from '@firebase/app-types';
 
 import { name, version } from './package.json';
 
+/**
+ * Registers the main Firestore Node build with the components framework.
+ * Persistence can be enabled via `firebase.firestore().enablePersistence()`.
+ */
 export function registerFirestore(instance: FirebaseNamespace): void {
-  configureForFirebase(instance);
+  configureForFirebase(
+    instance,
+    (app, auth) => new Firestore(app, auth, new IndexedDbPersistenceProvider())
+  );
   instance.registerVersion(name, version, 'node');
 }