[pull] master from angular:master

.gitattributes

@@ -0,0 +1,5 @@
+src/**/firebase.ts linguist-generated=true
+src/**/rxfire.ts linguist-generated=true
+src/compat/**/base.ts linguist-generated=true
+samples/**/* linguist-generated=true
+yarn.lock linguist-generated=true

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/test.yml

@@ -3,177 +3,218 @@ name: Test and publish
 on:
   push:
     branches:
-      - "**"
+      - master
     paths-ignore:
       - "**/*.md"
   pull_request:
-    branches: 
+    branches:
       - "**"
   release:
     types:
       - published
+  schedule:
+    - cron: 0 0 * * 1-5
 
 jobs:
   build:
     runs-on: ubuntu-latest
     name: Build
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          check-latest: false
+      - name: angular build cache
+        uses: actions/cache@v3
         with:
-          node-version: '14'
+          path: ./.angular
+          key: angular-cache
       - name: node_modules cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: node_modules_cache
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-14-8-node_modules-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-18-${{ hashFiles('package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-14-8-node_modules-
-            ${{ runner.os }}-14-node_modules-
-      - name: Yarn offline cache
-        if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: yarn-offline
+            ${{ runner.os }}-18-
       - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
         run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn config set yarn-offline-mirror-pruning true
-          yarn install --frozen-lockfile --prefer-offline
+          npm ci
       - name: Build
-        id: yarn-pack-dir
         run: ./tools/build.sh
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: angularfire-${{ github.run_id }}
           path: dist
           retention-days: 1
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     needs: build
     strategy:
       matrix:
-        node: ["12", "14", "16"]
-        firebase: ["7", "8"]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        node: ["18", "20"]
       fail-fast: false
-    name: Test Firebase v${{ matrix.firebase }} on Node.js ${{ matrix.node }}
+    name: Test Node ${{ matrix.node }} (${{ matrix.os }})
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
       - name: node_modules cache
         id: node_modules_cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-${{ matrix.node }}-${{ matrix.firebase }}-node_modules-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.node }}-${{ matrix.firebase }}-node_modules-
-            ${{ runner.os }}-${{ matrix.node }}-node_modules-
-      - name: Yarn offline cache
+            ${{ runner.os }}-${{ matrix.node }}-
+      - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        uses: actions/cache@v2
+        run: npm ci
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
+      - name: Relocate Artifacts
+        run: mv angularfire-${{ github.run_id }} dist
+      - name: Test Node
+        run: |
+          npm run build:jasmine
+          npm run test:node
+
+  browser:
+    runs-on: ${{ matrix.os }}
+    needs: build
+    name: Test ${{ matrix.browser }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        browser: [ chrome-headless, firefox-headless ]
+        # TODO(davideast): Figure out why Safari tests timeout only on CI
+        # include:
+        # - os: macos-latest
+        #   browser: safari
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          check-latest: false
+      - name: Setup java
+        uses: actions/setup-java@v3
         with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: yarn-offline
+          distribution: 'temurin'
+          java-version: '11'
+      - name: node_modules cache
+        id: node_modules_cache
+        uses: actions/cache@v3
+        with:
+          path: ./node_modules
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.node }}-
       - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn install --frozen-lockfile --prefer-offline --ignore-engines
-          yarn add firebase@^${{ matrix.firebase }}.0 --prefer-offline --ignore-engines
+        run: npm ci
       - name: Firebase emulator cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/firebase/emulators
           key: firebase_emulators
-      - name: 'Download Artifacts'
-        uses: actions/download-artifact@v2
-      - name: Run tests
-        run: |
-          mv angularfire-${{ github.run_id }} dist
-          yarn test:node
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
+      - name: Relocate Artifacts
+        run: mv angularfire-${{ github.run_id }} dist
+      - name: Test browser
+        run: npm run test:${{ matrix.browser }}
 
-  headless:
-    runs-on: ubuntu-latest
-    needs: build
-    name: Test Firebase v${{ matrix.firebase }} on Headless Chrome
+  contribute:
+    runs-on: ${{ matrix.os }}
+    name: Contribute Node ${{ matrix.node }} (${{ matrix.os }})
     strategy:
       matrix:
-        firebase: ["7", "8"]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        node: ["18"]
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Setup node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: ${{ matrix.node }}
           check-latest: true
       - name: node_modules cache
+        uses: actions/cache@v3
         id: node_modules_cache
-        uses: actions/cache@v2
         with:
           path: ./node_modules
-          key: ${{ runner.os }}-14-${{ matrix.firebase }}-node_modules-${{ hashFiles('yarn.lock') }}
+          key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-14-${{ matrix.firebase }}-node_modules-
-            ${{ runner.os }}-14-node_modules-
-      - name: Yarn offline cache
-        if: steps.node_modules_cache.outputs.cache-hit != 'true'
-        uses: actions/cache@v2
-        with:
-          path: ~/.npm-packages-offline-cache
-          key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: yarn-offline
+            ${{ runner.os }}-${{ matrix.node }}-
       - name: Install deps
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
+        run: npm ci
+      #- name: Lint
+      #  run: npm run lint
+      - name: Build
+        run: npm run build
+      - name: Test Node
         run: |
-          yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
-          yarn install --frozen-lockfile --prefer-offline
-          yarn add firebase@^${{ matrix.firebase }}.0 --prefer-offline
+          npm run build:jasmine
+          npm run test:node
       - name: Firebase emulator cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/firebase/emulators
           key: firebase_emulators
-      - name: 'Download Artifacts'
-        uses: actions/download-artifact@v2
-      - name: Run tests
-        run: |
-          mv angularfire-${{ github.run_id }} dist
-          yarn test:chrome-headless
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      - name: Test headless
+        run: npm run test:chrome-headless
+        # Tests are flaky on Windows
+        continue-on-error: ${{ matrix.os == 'windows-latest' }}
+
+  # Break the branch protection test into a seperate step, so we can manage the matrix more easily
+  test_and_contribute:
+    runs-on: ubuntu-latest
+    name: Branch protection
+    needs: ['test', 'contribute', 'browser']
+    steps:
+      - run: true
 
   publish:
     runs-on: ubuntu-latest
     name: Publish (NPM)
-    needs: ['test', 'headless']
+    needs: ['build', 'test', 'browser']
     if: ${{ github.ref == 'refs/heads/master' || github.event_name == 'release' }}
     steps:
       - name: Setup node
-        uses: actions/setup-node@v2-beta
+        uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18'
           registry-url: 'https://registry.npmjs.org'
+          check-latest: false
       - name: 'Download Artifacts'
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: Publish
         run: |
           cd ./angularfire-${{ github.run_id }}/packages-dist
           chmod +x publish.sh
           ./publish.sh
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -13,13 +13,15 @@ angularfire2-*.tgz
 .DS_Store
 yarn-error.log
 *.bak
-package-lock.json
+yarn.lock
 test/ng-build/**/yarn.lock
 tools/build.js
 coverage
 *.log
 api-*.json
-src/**/base.ts
 angularfire.tgz
 unpack.sh
-publish.sh
+publish.sh
+.firebase
+.angular
+.vscode

.npmignore

@@ -1,3 +1,7 @@
 *.spec.*
 test-config.*
-publish.sh
+publish.sh
+__ivy_ngcc__/
+*.min.js
+*.min.js.map
+*.__ivy_ngcc_bak