Skip to content

Commit

Permalink
Merge branch 'main' into 463-migrate-vanilla-extract-astro-plugin-to-…
Browse files Browse the repository at this point in the history
…vite-plugin

# Conflicts:
#	package.json
  • Loading branch information
nblackburn committed Mar 15, 2024
2 parents 99ad60a + 66b6b85 commit b298f4b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@commitlint/config-conventional": "^19.0.3",
"@playwright/test": "^1.42.1",
"@types/eslint": "^8",
"@types/node": "^20.11.27",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@vanilla-extract/vite-plugin": "^3.9.5",
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,7 @@ __metadata:
"@fontsource/nunito-sans": "npm:^5.0.12"
"@playwright/test": "npm:^1.42.1"
"@types/eslint": "npm:^8"
"@types/node": "npm:^20.11.27"
"@typescript-eslint/eslint-plugin": "npm:^7.2.0"
"@typescript-eslint/parser": "npm:^7.2.0"
"@vanilla-extract/css": "npm:^1.14.1"
Expand Down Expand Up @@ -2153,6 +2154,15 @@ __metadata:
languageName: node
linkType: hard

"@types/node@npm:^20.11.27":
version: 20.11.27
resolution: "@types/node@npm:20.11.27"
dependencies:
undici-types: "npm:~5.26.4"
checksum: 4be53485d499dd7c7896190e76a0ce1f6c6917d1f4d0b4b240b3670160fcbc548daed32beaac0fc92429b37dbeaa2496fc56f460acaab969bddb77394318a89b
languageName: node
linkType: hard

"@types/sax@npm:^1.2.1":
version: 1.2.7
resolution: "@types/sax@npm:1.2.7"
Expand Down

0 comments on commit b298f4b

Please sign in to comment.