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

💄Megamenu - Update Megamenu contrast #3021

Merged
merged 24 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
41ce6a0
💄 Updated SSW MegaMenu dependency
Aug 26, 2024
abe9de9
Merge branch 'main' into 1751-update-megamenu
Aug 26, 2024
f110283
🦙 Committed rebuilt tina lock file
Aug 26, 2024
b46d97b
⬆️ Updated dependencies in pnpn-lock to fix build errors
Aug 26, 2024
7d9fd6a
🔀 Resolved merge conflicts with main
Aug 26, 2024
ada15fa
Merge branch 'main' into 1751-update-megamenu
Aug 26, 2024
b5cccef
Merge branch 'main' into 1751-update-megamenu
Aug 26, 2024
caf088a
updated pnpm lock
Aug 26, 2024
4001e5b
updated lock file
Aug 26, 2024
19eb27d
reverted change to application insights
Aug 26, 2024
9b3ae81
synchronized lock file
Aug 26, 2024
2e9cc56
Updated megamenu to latest version
Aug 26, 2024
1ac73d1
Updated lock file using a newer version of pnpm
Aug 26, 2024
9641874
⬆️ Updated megamenu following PNPM version bump on mega menu repo
Aug 27, 2024
67655ac
🔀 Merge branch 'main' into 1751-update-megamenu
Aug 28, 2024
385db59
🧪 Updated tests in pipeline to use node version in nvmrc file
Aug 28, 2024
52bb199
Revert "🧪 Updated tests in pipeline to use node version in nvmrc file"
Aug 29, 2024
e505481
🧪 updated jest test to use nvmrc
Aug 29, 2024
1b06f41
🧪 Fixed jest tests breaking when installing with lts version of node
Aug 29, 2024
48960b3
⏪ restored fix to telemetry client
Aug 29, 2024
b98de8f
⬆️ Fixed telemetry client build error by bumping dependency
Aug 29, 2024
bb59ede
Merge branch 'main' into 1751-update-megamenu
Calinator444 Sep 2, 2024
27c84a9
🔀 Merge branch 'main' into 1751-update-megamenu
Sep 4, 2024
694f544
Merge branch '1751-update-megamenu' of https://github.com/SSWConsulti…
Sep 4, 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
3 changes: 3 additions & 0 deletions .github/workflows/pr-push-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
pull-requests: write
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
- uses: pnpm/action-setup@v4
with:
package_json_file: package.json
Expand Down
9 changes: 7 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
"name": "@tinacms/starter",
"version": "1.22.19",
"private": true,
"pnpm": {
"overrides": {
"@babel/parser": "7.21.9"
}
},
"scripts": {
"preinstall": "npx only-allow pnpm",
"dev": "tinacms dev -c \"node --require ./appInsight-api.js node_modules/next/dist/bin/next dev\"",
Expand Down Expand Up @@ -54,7 +59,7 @@
"@heroicons/react": "^2.1.1",
"@marketsystems/nextjs13-appdir-breadcrumbs": "^1.0.4",
"@microsoft/applicationinsights-react-js": "17.3.0",
"@microsoft/applicationinsights-web": "3.3.0",
"@microsoft/applicationinsights-web": "3.3.1",
"@next/bundle-analyzer": "^14.2.5",
"@next/third-parties": "^14.2.3",
"@tailwindcss/typography": "^0.5.13",
Expand Down Expand Up @@ -88,7 +93,7 @@
"react-use": "^17.5.1",
"schema-dts": "^1.1.2",
"sharp": "^0.33.5",
"ssw.megamenu": "4.5.9",
"ssw.megamenu": "4.6.2",
"tailwind-merge": "^2.3.0",
"tailwindcss": "3.4.10",
"tailwindcss-gradients": "^3.0.0",
Expand Down
Loading
Loading