Skip to content

Commit

Permalink
Merge pull request #4615 from luke-h1/dev
Browse files Browse the repository at this point in the history
merge dev into main
  • Loading branch information
luke-h1 authored Dec 17, 2024
2 parents 0e5594e + bb62061 commit 9e5036f
Show file tree
Hide file tree
Showing 3 changed files with 877 additions and 935 deletions.
14 changes: 7 additions & 7 deletions .github/actions/deploy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,23 @@ runs:
shell: bash
run: |
# DEPLOYED_AT
vc env rm DEPLOYED_AT production --token ${VERCEL_TOKEN} --yes
echo ${{ steps.date.outputs.date }} | vc env add DEPLOYED_AT production --token ${VERCEL_TOKEN}
pnpm vc env rm DEPLOYED_AT production --token ${VERCEL_TOKEN} --yes
echo ${{ steps.date.outputs.date }} | pnpm vc env add DEPLOYED_AT production --token ${VERCEL_TOKEN}
# DEPLOYED_BY
vc env rm DEPLOYED_BY production --token ${VERCEL_TOKEN} --yes
echo ${{ github.actor }} | vc env add DEPLOYED_BY production --token ${VERCEL_TOKEN}
pnpm vc env rm DEPLOYED_BY production --token ${VERCEL_TOKEN} --yes
echo ${{ github.actor }} | pnpm vc env add DEPLOYED_BY production --token ${VERCEL_TOKEN}
# GIT_SHA
vc env rm GIT_SHA production --token ${VERCEL_TOKEN} --yes
echo ${{ steps.git-sha.outputs.git-sha }} | vc env add GIT_SHA production --token ${VERCEL_TOKEN}
pnpm vc env rm GIT_SHA production --token ${VERCEL_TOKEN} --yes
echo ${{ steps.git-sha.outputs.git-sha }} | pnpm vc env add GIT_SHA production --token ${VERCEL_TOKEN}
env:
VERCEL_TOKEN: ${{ inputs.vercel-token }}
VERCEL_ORG_ID: ${{ inputs.vercel-org-id }}
VERCEL_PROJECT_ID: ${{ inputs.vercel-project-id }}

- name: Deploy to ${{ inputs.environment }}
run: vc -f --prod --token ${{ inputs.vercel-token }}
run: pnpm vc -f --prod --token ${{ inputs.vercel-token }}
shell: bash
env:
VERCEL_TOKEN: ${{ inputs.vercel-token }}
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,24 @@
"@opentelemetry/sdk-node": "^0.55.0",
"@opentelemetry/sdk-trace-node": "^1.28.0",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/react-aspect-ratio": "^1.1.0",
"@radix-ui/react-checkbox": "^1.1.2",
"@radix-ui/react-dialog": "^1.1.2",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-scroll-area": "^1.2.1",
"@radix-ui/react-toast": "^1.2.2",
"@radix-ui/react-tooltip": "^1.1.4",
"@radix-ui/react-visually-hidden": "^1.1.0",
"@radix-ui/react-aspect-ratio": "^1.1.1",
"@radix-ui/react-checkbox": "^1.1.3",
"@radix-ui/react-dialog": "^1.1.4",
"@radix-ui/react-popover": "^1.1.4",
"@radix-ui/react-scroll-area": "^1.2.2",
"@radix-ui/react-toast": "^1.2.4",
"@radix-ui/react-tooltip": "^1.1.6",
"@radix-ui/react-visually-hidden": "^1.1.1",
"@rehype-pretty/transformers": "^0.13.2",
"@sanity/cli": "^3.66.1",
"@sanity/client": "^6.24.1",
"@sanity/dashboard": "^4.1.0",
"@sanity/dashboard": "^4.1.2",
"@sanity/image-url": "^1.1.0",
"@sanity/ui": "^2.10.5",
"@sanity/vision": "3.66.1",
"@sanity/ui": "^2.10.11",
"@sanity/vision": "3.67.1",
"@sindresorhus/slugify": "^2.2.1",
"@tanstack/react-query": "^5.62.3",
"@tanstack/react-query-next-experimental": "^5.62.3",
"@tanstack/react-query": "^5.62.7",
"@tanstack/react-query-next-experimental": "^5.62.7",
"@vanilla-extract/css": "^1.16.1",
"@vanilla-extract/css-utils": "^0.1.4",
"@vanilla-extract/next-plugin": "^2.4.7",
Expand Down Expand Up @@ -84,15 +84,15 @@
"nanoid": "^5.0.8",
"next": "15.1.0",
"next-mdx-remote": "^5.0.0",
"next-sanity": "9.8.25",
"next-sanity": "9.8.27",
"next-seo": "^6.6.0",
"next-themes": "^0.4.4",
"nodemon": "^3.1.7",
"nodemon": "^3.1.9",
"nprogress": "^0.2.0",
"nuqs": "^2.2.3",
"parse-numeric-range": "^1.3.0",
"pino": "^9.5.0",
"prism-react-renderer": "^2.4.0",
"prism-react-renderer": "^2.4.1",
"prom-client": "^15.1.3",
"react": "19.0.0",
"react-children-utilities": "^2.10.0",
Expand All @@ -119,7 +119,7 @@
"remark-prism": "^1.3.6",
"remark-rehype": "^11.1.1",
"rss": "^1.2.2",
"sanity": "3.66.1",
"sanity": "3.67.1",
"sanity-plugin-markdown": "^5.0.0",
"sass": "^1.82.0",
"sharp": "^0.33.5",
Expand All @@ -135,7 +135,7 @@
"winston-nr": "^1.2.5"
},
"devDependencies": {
"@commitlint/cli": "^19.6.0",
"@commitlint/cli": "^19.6.1",
"@commitlint/config-conventional": "^19.6.0",
"@next/env": "15.1.0",
"@playwright/test": "^1.49.1",
Expand Down Expand Up @@ -183,12 +183,12 @@
"jest-resolve": "^29.7.0",
"jest-serializer-html": "^7.1.0",
"jest-watch-typeahead": "^2.2.2",
"lint-staged": "15.2.10",
"lint-staged": "15.2.11",
"next-router-mock": "^0.9.13",
"node-mocks-http": "^1.16.2",
"prettier": "^3.4.2",
"typescript": "^5.7.2",
"vercel": "^39.2.0"
"vercel": "^39.2.2"
},
"nextBundleAnalysis": {
"budget": 204800,
Expand Down
Loading

0 comments on commit 9e5036f

Please sign in to comment.