Quick fixes (#3362)

* Fix semver check for ng-deploy * Drop file-loader, fixes #3324
angular · May 27, 2023 · b4c3da8 · b4c3da8
1 parent 7a2402a
commit b4c3da8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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;