Skip to content

Commit b4c3da8

Browse files
authored
Quick fixes (#3362)
* Fix semver check for ng-deploy * Drop file-loader, fixes #3324
1 parent 7a2402a commit b4c3da8

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
if: steps.node_modules_cache.outputs.cache-hit != 'true'
109109
run: yarn install --frozen-lockfile --prefer-offline
110110
- name: Download Artifacts
111-
uses: actions/download-artifact@v2
111+
uses: actions/download-artifact@v3
112112
- name: Relocate Artifacts
113113
run: mv angularfire-${{ github.run_id }} dist
114114
- name: Test Node
@@ -180,7 +180,7 @@ jobs:
180180
path: ~/.cache/firebase/emulators
181181
key: firebase_emulators
182182
- name: Download Artifacts
183-
uses: actions/download-artifact@v2
183+
uses: actions/download-artifact@v3
184184
- name: Relocate Artifacts
185185
run: mv angularfire-${{ github.run_id }} dist
186186
- name: Test browser
@@ -272,7 +272,7 @@ jobs:
272272
registry-url: 'https://registry.npmjs.org'
273273
check-latest: true
274274
- name: 'Download Artifacts'
275-
uses: actions/download-artifact@v2
275+
uses: actions/download-artifact@v3
276276
- name: Publish
277277
run: |
278278
cd ./angularfire-${{ github.run_id }}/packages-dist

src/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
"node-fetch": "^2.6.1",
5050
"semver": "^7.1.3",
5151
"inquirer": "^8.1.1",
52-
"fs-extra": "^8.0.1",
53-
"file-loader": "^6.2.0"
52+
"fs-extra": "^8.0.1"
5453
},
5554
"ngPackage": {
5655
"lib": {
@@ -69,7 +68,7 @@
6968
"fuzzy", "inquirer-autocomplete-prompt",
7069
"open", "jsonc-parser", "ora", "winston",
7170
"triple-beam", "@schematics/angular", "node-fetch",
72-
"semver", "inquirer", "fs-extra", "file-loader",
71+
"semver", "inquirer", "fs-extra",
7372
"firebase", "rxfire"
7473
]
7574
},

src/schematics/deploy/actions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export default async function deploy(
397397
}
398398

399399
if (options.version && options.version >= 2) {
400-
if (lt(firebaseTools.cli.version(), '12.2')) {
400+
if (lt(firebaseTools.cli.version(), '12.2.0')) {
401401
throw new SchematicsException('firebase-tools version 12.2+ is required.');
402402
}
403403
process.env.FIREBASE_FRAMEWORK_BUILD_TARGET = (prerenderBuildTarget || serverBuildTarget || staticBuildTarget).name;

0 commit comments

Comments
 (0)