Skip to content

Commit

Permalink
General: Update dependencies and fix small errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mkue committed Dec 29, 2024
1 parent d245db2 commit b40756e
Show file tree
Hide file tree
Showing 21 changed files with 6,955 additions and 4,104 deletions.
4 changes: 2 additions & 2 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"projects": {
"default": "social-income-local",
"default": "demo-social-income-local",
"social-income-staging": "social-income-staging",
"social-income-prod": "social-income-prod"
},
"targets": {
"social-income-local": {
"demo-social-income-local": {
"hosting": {
"admin": [
"si-admin-local"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/actions/init/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
- name: Install and set up firebase-tools
shell: bash
run: |
npm -g install firebase-tools@13.20.2 && \
npm -g install firebase-tools@13.29.1 && \
firebase setup:emulators:firestore && \
firebase setup:emulators:storage && \
firebase setup:emulators:ui
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prettify-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Prettify code
uses: creyD/[email protected]
with:
prettier_version: "3.3.3"
prettier_plugins: "[email protected] [email protected].8"
prettier_version: "3.4.2"
prettier_plugins: "[email protected] [email protected].9"
prettier_options: "--write ./"
github_token: ${{ secrets.WORKFLOW_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/website-update-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:

- name: Install & Setup Firebase Emulator Suite
run: |
npm -g install firebase-tools@13.20.2 && \
npm -g install firebase-tools@13.29.1 && \
firebase setup:emulators:firestore
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18
22
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ dist/
.next/
*.hbs
ui/README.md
ui/storybook-static/
4 changes: 2 additions & 2 deletions admin/.env.development
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VITE_WEBSITE_BASE_URL="http://localhost:3001"

VITE_ADMIN_FB_API_KEY="demo-key"
VITE_ADMIN_FB_AUTH_DOMAIN="social-income-local"
VITE_ADMIN_FB_PROJECT_ID="social-income-local"
VITE_ADMIN_FB_AUTH_DOMAIN="demo-social-income-local"
VITE_ADMIN_FB_PROJECT_ID="demo-social-income-local"
VITE_ADMIN_FB_AUTH_EMULATOR_URL="http://localhost:9099"
VITE_ADMIN_FB_FIRESTORE_EMULATOR_HOST="localhost"
VITE_ADMIN_FB_FIRESTORE_EMULATOR_PORT="8080"
Expand Down
12 changes: 6 additions & 6 deletions admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
"scripts": {
"build": "vite build",
"serve": "vite serve",
"serve:emulator": "firebase emulators:exec --project social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run serve'",
"test:emulator": "firebase emulators:exec --project social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:local'",
"serve:emulator": "firebase emulators:exec --project demo-social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run serve'",
"test:emulator": "firebase emulators:exec --project demo-social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:local'",
"test:local": "jest --forceExit --passWithNoTests --roots src",
"test:playwright:local": "npx playwright install --with-deps && playwright test --trace on",
"test:playwright:local:update": "npx playwright install --with-deps && playwright test --update-snapshots",
"test:playwright:emulator": "firebase emulators:exec --project social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:playwright:local'",
"test:playwright:emulator:update": "firebase emulators:exec --project social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:playwright:local:update'"
"test:playwright:emulator": "firebase emulators:exec --project demo-social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:playwright:local'",
"test:playwright:emulator:update": "firebase emulators:exec --project demo-social-income-local --only firestore,auth --config ../firebase.json --import ../seed 'npm run test:playwright:local:update'"
},
"devDependencies": {
"@firebase/rules-unit-testing": "^3.0.3",
Expand All @@ -21,8 +21,8 @@
"@types/jest": "^29.5.12",
"@types/luxon": "^3.4.2",
"@types/node": "^20.14.10",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react": "^18.3.18",
"@types/react-dom": "^18.3.5",
"@vitejs/plugin-react": "^4.3.1",
"css-loader": "^7.1.2",
"jest": "^29.7.0",
Expand Down
15 changes: 8 additions & 7 deletions functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,27 @@
"version": "1.0.0",
"private": true,
"engines": {
"node": "18"
"node": "22"
},
"main": "dist/functions/src/index.js",
"scripts": {
"build": "tsc && npm run build:sync-files",
"build:sync-files": "rsync -av --delete ../shared/assets dist/shared && rsync -av --delete ../shared/locales dist/shared && rsync -av --delete ../shared/templates dist/shared",
"serve": "npm run build:sync-files && tsc --watch",
"test": "firebase emulators:exec --only firestore,storage,functions --project social-income-local --config ../firebase.json 'npm run test:app'",
"test": "firebase emulators:exec --only firestore,storage,functions --project demo-social-income-local --config ../firebase.json 'npm run test:app'",
"test:app": "jest --forceExit --roots src/",
"test:playwright": "firebase emulators:exec --project social-income-local --only firestore --config ../firebase.json --import ../seed 'npx playwright install --with-deps && playwright test'",
"test:playwright:update": "firebase emulators:exec --project social-income-local --only firestore --config ../firebase.json --import ../seed 'npx playwright install --with-deps && playwright test --update-snapshots'"
"test:playwright": "firebase emulators:exec --project demo-social-income-local --only firestore --config ../firebase.json --import ../seed 'npx playwright install --with-deps && playwright test'",
"test:playwright:update": "firebase emulators:exec --project demo-social-income-local --only firestore --config ../firebase.json --import ../seed 'npx playwright install --with-deps && playwright test --update-snapshots'"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@playwright/test": "^1.47.2",
"@types/imap-simple": "^4.2.9",
"@types/jest": "^29.5.13",
"@types/luxon": "^3.4.2",
"@types/node": "^22.10.2",
"@types/pdfkit": "^0.13.5",
"firebase-functions-test": "^3.3.0",
"firebase-functions-test": "^3.4.0",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-loader": "^9.5.1",
Expand All @@ -34,8 +35,8 @@
"@xmldom/xmldom": "^0.8.10",
"axios": "^1.7.7",
"dotenv": "^16.4.5",
"firebase-admin": "^12.6.0",
"firebase-functions": "5.0.1",
"firebase-admin": "^13.0.2",
"firebase-functions": "5.1.1",
"handlebars": "^4.7.8",
"handlebars-i18next": "^1.0.3",
"i18next-resources-to-backend": "^1.2.1",
Expand Down
4 changes: 2 additions & 2 deletions functions/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"lib": ["dom", "es2020"],
"lib": ["es2022"],
"module": "commonjs",
"moduleResolution": "node",
"noImplicitReturns": true,
Expand All @@ -12,7 +12,7 @@
"resolveJsonModule": true,
"strict": true,
"skipLibCheck": true,
"target": "es2017",
"target": "es2022",
"types": ["jest", "node"]
},
"include": ["src/**/*", "tests/**/*"]
Expand Down
Loading

0 comments on commit b40756e

Please sign in to comment.