IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into develop

Browse Source 
# Conflicts:
#	.github/workflows/release.yml
This commit is contained in:
James Cole 2024-03-26 07:32:26 +01:00
commit 5e54034e0e
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yml vendored
View File

@ -115,8 +115,8 @@ jobs:
GH_TOKEN: '' GH_TOKEN: ''
- name: Build new JS - name: Build new JS
run: | run: |
npm update
npm install npm install
npm update
npm run build npm run build
- name: Build old JS - name: Build old JS
id: old-js id: old-js

2
package-lock.json generated
View File

@ -33,7 +33,7 @@
"laravel-vite-plugin": "^0.8.1", "laravel-vite-plugin": "^0.8.1",
"patch-package": "^8.0.0", "patch-package": "^8.0.0",
"sass": "^1.72.0", "sass": "^1.72.0",
"vite": "^4.5.3", "vite": "^4.5.2",
"vite-plugin-manifest-sri": "^0.1.0" "vite-plugin-manifest-sri": "^0.1.0"
} }
}, },