integration/compat-interop/package.json

@@ -8,16 +8,16 @@
     "test:debug": "karma start --browsers Chrome --auto-watch"
   },
   "dependencies": {
-    "@firebase/app": "0.7.12",
-    "@firebase/app-compat": "0.1.13",
+    "@firebase/app": "0.7.13",
+    "@firebase/app-compat": "0.1.14",
     "@firebase/analytics": "0.7.5",
     "@firebase/analytics-compat": "0.1.6",
     "@firebase/auth": "0.19.5",
     "@firebase/auth-compat": "0.2.5",
     "@firebase/functions": "0.7.7",
     "@firebase/functions-compat": "0.1.8",
-    "@firebase/messaging": "0.9.5",
-    "@firebase/messaging-compat": "0.1.5",
+    "@firebase/messaging": "0.9.6",
+    "@firebase/messaging-compat": "0.1.6",
     "@firebase/performance": "0.5.5",
     "@firebase/performance-compat": "0.1.5",
     "@firebase/remote-config": "0.3.4",

integration/firebase/package.json

@@ -7,7 +7,7 @@
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test"
   },
   "devDependencies": {
-    "firebase": "9.6.2",
+    "firebase": "9.6.3",
     "@types/chai": "4.2.22",
     "@types/mocha": "9.0.0",
     "chai": "4.3.4",

integration/firestore/firebase_export.ts

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-import firebase from '@firebase/app-compat';
-import '@firebase/firestore-compat';
-import { FirebaseApp } from '@firebase/app-types';
-import { Settings, FirebaseFirestore } from '@firebase/firestore-types';
+import { FirebaseApp, initializeApp } from '@firebase/app';
+import {
+  Firestore,
+  FirestoreSettings,
+  initializeFirestore
+} from '@firebase/firestore';
 
 // This file replaces "packages/firestore/test/integration/util/firebase_export"
 // and depends on the minified sources.
@@ -28,43 +30,18 @@ let appCount = 0;
 export function newTestFirestore(
   projectId: string,
   nameOrApp?: string | FirebaseApp,
-  settings?: Settings
-): FirebaseFirestore {
+  settings?: FirestoreSettings
+): Firestore {
   if (nameOrApp === undefined) {
     nameOrApp = 'test-app-' + appCount++;
   }
   const app =
     typeof nameOrApp === 'string'
-      ? firebase.initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
+      ? initializeApp({ apiKey: 'fake-api-key', projectId }, nameOrApp)
       : nameOrApp;
-
-  const firestore = firebase.firestore(app);
-  if (settings) {
-    firestore.settings(settings);
-  }
-  return firestore;
+  return initializeFirestore(app, settings || {});
 }
 
-export function usesFunctionalApi(): false {
-  return false;
-}
-
-const Blob = firebase.firestore.Blob;
-const DocumentReference = firebase.firestore.DocumentReference;
-const FieldPath = firebase.firestore.FieldPath;
-const FieldValue = firebase.firestore.FieldValue;
-const Firestore = firebase.firestore.Firestore;
-const GeoPoint = firebase.firestore.GeoPoint;
-const QueryDocumentSnapshot = firebase.firestore.QueryDocumentSnapshot;
-const Timestamp = firebase.firestore.Timestamp;
+export * from '@firebase/firestore';
 
-export {
-  Blob,
-  DocumentReference,
-  FieldPath,
-  FieldValue,
-  Firestore,
-  GeoPoint,
-  QueryDocumentSnapshot,
-  Timestamp
-};
+export type PrivateSettings = Record<string, any>;

integration/firestore/gulpfile.js

@@ -53,25 +53,18 @@ function copyTests() {
     .pipe(
       replace(
         /**
-         * This regex is designed to match the following statement used in our
-         * firestore integration test suites:
-         *
-         * import * as firebaseExport from '../../util/firebase_export';
-         *
-         * It will handle variations in whitespace, single/double quote
-         * differences, as well as different paths to a valid firebase_export
+         * This regex is designed to match the Firebase import in our
+         * integration tests.
          */
-        /import\s+\* as firebaseExport\s+from\s+('|")[^\1]+firebase_export\1;?/,
-        `import * as firebaseExport from '${resolve(
-          __dirname,
-          './firebase_export'
-        )}';
+        /\s+from '\.(\.\/util)?\/firebase_export';/,
+        ` from '${resolve(__dirname, './firebase_export')}';
         
-         if (typeof process === 'undefined') {
-           process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
-         } else {
-           process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
-         }`
+if (typeof process === 'undefined') {
+  process = { env: { INCLUDE_FIRESTORE_PERSISTENCE: '${isPersistenceEnabled()}' } } as any;
+} else {
+  process.env.INCLUDE_FIRESTORE_PERSISTENCE = '${isPersistenceEnabled()}';
+}
+`
       )
     )
     .pipe(

integration/firestore/package.json

@@ -6,16 +6,19 @@
     "build:deps": "lerna run --scope @firebase/'{app,firestore}' --include-dependencies build",
     "build:persistence": "INCLUDE_FIRESTORE_PERSISTENCE=true gulp compile-tests",
     "build:memory": "INCLUDE_FIRESTORE_PERSISTENCE=false gulp compile-tests",
+    "prettier": "prettier --write '*.js' '*.ts'",
     "test": "yarn build:memory; karma start --single-run; yarn build:persistence; karma start --single-run;",
     "test:ci": "node ../../scripts/run_tests_in_ci.js -s test",
     "test:persistence": " yarn build:persistence; karma start --single-run",
     "test:persistence:debug": "yarn build:persistence; karma start --auto-watch --browsers Chrome",
     "test:memory": "yarn build:memory; karma start --single-run",
     "test:memory:debug": "yarn build:memory; karma start --auto-watch --browsers Chrome"
   },
+  "dependencies": {
+    "@firebase/app": "0.7.13",
+    "@firebase/firestore": "3.4.3"
+  },
   "devDependencies": {
-    "@firebase/app": "0.7.12",
-    "@firebase/firestore-compat": "0.1.11",
     "@types/mocha": "9.0.0",
     "gulp": "4.0.2",
     "gulp-filter": "7.0.0",

integration/messaging/package.json

@@ -9,7 +9,7 @@
     "test:manual": "mocha --exit"
   },
   "devDependencies": {
-    "firebase": "9.6.2",
+    "firebase": "9.6.3",
     "chai": "4.3.4",
     "chromedriver": "94.0.0",
     "express": "4.17.1",

package.json

@@ -110,7 +110,7 @@
     "firebase-tools": "9.23.0",
     "git-rev-sync": "3.0.1",
     "glob": "7.2.0",
-    "http-server": "13.0.2",
+    "http-server": "14.1.0",
     "indexeddbshim": "8.0.0",
     "inquirer": "8.1.5",
     "istanbul-instrumenter-loader": "3.0.1",
@@ -130,7 +130,7 @@
     "lcov-result-merger": "3.1.0",
     "lerna": "4.0.0",
     "listr": "0.14.3",
-    "lodash": "4.17.20",
+    "lodash": "4.17.21",
     "long": "3.2.0",
     "merge2": "1.4.1",
     "mkdirp": "1.0.4",

packages/analytics-compat/package.json

@@ -23,7 +23,7 @@
     "@firebase/app-compat": "0.x"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.13",
+    "@firebase/app-compat": "0.1.14",
     "rollup": "2.57.0",
     "@rollup/plugin-json": "4.1.0",
     "rollup-plugin-typescript2": "0.30.0",

packages/analytics/package.json

@@ -47,7 +47,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.12",
+    "@firebase/app": "0.7.13",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-check-compat/package.json

@@ -42,7 +42,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.13",
+    "@firebase/app-compat": "0.1.14",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-check/package.json

@@ -44,7 +44,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.12",
+    "@firebase/app": "0.7.13",
     "rollup": "2.57.0",
     "@rollup/plugin-commonjs": "21.0.0",
     "@rollup/plugin-json": "4.1.0",

packages/app-compat/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @firebase/app-compat
 
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @firebase/app@0.7.13
+
 ## 0.1.13
 
 ### Patch Changes

packages/app-compat/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app-compat",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",
@@ -39,7 +39,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@firebase/app": "0.7.12",
+    "@firebase/app": "0.7.13",
     "@firebase/util": "1.4.3",
     "@firebase/logger": "0.3.2",
     "@firebase/component": "0.5.10",

packages/app/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @firebase/app
 
+## 0.7.13
+
+### Patch Changes
+
+- Update SDK_VERSION.
+
 ## 0.7.12
 
 ### Patch Changes

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firebase/app",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "description": "The primary entrypoint to the Firebase JS SDK",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "main": "dist/index.cjs.js",

packages/auth-compat/package.json

@@ -53,7 +53,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app-compat": "0.1.13",
+    "@firebase/app-compat": "0.1.14",
     "@rollup/plugin-json": "4.1.0",
     "rollup": "2.57.0",
     "rollup-plugin-replace": "2.2.0",

packages/auth/package.json

@@ -84,7 +84,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@firebase/app": "0.7.12",
+    "@firebase/app": "0.7.13",
     "@rollup/plugin-json": "4.1.0",
     "@rollup/plugin-strip": "2.1.0",
     "chromedriver": "96.0.0",

packages/auth/src/core/strategies/email_link.ts

@@ -60,7 +60,7 @@ import { getModularInstance } from '@firebase/util';
  * await sendSignInLinkToEmail(auth, 'user@example.com', actionCodeSettings);
  * // Obtain emailLink from the user.
  * if(isSignInWithEmailLink(auth, emailLink)) {
- *   await signInWithEmailLink('user@example.com', 'user@example.com', emailLink);
+ *   await signInWithEmailLink(auth, 'user@example.com', emailLink);
  * }
  * ```
  *
@@ -132,7 +132,7 @@ export function isSignInWithEmailLink(auth: Auth, emailLink: string): boolean {
  * await sendSignInLinkToEmail(auth, 'user@example.com', actionCodeSettings);
  * // Obtain emailLink from the user.
  * if(isSignInWithEmailLink(auth, emailLink)) {
- *   await signInWithEmailLink('user@example.com', 'user@example.com', emailLink);
+ *   await signInWithEmailLink(auth, 'user@example.com', emailLink);
  * }
  * ```
  *

packages/database-compat/package.json

@@ -53,7 +53,7 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app-compat": "0.1.13"
+    "@firebase/app-compat": "0.1.14"
   },
   "repository": {
     "directory": "packages/database-compat",

packages/database/package.json

@@ -52,7 +52,7 @@
     "tslib": "^2.1.0"
   },
   "devDependencies": {
-    "@firebase/app": "0.7.12",
+    "@firebase/app": "0.7.13",
     "rollup": "2.57.0",
     "rollup-plugin-typescript2": "0.30.0",
     "typescript": "4.2.2"

packages/firebase/CHANGELOG.md

@@ -1,5 +1,17 @@
 # firebase
 
+## 9.6.3
+
+### Patch Changes
+
+- Updated dependencies [[`044a8d7f9`](https://github.com/firebase/firebase-js-sdk/commit/044a8d7f95a0ba0d34123ff5fd7a4bcb1bd3d328), [`ff2f7d4c8`](https://github.com/firebase/firebase-js-sdk/commit/ff2f7d4c85c0bda94b14d66237faa0e5da93bfa4), [`88d43ec00`](https://github.com/firebase/firebase-js-sdk/commit/88d43ec0027ff857923ab41255b3650e666fa29e), [`3c20727d8`](https://github.com/firebase/firebase-js-sdk/commit/3c20727d83f2d68edc108e8112b06d3232a7d310)]:
+  - @firebase/app@0.7.13
+  - @firebase/firestore@3.4.3
+  - @firebase/messaging@0.9.6
+  - @firebase/app-compat@0.1.14
+  - @firebase/firestore-compat@0.1.12
+  - @firebase/messaging-compat@0.1.6
+
 ## 9.6.2
 
 ### Patch Changes

packages/firebase/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase",
-  "version": "9.6.2",
+  "version": "9.6.3",
   "description": "Firebase JavaScript library for web and Node.js",
   "author": "Firebase <firebase-support@google.com> (https://firebase.google.com/)",
   "license": "Apache-2.0",
@@ -219,20 +219,20 @@
     "test:ci": "echo 'No test suite for firebase wrapper'"
   },
   "dependencies": {
-    "@firebase/app": "0.7.12",
-    "@firebase/app-compat": "0.1.13",
+    "@firebase/app": "0.7.13",
+    "@firebase/app-compat": "0.1.14",
     "@firebase/app-types": "0.7.0",
     "@firebase/auth": "0.19.5",
     "@firebase/auth-compat": "0.2.5",
     "@firebase/database": "0.12.5",
     "@firebase/database-compat": "0.1.5",
-    "@firebase/firestore": "3.4.2",
-    "@firebase/firestore-compat": "0.1.11",
+    "@firebase/firestore": "3.4.3",
+    "@firebase/firestore-compat": "0.1.12",
     "@firebase/functions": "0.7.7",
     "@firebase/functions-compat": "0.1.8",
     "@firebase/installations": "0.5.5",
-    "@firebase/messaging": "0.9.5",
-    "@firebase/messaging-compat": "0.1.5",
+    "@firebase/messaging": "0.9.6",
+    "@firebase/messaging-compat": "0.1.6",
     "@firebase/polyfill": "0.3.36",
     "@firebase/storage": "0.9.1",
     "@firebase/storage-compat": "0.1.9",