From b4c3da8db8d07ad4bbb34d81f835862658cc441c Mon Sep 17 00:00:00 2001
From: James Daniels <jamesdaniels@google.com>
Date: Sat, 27 May 2023 00:23:01 -0400
Subject: [PATCH] Quick fixes (#3362)

* Fix semver check for ng-deploy
* Drop file-loader, fixes #3324
---
 .github/workflows/test.yml       | 6 +++---
 src/package.json                 | 5 ++---
 src/schematics/deploy/actions.ts | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 50b1156ce..0173cc76a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -108,7 +108,7 @@ jobs:
         if: steps.node_modules_cache.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile --prefer-offline
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: Relocate Artifacts
         run: mv angularfire-${{ github.run_id }} dist
       - name: Test Node
@@ -180,7 +180,7 @@ jobs:
           path: ~/.cache/firebase/emulators
           key: firebase_emulators
       - name: Download Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: Relocate Artifacts
         run: mv angularfire-${{ github.run_id }} dist
       - name: Test browser
@@ -272,7 +272,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           check-latest: true
       - name: 'Download Artifacts'
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: Publish
         run: |
           cd ./angularfire-${{ github.run_id }}/packages-dist
diff --git a/src/package.json b/src/package.json
index 0af8d1b8b..95b45008f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -49,8 +49,7 @@
     "node-fetch": "^2.6.1",
     "semver": "^7.1.3",
     "inquirer": "^8.1.1",
-    "fs-extra": "^8.0.1",
-    "file-loader": "^6.2.0"
+    "fs-extra": "^8.0.1"
   },
   "ngPackage": {
     "lib": {
@@ -69,7 +68,7 @@
       "fuzzy", "inquirer-autocomplete-prompt",
       "open", "jsonc-parser", "ora", "winston",
       "triple-beam", "@schematics/angular", "node-fetch",
-      "semver", "inquirer", "fs-extra", "file-loader",
+      "semver", "inquirer", "fs-extra",
       "firebase", "rxfire"
     ]
   },
diff --git a/src/schematics/deploy/actions.ts b/src/schematics/deploy/actions.ts
index dc51b6b4c..42d12739a 100644
--- a/src/schematics/deploy/actions.ts
+++ b/src/schematics/deploy/actions.ts
@@ -397,7 +397,7 @@ export default async function deploy(
   }
 
   if (options.version && options.version >= 2) {
-    if (lt(firebaseTools.cli.version(), '12.2')) {
+    if (lt(firebaseTools.cli.version(), '12.2.0')) {
       throw new SchematicsException('firebase-tools version 12.2+ is required.');
     }
     process.env.FIREBASE_FRAMEWORK_BUILD_TARGET = (prerenderBuildTarget || serverBuildTarget || staticBuildTarget).name;