Skip to content

Commit

Permalink
Merge pull request #345 from the-hideout/item-by-normalizedname
Browse files Browse the repository at this point in the history
Item by normalizedname
  • Loading branch information
Razzmatazzz authored Nov 30, 2024
2 parents 0ce7b5d + c9afce9 commit 60a11ca
Show file tree
Hide file tree
Showing 8 changed files with 302 additions and 267 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: github/branch-deploy@v9.7.0
- uses: github/branch-deploy@v9.9.1
id: branch-deploy
with:
admins: the-hideout/core-contributors
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
if: ${{ steps.branch-deploy.outputs.environment == 'development' &&
steps.branch-deploy.outputs.noop != 'true' &&
steps.branch-deploy.outputs.continue == 'true' }}
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@3.11.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}
Expand All @@ -75,7 +75,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@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@3.11.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
# https://github.com/github/branch-deploy/blob/d3c24bd92505e623615b75ffdfac5ed5259adbdb/docs/merge-commit-strategy.md
- name: deployment check
uses: github/branch-deploy@v9.7.0
uses: github/branch-deploy@v9.9.1
id: deployment-check
with:
merge_deploy_mode: "true"
Expand All @@ -43,7 +43,7 @@ jobs:
run: npm ci

- name: Publish - Production
uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # pin@3.7.0
uses: cloudflare/wrangler-action@b2a0191ce60d21388e1a8dcc968b4e9966f938e1 # pin@3.11.0
with:
wranglerVersion: '2.17.0'
apiToken: ${{ secrets.CF_API_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/unlock-on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: unlock on merge
uses: github/branch-deploy@v9.7.0
uses: github/branch-deploy@v9.9.1
id: unlock-on-merge
with:
unlock_on_merge_mode: "true" # <-- indicates that this is the "Unlock on Merge Mode" workflow
Expand Down
2 changes: 1 addition & 1 deletion datasources/items.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class ItemsAPI extends WorkerKV {

async getItemByNormalizedName(context, info, normalizedName) {
const { cache } = await this.getCache(context, info);
const item = Object.values(cache.Item).find((item) => item.normalized_name === normalizedName);
const item = Object.values(cache.Item).find((item) => item.normalizedName === normalizedName);

if (!item) {
return null;
Expand Down
97 changes: 55 additions & 42 deletions http/package-lock.json

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

8 changes: 4 additions & 4 deletions http/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"nodemon": "^3.1.3"
},
"dependencies": {
"@graphql-tools/merge": "9.0.7",
"@graphql-tools/schema": "10.0.6",
"graphql-yoga": "^5.7.0",
"@graphql-tools/merge": "9.0.8",
"@graphql-tools/schema": "10.0.7",
"graphql-yoga": "^5.8.0",
"dotenv": "^16.4.5",
"uuid": "^10.0.0"
"uuid": "^11.0.2"
},
"nodemonConfig": {
"watch": ["../", "*.mjs", ".env"],
Expand Down
Loading

0 comments on commit 60a11ca

Please sign in to comment.