Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Item by normalizedname #345

Merged
merged 9 commits into from
Nov 30, 2024
Merged

Item by normalizedname #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cb73d6
Bump cookie and youch
dependabot[bot] Oct 16, 2024
bc1d8fc
Bump the github-actions group across 1 directory with 2 updates
dependabot[bot] Nov 1, 2024
b57d4e4
Bump the npm-dependencies group across 1 directory with 5 updates
dependabot[bot] Nov 1, 2024
654448d
Merge branch 'main' into dependabot/npm_and_yarn/multi-901da6244e
Razzmatazzz Nov 13, 2024
0698fc7
Fix querying item by normalizedName
Razzmatazzz Nov 29, 2024
9530a84
Merge branch 'dependabot/npm_and_yarn/npm-dependencies-03aa7206fe' of…
Razzmatazzz Nov 29, 2024
e50f8c2
bump deps
Razzmatazzz Nov 29, 2024
fc22dcd
Merge branch 'dependabot/github_actions/github-actions-cb55ca77e1' of…
Razzmatazzz Nov 29, 2024
c9afce9
Merge branch 'dependabot/npm_and_yarn/multi-901da6244e' of https://gi…
Razzmatazzz Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/branch-deploy.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
Loading