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.

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

release: 2023-07-18 #673

Merged
merged 27 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5ded30d
chore(web): update next.js to v13.4.10 (#666)
renovate[bot] Jul 15, 2023
d7291cc
chore(workflows): update github actions (#665)
renovate[bot] Jul 15, 2023
475b7c4
fix(aws-user-migrate): update all non-major dependencies (#656)
renovate[bot] Jul 15, 2023
0ed982e
add indexing
JoeKarow Jul 17, 2023
27f99d2
Merge branch 'dev' into PLI-31-search-result-ordering
kodiakhq[bot] Jul 17, 2023
a1f5024
fix(db): update all non-major dependencies (#668)
renovate[bot] Jul 18, 2023
8925c67
Merge branch 'dev' into PLI-31-search-result-ordering
kodiakhq[bot] Jul 18, 2023
0f08bd3
fix(): update dependency prettier-plugin-prisma to v5 (#671)
renovate[bot] Jul 18, 2023
6715636
Merge branch 'dev' into PLI-31-search-result-ordering
kodiakhq[bot] Jul 18, 2023
cb2cfda
chore(ui): update dependency type-fest to v4 (#670)
renovate[bot] Jul 18, 2023
b3433d7
Merge branch 'dev' into PLI-31-search-result-ordering
kodiakhq[bot] Jul 18, 2023
2cc21e3
update template
JoeKarow Jul 17, 2023
dc6769e
data migration: update listing
JoeKarow Jul 17, 2023
fda6e4f
small updates
JoeKarow Jul 17, 2023
2f22911
fix eslint plugin error
JoeKarow Jul 17, 2023
9887e28
migrations: add index
JoeKarow Jul 18, 2023
7394589
badge for national coverage area
JoeKarow Jul 18, 2023
aefb455
search refactoring
JoeKarow Jul 18, 2023
9b7d1da
update locale file
JoeKarow Jul 18, 2023
dddf773
correct orgSlug -> orgId for freeText
JoeKarow Jul 18, 2023
61c8489
update search query
JoeKarow Jul 18, 2023
e218d69
indexing & views
JoeKarow Jul 18, 2023
fff60e3
update config
JoeKarow Jul 18, 2023
f3795a3
unescape for page title
JoeKarow Jul 18, 2023
861bddc
correct tsKey for tooltip
JoeKarow Jul 18, 2023
e23eb96
fix linting error
JoeKarow Jul 18, 2023
2057018
fix: search result order (#669)
kodiakhq[bot] Jul 18, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
- name: ⤵️ Check out code from GitHub
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3
- name: 🏗 Initialize CodeQL
uses: github/codeql-action/init@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2
uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2
- name: 🚀 Perform CodeQL Analysis
uses: github/codeql-action/analyze@46ed16ded91731b2df79a2893d3aea8e9f03b5c4 # v2
uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2
2 changes: 1 addition & 1 deletion .github/workflows/codesee-arch-diagram.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
continue-on-error: true
name: Analyze the repo with CodeSee
steps:
- uses: Codesee-io/codesee-action@23829afb4f274fd69e1b51558f6f08ae267e443c # v2
- uses: Codesee-io/codesee-action@7e127899d48260ab4738902b7cda15ffc695f95e # v2
with:
codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
102 changes: 51 additions & 51 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,49 +22,49 @@
},
"dependencies": {
"@aws-crypto/sha256-js": "4.0.0",
"@aws-sdk/client-s3": "3.363.0",
"@aws-sdk/signature-v4": "3.357.0",
"@crowdin/crowdin-api-client": "1.23.3",
"@aws-sdk/client-s3": "3.370.0",
"@aws-sdk/signature-v4": "3.370.0",
"@crowdin/crowdin-api-client": "1.23.4",
"@crowdin/ota-client": "1.0.0",
"@emotion/react": "11.11.1",
"@emotion/server": "11.11.0",
"@iconify/react": "4.1.1",
"@mantine/carousel": "6.0.16",
"@mantine/core": "6.0.16",
"@mantine/dates": "6.0.16",
"@mantine/dropzone": "6.0.16",
"@mantine/form": "6.0.16",
"@mantine/hooks": "6.0.16",
"@mantine/modals": "6.0.16",
"@mantine/next": "6.0.16",
"@mantine/notifications": "6.0.16",
"@mantine/nprogress": "6.0.16",
"@mantine/prism": "6.0.16",
"@mantine/spotlight": "6.0.16",
"@mantine/tiptap": "6.0.16",
"@mantine/utils": "6.0.16",
"@next/bundle-analyzer": "13.4.9",
"@mantine/carousel": "6.0.17",
"@mantine/core": "6.0.17",
"@mantine/dates": "6.0.17",
"@mantine/dropzone": "6.0.17",
"@mantine/form": "6.0.17",
"@mantine/hooks": "6.0.17",
"@mantine/modals": "6.0.17",
"@mantine/next": "6.0.17",
"@mantine/notifications": "6.0.17",
"@mantine/nprogress": "6.0.17",
"@mantine/prism": "6.0.17",
"@mantine/spotlight": "6.0.17",
"@mantine/tiptap": "6.0.17",
"@mantine/utils": "6.0.17",
"@next/bundle-analyzer": "13.4.10",
"@opentelemetry/api": "1.4.1",
"@opentelemetry/exporter-trace-otlp-http": "0.40.0",
"@opentelemetry/instrumentation": "0.40.0",
"@opentelemetry/instrumentation-fetch": "0.40.0",
"@opentelemetry/instrumentation-http": "0.40.0",
"@opentelemetry/resources": "1.14.0",
"@opentelemetry/sdk-node": "0.40.0",
"@opentelemetry/sdk-trace-base": "1.14.0",
"@opentelemetry/sdk-trace-node": "1.14.0",
"@opentelemetry/semantic-conventions": "1.14.0",
"@opentelemetry/exporter-trace-otlp-http": "0.41.0",
"@opentelemetry/instrumentation": "0.41.0",
"@opentelemetry/instrumentation-fetch": "0.41.0",
"@opentelemetry/instrumentation-http": "0.41.0",
"@opentelemetry/resources": "1.15.0",
"@opentelemetry/sdk-node": "0.41.0",
"@opentelemetry/sdk-trace-base": "1.15.0",
"@opentelemetry/sdk-trace-node": "1.15.0",
"@opentelemetry/semantic-conventions": "1.15.0",
"@prisma/instrumentation": "5.0.0",
"@sentry/nextjs": "7.57.0",
"@tanstack/react-query": "4.29.19",
"@sentry/nextjs": "7.59.2",
"@tanstack/react-query": "4.29.25",
"@tanstack/react-table": "8.9.3",
"@tiptap/extension-link": "2.0.3",
"@tiptap/react": "2.0.3",
"@tiptap/starter-kit": "2.0.3",
"@trpc/client": "10.33.1",
"@trpc/next": "10.33.1",
"@trpc/react-query": "10.33.1",
"@trpc/server": "10.33.1",
"@tiptap/extension-link": "2.0.4",
"@tiptap/react": "2.0.4",
"@tiptap/starter-kit": "2.0.4",
"@trpc/client": "10.34.0",
"@trpc/next": "10.34.0",
"@trpc/react-query": "10.34.0",
"@trpc/server": "10.34.0",
"@vercel/analytics": "1.0.1",
"@vercel/kv": "0.2.2",
"@weareinreach/api": "workspace:*",
Expand All @@ -80,60 +80,60 @@
"embla-carousel-autoplay": "7.1.0",
"embla-carousel-react": "7.1.0",
"flat": "5.0.2",
"i18next": "23.2.7",
"i18next": "23.2.11",
"i18next-browser-languagedetector": "7.1.0",
"i18next-chained-backend": "4.4.0",
"i18next-http-backend": "2.2.1",
"i18next-intervalplural-postprocessor": "3.0.0",
"i18next-localstorage-backend": "4.1.1",
"i18next-multiload-backend-adapter": "2.2.1",
"i18next-multiload-backend-adapter": "2.2.2",
"ioredis": "5.3.2",
"just-compact": "3.2.0",
"just-compare": "2.3.0",
"luxon": "3.3.0",
"next": "13.4.9",
"next": "13.4.10",
"next-auth": "4.22.1",
"next-i18next": "14.0.0",
"next-seo": "6.1.0",
"nextjs-routes": "1.0.9",
"object-sizeof": "2.6.2",
"pretty-bytes": "6.1.0",
"object-sizeof": "2.6.3",
"pretty-bytes": "6.1.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-error-boundary": "4.0.10",
"react-i18next": "13.0.1",
"react-i18next": "13.0.2",
"tslog": "4.8.2",
"zod": "3.21.4"
},
"devDependencies": {
"@playwright/test": "1.35.1",
"@playwright/test": "1.36.1",
"@prisma/nextjs-monorepo-workaround-plugin": "5.0.0",
"@tanstack/react-query-devtools": "4.29.19",
"@tanstack/react-query-devtools": "4.29.25",
"@tanstack/react-table-devtools": "8.7.6",
"@total-typescript/ts-reset": "0.4.2",
"@types/eslint": "8.40.2",
"@types/eslint": "8.44.0",
"@types/flat": "5.0.2",
"@types/luxon": "3.3.0",
"@types/node": "18.16.19",
"@types/prettier": "2.7.3",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@types/react": "18.2.15",
"@types/react-dom": "18.2.7",
"@types/umami": "0.1.1",
"@typescript-eslint/eslint-plugin": "6.0.0",
"@typescript-eslint/parser": "6.0.0",
"@typescript-eslint/eslint-plugin": "6.1.0",
"@typescript-eslint/parser": "6.1.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"commander": "11.0.0",
"dotenv": "16.3.1",
"eslint": "8.44.0",
"eslint": "8.45.0",
"eslint-plugin-i18next": "6.0.3",
"i18next-resources-for-ts": "1.2.1",
"listr2": "6.6.0",
"prettier": "2.8.8",
"trpc-client-devtools-link": "0.2.1-next",
"trpc-panel": "1.3.4",
"trpc-playground": "1.0.4",
"type-fest": "3.12.0",
"type-fest": "4.0.0",
"typescript": "5.1.6"
},
"ct3aMetadata": {
Expand Down
3 changes: 2 additions & 1 deletion apps/app/public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"badge": {
"claimed-tool-tip": "This organization has been claimed by a verified representative.<br/><link1>Learn more.</link1>",
"community-tool-tip": "Community served by this organization.",
"national-tool-tip": "Offers services throughout {{country}}.",
"remote-tool-tip": "Available remotely",
"service-tool-tip": "Service(s) offered by this organization.",
"unclaimed-tool-tip": "This organization has not yet been claimed by a representative.<br/><link1>Claim this organization</link1> to build trust with our community, update your own information, and more."
Expand Down Expand Up @@ -143,7 +144,7 @@
"org-image": "Organization photo",
"other-specify": "Other (please specify)",
"page-title": {
"base": "{{title}} - InReach",
"base": "{{- title}} - InReach",
"search-results": "Search Results"
},
"password": "Password",
Expand Down
2 changes: 1 addition & 1 deletion apps/app/src/pages/search/[...params]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ export const getServerSideProps: GetServerSideProps<
// const nextPage = PageIndexSchema.parse(query.page) * SEARCH_RESULT_PAGE_SIZE

const [i18n] = await Promise.allSettled([
getServerSideTranslations(locale, ['services', 'common', 'attribute']),
getServerSideTranslations(locale, ['services', 'common', 'attribute', 'country']),
ssg.organization.searchDistance.prefetch({ lat, lon, dist, unit, skip, take }),
// await ssg.organization.searchDistance.prefetch({ lat, lon, dist, unit, skip: nextPage, take })
ssg.service.getFilterOptions.prefetch(),
Expand Down
48 changes: 24 additions & 24 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,41 @@
"@crowdin/ota-client": "1.0.0",
"@emotion/react": "11.11.1",
"@emotion/server": "11.11.0",
"@mantine/carousel": "6.0.16",
"@mantine/core": "6.0.16",
"@mantine/dates": "6.0.16",
"@mantine/dropzone": "6.0.16",
"@mantine/form": "6.0.16",
"@mantine/hooks": "6.0.16",
"@mantine/modals": "6.0.16",
"@mantine/next": "6.0.16",
"@mantine/notifications": "6.0.16",
"@mantine/nprogress": "6.0.16",
"@mantine/prism": "6.0.16",
"@mantine/spotlight": "6.0.16",
"@mantine/tiptap": "6.0.16",
"@tiptap/extension-link": "2.0.3",
"@tiptap/react": "2.0.3",
"@tiptap/starter-kit": "2.0.3",
"@mantine/carousel": "6.0.17",
"@mantine/core": "6.0.17",
"@mantine/dates": "6.0.17",
"@mantine/dropzone": "6.0.17",
"@mantine/form": "6.0.17",
"@mantine/hooks": "6.0.17",
"@mantine/modals": "6.0.17",
"@mantine/next": "6.0.17",
"@mantine/notifications": "6.0.17",
"@mantine/nprogress": "6.0.17",
"@mantine/prism": "6.0.17",
"@mantine/spotlight": "6.0.17",
"@mantine/tiptap": "6.0.17",
"@tiptap/extension-link": "2.0.4",
"@tiptap/react": "2.0.4",
"@tiptap/starter-kit": "2.0.4",
"@weareinreach/env": "workspace:*",
"@weareinreach/ui": "workspace:*",
"dayjs": "1.11.9",
"embla-carousel-react": "7.1.0",
"i18next": "23.2.7",
"next": "13.4.9",
"i18next": "23.2.11",
"next": "13.4.10",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-i18next": "13.0.1"
"react-i18next": "13.0.2"
},
"devDependencies": {
"@next/bundle-analyzer": "13.4.9",
"@types/eslint": "8.40.2",
"@next/bundle-analyzer": "13.4.10",
"@types/eslint": "8.44.0",
"@types/node": "18.16.19",
"@types/react": "18.2.14",
"@types/react-dom": "18.2.6",
"@types/react": "18.2.15",
"@types/react-dom": "18.2.7",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "0.100.0",
"eslint": "8.44.0",
"eslint": "8.45.0",
"typescript": "5.1.6"
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
"lint-staged": "13.2.3",
"prettier": "2.8.8",
"prettier-plugin-jsdoc": "0.4.2",
"prettier-plugin-packagejson": "2.4.4",
"prettier-plugin-prisma": "4.13.0",
"prettier-plugin-packagejson": "2.4.5",
"prettier-plugin-prisma": "5.0.0",
"tsx": "3.12.7",
"turbo": "1.10.7",
"turbo": "1.10.8",
"typescript": "5.1.6",
"typesync": "0.11.1"
},
"packageManager": "[email protected].6",
"packageManager": "[email protected].9",
"engines": {
"node": "^18",
"pnpm": "^7 || ^8"
Expand Down
Loading
Loading