Skip to content

Commit

Permalink
Merge branch 'dev' into JoeKarow/redesign-updates
Browse files Browse the repository at this point in the history
# Conflicts:
#	crowdin.yml
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
JoeKarow committed Sep 25, 2024
2 parents 4dc1b1d + 818419b commit 0a7cd52
Show file tree
Hide file tree
Showing 6 changed files with 414 additions and 414 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
with:
run_install: false
- name: Install Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
with:
node-version-file: .nvmrc
cache: pnpm
cache-dependency-path: pnpm-lock.yaml
- name: Install dependencies
run: pnpm install
- name: Publish to Chromatic
uses: chromaui/action@b984808b772126a9f44b2b7737b131b68a2ede32 # v11
uses: chromaui/action@f4e60a7072abcac4203f4ca50613f28e199a52ba # v11
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
onlyChanged: true
Expand Down
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- name: 🏗 Initialize CodeQL
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
- name: 🚀 Perform CodeQL Analysis
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# standalone: true

- name: Install Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
with:
node-version-file: .nvmrc
cache: pnpm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run_install: false

- name: Install Node.js
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
with:
node-version-file: .nvmrc
cache: pnpm
Expand Down
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"with-env": "dotenv -e ./.env --"
},
"dependencies": {
"@crowdin/crowdin-api-client": "1.35.0",
"@crowdin/crowdin-api-client": "1.36.0",
"@crowdin/ota-client": "2.0.0",
"@mantine/carousel": "7.12.2",
"@mantine/core": "7.12.2",
"@mantine/form": "7.12.2",
"@mantine/hooks": "7.12.2",
"@neondatabase/serverless": "0.9.5",
"@next/bundle-analyzer": "14.2.12",
"@prisma/adapter-neon": "5.19.1",
"@prisma/client": "5.19.1",
"@storybook/test": "8.3.1",
"@next/bundle-analyzer": "14.2.13",
"@prisma/adapter-neon": "5.20.0",
"@prisma/client": "5.20.0",
"@storybook/test": "8.3.3",
"@t3-oss/env-nextjs": "0.11.1",
"@tabler/icons-react": "3.15.0",
"@tanstack/react-query": "5.55.4",
Expand All @@ -60,7 +60,7 @@
"i18next-http-backend": "2.6.1",
"i18next-resources-to-backend": "1.2.1",
"nanoid": "5.0.7",
"next": "14.2.12",
"next": "14.2.13",
"next-i18n-router": "5.5.1",
"next-sitemap": "4.2.3",
"react": "18.3.1",
Expand All @@ -74,27 +74,27 @@
"@faker-js/faker": "7.6.0",
"@paralleldrive/cuid2": "2.2.2",
"@relative-ci/agent": "4.2.11",
"@storybook/addon-a11y": "8.3.1",
"@storybook/addon-essentials": "8.3.1",
"@storybook/addon-interactions": "8.3.1",
"@storybook/addon-links": "8.3.1",
"@storybook/addon-viewport": "8.3.1",
"@storybook/blocks": "8.3.1",
"@storybook/nextjs": "8.3.1",
"@storybook/react": "8.3.1",
"@storybook/addon-a11y": "8.3.3",
"@storybook/addon-essentials": "8.3.3",
"@storybook/addon-interactions": "8.3.3",
"@storybook/addon-links": "8.3.3",
"@storybook/addon-viewport": "8.3.3",
"@storybook/blocks": "8.3.3",
"@storybook/nextjs": "8.3.3",
"@storybook/react": "8.3.3",
"@tomfreudenberg/next-auth-mock": "0.5.6",
"@types/luxon": "3.4.2",
"@types/node": "20.16.5",
"@types/react": "18.3.7",
"@types/node": "20.16.7",
"@types/react": "18.3.9",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "8.5.0",
"@typescript-eslint/parser": "8.5.0",
"boxen": "8.0.1",
"chromatic": "11.10.2",
"chromatic": "11.10.4",
"dotenv": "16.4.5",
"dotenv-cli": "7.4.2",
"eslint": "8.57.1",
"eslint-config-next": "14.2.12",
"eslint-config-next": "14.2.13",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-github": "1.1.4",
"eslint-import-resolver-typescript": "3.6.3",
Expand All @@ -107,7 +107,7 @@
"eslint-plugin-turbo": "2.1.1",
"husky": "9.1.6",
"i18next-hmr": "3.1.3",
"knip": "5.30.2",
"knip": "5.30.5",
"lint-staged": "15.2.10",
"listr2": "8.2.4",
"luxon": "3.5.0",
Expand All @@ -119,15 +119,15 @@
"prettier-plugin-jsdoc": "1.3.0",
"prettier-plugin-packagejson": "2.5.2",
"prettier-plugin-prisma": "5.0.0",
"prisma": "5.19.1",
"prisma": "5.20.0",
"react-docgen-typescript": "2.2.2",
"storybook": "8.3.1",
"storybook": "8.3.3",
"tsx": "4.19.1",
"turbo": "2.1.2",
"type-fest": "4.26.1",
"typescript": "5.6.2"
},
"packageManager": "pnpm@9.10.0",
"packageManager": "pnpm@9.11.0",
"engines": {
"node": "^20.12.2",
"pnpm": "^9.0.0"
Expand Down
Loading

0 comments on commit 0a7cd52

Please sign in to comment.