Backport ten fixes to 20.1.x for 20.1.1

.github/workflows/test.yml

@@ -163,7 +163,22 @@ jobs:
     name: Publish (NPM)
     needs: ['build', 'test', 'browser']
     if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'release' }}
+    # One npm publish at a time, each held until npm lists it (about 20 minutes at most), so every
+    # check below reads what the previous publish wrote.
+    timeout-minutes: 30
+    concurrency:
+      group: npm-publish
+      cancel-in-progress: false
+      queue: max
     steps:
+      - name: Checkout the publish scripts
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            tools/publish-job.js
+            tools/release-tag.js
+          sparse-checkout-cone-mode: false
       - name: Setup node
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
@@ -175,10 +190,29 @@ jobs:
         with:
           name: angularfire-${{ github.run_id }}
           path: dist
+      - name: Skip a canary that is not newer than npm's
+        id: canary_check
+        if: github.event_name != 'release'
+        run: node tools/publish-job.js canary-check
+      - name: Choose the release's dist-tag
+        id: release_tag
+        if: github.event_name == 'release'
+        run: node tools/publish-job.js release-tag
       - name: Publish
-        run: |
-          cd ./dist/packages-dist
-          chmod +x publish.sh
-          ./publish.sh
+        id: publish
+        if: steps.canary_check.outputs.skip != 'true' && steps.release_tag.outputs.published != 'true'
+        run: npm publish ./dist/packages-dist --access public --registry https://wombat-dressing-room.appspot.com --tag "$NPM_TAG"
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_TAG: ${{ steps.release_tag.outputs.tag || 'canary' }}
+      - name: Wait for npm to list the version
+        id: wait
+        if: steps.publish.outcome == 'success' || steps.release_tag.outputs.published == 'true'
+        run: node tools/publish-job.js wait "$NPM_TAG"
+        env:
+          NPM_TAG: ${{ steps.release_tag.outputs.tag || 'canary' }}
+      - name: Move next up to the release
+        if: steps.wait.outputs.listed == 'true' && steps.release_tag.outputs.tag == 'latest'
+        run: node tools/publish-job.js move-next
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -21,7 +21,6 @@ coverage
 api-*.json
 angularfire.tgz
 unpack.sh
-publish.sh
 .firebase
 .angular
 .vscode

.npmignore

@@ -1,6 +1,5 @@
 *.spec.*
 test-config.*
-publish.sh
 __ivy_ngcc__/
 *.min.js
 *.min.js.map

package.json

@@ -87,6 +87,7 @@
     "@angular/cli": "^20.0.0",
     "@angular/compiler-cli": "^20.0.0",
     "@angular/platform-server": "^20.0.0",
+    "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",

src/compat/storage/observable/fromTask.ts

@@ -2,12 +2,9 @@ import { Observable } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { UploadTask, UploadTaskSnapshot } from '../interfaces';
 
-// need to import, else the types become import('firebase/compat/app').default.storage.UploadTask
-// and it no longer works w/Firebase v7
-
 // Things aren't working great, I'm having to put in a lot of work-arounds for what
 // appear to be Firebase JS SDK bugs https://github.com/firebase/firebase-js-sdk/issues/4158
-export function fromTask(task: UploadTask) {
+export function fromTask(task: UploadTask): Observable<UploadTaskSnapshot> {
   return new Observable<UploadTaskSnapshot>(subscriber => {
     const progress = (snap: UploadTaskSnapshot) => subscriber.next(snap);
     const error = e => subscriber.error(e);

src/package.json

@@ -30,13 +30,11 @@
     "@angular/common": "^20.0.0",
     "@angular/core": "^20.0.0",
     "@angular/platform-browser": "^20.0.0",
-    "@angular/platform-server": "^20.0.0",
     "rxjs": "~7.8.0",
     "firebase-tools": "^14.0.0 || ^15.0.0"
   },
   "peerDependenciesMeta": {
-    "firebase-tools": { "optional": true },
-    "@angular/platform-server": { "optional": true }
+    "firebase-tools": { "optional": true }
   },
   "dependencies": {
     "firebase": "^11.8.0",