Skip to content

Commit

Permalink
Quick fixes (#3362)
Browse files Browse the repository at this point in the history
* Fix semver check for ng-deploy
* Drop file-loader, fixes #3324
  • Loading branch information
jamesdaniels authored May 27, 2023
1 parent 7a2402a commit b4c3da8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
]
},
Expand Down
2 changes: 1 addition & 1 deletion src/schematics/deploy/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b4c3da8

Please sign in to comment.