Merge branch 'master' into fei-removal

Author: hsubox76

.changeset/curvy-brooms-clean.md

@@ -0,0 +1,5 @@
+---
+"@firebase/auth": patch
+---
+
+Fix bug where `user.providerData` field was being improperly initialized

.changeset/mean-elephants-rush.md

@@ -32,7 +32,7 @@
 
 
 # These owners will be the default owners for everything in the repo.
-*       @hiranya911 @hsubox76 @firebase/jssdk-global-approvers
+*       @allspain @hsubox76 @firebase/jssdk-global-approvers
 
 # Database Code
 packages/database @schmidt-sebastian @jsdt @firebase/jssdk-global-approvers

.github/CODEOWNERS

@@ -19,57 +19,59 @@ jobs:
         working-directory: './e2e'
 
     steps:
-    - name: Checkout Repo
-      uses: actions/checkout@master
-    - name: Set up Node (12)
-      uses: actions/setup-node@v2
-      with:
-        node-version: 12.x
-    - name: install Chrome stable
-      run: |
-        sudo apt-get update
-        sudo apt-get install google-chrome-stable
-    - name: Bump Node memory limit
-      run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
-    - name: Write project config
-      env:
-        PROJECT_CONFIG: ${{ secrets.TEST_PROJECT_CONFIG }}
-        TEST_ACCOUNT: ${{ secrets.TEST_ACCOUNT }}
-      run: |
-        echo "export const config = $PROJECT_CONFIG; export const testAccount = $TEST_ACCOUNT" > firebase-config.js
-    - name: Yarn install
-      run: |
-        echo "Installing firebase@${{ github.event.inputs.versionOrTag }}"
-        yarn add firebase@${{ github.event.inputs.versionOrTag }}
-        yarn
-    - name: Deploy "callTest" cloud function
-      run: |
-        pushd functions
-        npm install
-        popd
-        npx firebase-tools deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
-      working-directory: ./config
-      env:
-        FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
-    - name: Run modular tests
-      env:
-        APP_CHECK_DEBUG_TOKEN: ${{ secrets.APP_CHECK_DEBUG_TOKEN }}
-      run: xvfb-run yarn test:modular
-    - name: Run compat tests
-      env:
-        APP_CHECK_DEBUG_TOKEN: ${{ secrets.APP_CHECK_DEBUG_TOKEN }}
-      run: xvfb-run yarn test:compat
-    - name: Tests succeeded
-      if: success()
-      run: node scripts/ci/notify-test-result.js success
-      env:
-        WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
-      # run in root
-      working-directory: '.'
-    - name: Tests failed
-      if: failure()
-      run: node scripts/ci/notify-test-result.js fail
-      env:
-        WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
-      # run in root
-      working-directory: '.'
+      - name: Checkout Repo
+        uses: actions/checkout@master
+      - name: Set up Node (12)
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+      - name: install Chrome stable
+        run: |
+          sudo apt-get update
+          sudo apt-get install google-chrome-stable
+      - name: Bump Node memory limit
+        run: echo "NODE_OPTIONS=--max_old_space_size=4096" >> $GITHUB_ENV
+      - name: Write project config
+        env:
+          PROJECT_CONFIG: ${{ secrets.TEST_PROJECT_CONFIG }}
+          TEST_ACCOUNT: ${{ secrets.TEST_ACCOUNT }}
+        run: |
+          echo "export const config = $PROJECT_CONFIG; export const testAccount = $TEST_ACCOUNT" > firebase-config.js
+      - name: Yarn install
+        run: |
+          echo "Installing firebase@${{ github.event.inputs.versionOrTag }}"
+          yarn add firebase@${{ github.event.inputs.versionOrTag }}
+          yarn
+      - name: Deploy "callTest" cloud function
+        run: |
+          pushd functions
+          npm install
+          popd
+          npx firebase-tools deploy --only functions:callTest --project jscore-sandbox-141b5 --token $FIREBASE_CLI_TOKEN
+        working-directory: ./config
+        env:
+          FIREBASE_CLI_TOKEN: ${{ secrets.FIREBASE_CLI_TOKEN }}
+      - name: Run modular tests
+        env:
+          APP_CHECK_DEBUG_TOKEN: ${{ secrets.APP_CHECK_DEBUG_TOKEN }}
+        run: xvfb-run yarn test:modular
+      - name: Run compat tests
+        env:
+          APP_CHECK_DEBUG_TOKEN: ${{ secrets.APP_CHECK_DEBUG_TOKEN }}
+        run: xvfb-run yarn test:compat
+      - name: Tests succeeded
+        if: success()
+        run: node scripts/ci/notify-test-result.js success
+        env:
+          WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
+          RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+        # run in root
+        working-directory: '.'
+      - name: Tests failed
+        if: failure()
+        run: node scripts/ci/notify-test-result.js fail
+        env:
+          WEBHOOK_URL: ${{ secrets.JSCORE_CHAT_WEBHOOK_URL }}
+          RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}
+        # run in root
+        working-directory: '.'

.github/workflows/e2e-test.yml

@@ -20,4 +20,6 @@ jobs:
           node-version: 14.x
 
       - name: Get PR number and send to tracker.
-        run: node scripts/ci/log-changesets.js
+        run: node scripts/ci/log-changesets.js
+        env:
+          RELEASE_TRACKER_URL: ${{ secrets.RELEASE_TRACKER_URL }}

.github/workflows/release-log.yml

@@ -29,16 +29,12 @@
       "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
-        "--require", "ts-node/register/type-check",
+        "--require", "babel-register.js",
         "--require", "index.node.ts",
         "--timeout", "5000",
         "test/{,!(browser|integration)/**/}*.test.ts",
         "--exit"
       ],
-      "env": {
-        "TS_NODE_CACHE": "NO",
-        "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
-      },
       "sourceMaps": true,
       "protocol": "inspector"
     },
@@ -49,17 +45,15 @@
       "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
-        "--require", "ts-node/register/type-check",
+        "--require", "babel-register.js",
         "--require", "index.node.ts",
         "--require", "test/util/node_persistence.ts",
         "--timeout", "5000",
         "test/{,!(browser|integration)/**/}*.test.ts",
         "--exit"
       ],
       "env": {
-        "USE_MOCK_PERSISTENCE": "YES",
-        "TS_NODE_CACHE": "NO",
-        "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}"
+        "USE_MOCK_PERSISTENCE": "YES"
       },
       "sourceMaps": true,
       "protocol": "inspector"
@@ -71,15 +65,13 @@
       "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
-        "--require", "ts-node/register/type-check",
+        "--require", "babel-register.js",
         "--require", "index.node.ts",
         "--timeout", "5000",
         "test/{,!(browser|unit)/**/}*.test.ts",
         "--exit"
       ],
       "env": {
-        "TS_NODE_CACHE": "NO",
-        "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}",
         "FIRESTORE_EMULATOR_PORT" : "8080",
         "FIRESTORE_EMULATOR_PROJECT_ID" :  "test-emulator"
       },
@@ -93,7 +85,7 @@
       "program": "${workspaceRoot}/node_modules/.bin/_mocha",
       "cwd": "${workspaceRoot}/packages/firestore",
       "args": [
-        "--require", "ts-node/register/type-check",
+        "--require", "babel-register.js",
         "--require", "index.node.ts",
         "--require", "test/util/node_persistence.ts",
         "--timeout", "5000",
@@ -102,8 +94,6 @@
       ],
       "env": {
         "USE_MOCK_PERSISTENCE": "YES",
-        "TS_NODE_CACHE": "NO",
-        "TS_NODE_COMPILER_OPTIONS" : "{\"module\":\"commonjs\"}",
         "FIRESTORE_EMULATOR_PORT" : "8080",
         "FIRESTORE_EMULATOR_PROJECT_ID" :  "test-emulator"
       },

.vscode/launch.json

@@ -601,6 +601,11 @@ export class PhoneMultiFactorGenerator {
     static FACTOR_ID: string;
 }
 
+// @public
+export interface PhoneMultiFactorInfo extends MultiFactorInfo {
+    readonly phoneNumber: string;
+}
+
 // @public
 export interface PhoneMultiFactorSignInInfoOptions {
     multiFactorHint?: MultiFactorInfo;

common/api-review/auth.api.md

@@ -6,6 +6,7 @@
 
 import { EmulatorMockTokenOptions } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
+import { FirebaseError } from '@firebase/util';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 
 // @public
@@ -147,10 +148,9 @@ export interface FirestoreDataConverter<T> {
 }
 
 // @public
-export class FirestoreError extends Error {
+export class FirestoreError extends FirebaseError {
     readonly code: FirestoreErrorCode;
     readonly message: string;
-    readonly name: string;
     readonly stack?: string;
 }
 

common/api-review/firestore-lite.api.md

@@ -6,6 +6,7 @@
 
 import { EmulatorMockTokenOptions } from '@firebase/util';
 import { FirebaseApp } from '@firebase/app';
+import { FirebaseError } from '@firebase/util';
 import { LogLevelString as LogLevel } from '@firebase/logger';
 
 // @public
@@ -177,10 +178,9 @@ export interface FirestoreDataConverter<T> {
 }
 
 // @public
-export class FirestoreError extends Error {
+export class FirestoreError extends FirebaseError {
     readonly code: FirestoreErrorCode;
     readonly message: string;
-    readonly name: string;
     readonly stack?: string;
 }
 

common/api-review/firestore.api.md

@@ -34,4 +34,9 @@ if (process.env.CI) {
   config.reporter = 'min';
 }
 
+// Firestore uses babel to compile tests in Nodejs
+if (process.env.NO_TS_NODE) {
+  delete config.require;
+}
+
 module.exports = config;

config/mocharc.node.js

@@ -35,6 +35,6 @@
     "typescript": "4.3.4",
     "webpack": "5.41.1",
     "webpack-cli": "4.7.2",
-    "webpack-dev-server": "3.10.1"
+    "webpack-dev-server": "4.7.3"
   }
 }