Skip to content

Commit

Permalink
Merge pull request #664 from the-hideout/combined-prs-branch
Browse files Browse the repository at this point in the history
Combined PRs
  • Loading branch information
Shebuka committed Sep 4, 2023
2 parents 9815d86 + 4cd40e4 commit 5b2f005
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 48 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'development' }}
uses: cloudflare/wrangler-action@c25aadc9657b0cdc4786c04e59a6fe92765a783b # pin@3.1.0
uses: cloudflare/wrangler-action@09fc6b504568cf179b085df24393f237fea6c7f6 # pin@3.1.1
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand All @@ -81,7 +81,7 @@ jobs:
if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.environment == 'production' }}
uses: cloudflare/wrangler-action@c25aadc9657b0cdc4786c04e59a6fe92765a783b # pin@3.1.0
uses: cloudflare/wrangler-action@09fc6b504568cf179b085df24393f237fea6c7f6 # pin@3.1.1
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: deploy
if: ${{ steps.deployment-check.outputs.continue == 'true' }}
uses: cloudflare/wrangler-action@c25aadc9657b0cdc4786c04e59a6fe92765a783b # pin@3.1.0
uses: cloudflare/wrangler-action@09fc6b504568cf179b085df24393f237fea6c7f6 # pin@3.1.1
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
accountId: ${{ secrets.CF_ACCOUNT_ID }}
Expand Down
85 changes: 43 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"prettier": "^3.0.2"
"prettier": "^3.0.3"
},
"dependencies": {
"@emotion/styled": "^11.11.0",
"@fortawesome/fontawesome-free": "^6.4.2",
"@mdi/js": "^6.9.96",
"@mdi/react": "^1.6.1",
"@mui/lab": "^5.0.0-alpha.141",
"@mui/material": "^5.14.4",
"@mui/material": "^5.14.7",
"@reduxjs/toolkit": "^1.9.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
Expand All @@ -41,7 +41,7 @@
"fuse.js": "^6.6.2",
"i18next": "^23.4.6",
"i18next-browser-languagedetector": "^7.1.0",
"i18next-http-backend": "^2.2.1",
"i18next-http-backend": "^2.2.2",
"intersection-observer": "^0.12.2",
"leaflet": "^1.9.4",
"leaflet-fullscreen": "^1.0.2",
Expand Down

0 comments on commit 5b2f005

Please sign in to comment.