Merge pull request #476 from nblackburn/463-migrate-vanilla-extract-a…

…stro-plugin-to-vite-plugin

Migrate vanilla extract astro plugin to vite plugin

.eslintrc.cjs

@@ -1,7 +1,8 @@
 module.exports = {
     env: {
         browser: true,
-        es2021: true
+        es2021: true,
+        node: true
     },
     extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
     overrides: [

astro.config.mjs

@@ -2,13 +2,13 @@ import vue from '@astrojs/vue';
 import sitemap from '@astrojs/sitemap';
 import { defineConfig } from 'astro/config';
 import vercel from '@astrojs/vercel/serverless';
-import vanillaExtract from 'astro-vanilla-extract';
+import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
 
 export default defineConfig({
     output: 'hybrid',
     compressHTML: true,
     site: 'https://nblackburn.uk/',
-    integrations: [vue(), vanillaExtract(), sitemap()],
+    integrations: [vue(), sitemap()],
 
     adapter: vercel({
         imageService: true,
@@ -21,6 +21,8 @@ export default defineConfig({
     }),
 
     vite: {
+        plugins: [vanillaExtractPlugin()],
+
         define: {
             'import.meta.env.PUBLIC_VERCEL_ANALYTICS_ID': JSON.stringify(
                 process.env.VERCEL_ANALYTICS_ID

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nblackburn/website",
     "private": true,
-    "version": "1.39.1",
+    "version": "1.40.0",
     "type": "module",
     "scripts": {
         "start": "astro dev",
@@ -22,6 +22,7 @@
         "@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",
         "checkly": "^4.6.1",
         "eslint": "^8.57.0",
         "husky": "^9.0.11",
@@ -36,8 +37,8 @@
         "@astrojs/vercel": "^7.3.6",
         "@astrojs/vue": "^4.0.8",
         "@fontsource/nunito-sans": "^5.0.12",
+        "@vanilla-extract/css": "^1.14.1",
         "astro": "^4.5.2",
-        "astro-vanilla-extract": "^4.0.0",
         "date-fns": "^3.3.1",
         "sharp": "^0.33.2",
         "vue": "^3.4.21"

yarn.lock

@@ -1316,8 +1316,9 @@ __metadata:
     "@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"
+    "@vanilla-extract/vite-plugin": "npm:^3.9.5"
     astro: "npm:^4.5.2"
-    astro-vanilla-extract: "npm:^4.0.0"
     checkly: "npm:^4.6.1"
     date-fns: "npm:^3.3.1"
     eslint: "npm:^8.57.0"
@@ -2367,7 +2368,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vanilla-extract/css@npm:^1.14.0":
+"@vanilla-extract/css@npm:^1.14.0, @vanilla-extract/css@npm:^1.14.1":
   version: 1.14.1
   resolution: "@vanilla-extract/css@npm:1.14.1"
   dependencies:
@@ -2414,7 +2415,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vanilla-extract/vite-plugin@npm:^3.4.0":
+"@vanilla-extract/vite-plugin@npm:^3.9.5":
   version: 3.9.5
   resolution: "@vanilla-extract/vite-plugin@npm:3.9.5"
   dependencies:
@@ -3092,17 +3093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"astro-vanilla-extract@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "astro-vanilla-extract@npm:4.0.0"
-  dependencies:
-    "@vanilla-extract/vite-plugin": "npm:^3.4.0"
-  peerDependencies:
-    astro: ^4.0.0
-  checksum: b74b8a23513e182d8be4091ec2a0930ffdf482a4d071ad8a656b6a3da198b63cfdd959d1fd1f394358b07c10d2b1e219692f9dcf5a1f208bbb4db15637d1f895
-  languageName: node
-  linkType: hard
-
 "astro@npm:^4.5.2":
   version: 4.5.2
   resolution: "astro@npm:4.5.2"
@@ -10225,9 +10215,9 @@ __metadata:
   linkType: hard
 
 "ufo@npm:^1.3.2":
-  version: 1.4.0
-  resolution: "ufo@npm:1.4.0"
-  checksum: b7aea8503878dc5ad797d8fc6fe39fec64d9cc7e89fb147ef86ec676e37bb462d99d67c6aad20b15f7d3e6d275d66666b29214422e268f1d98f6eaf707a207a6
+  version: 1.5.0
+  resolution: "ufo@npm:1.5.0"
+  checksum: 61ba20757d54ea6d6da0655e29976c5a197e4bd4b84f834bf76ffbdab68bb240d622914ba31866f7b6fc3d3c2bb16c3fc340aca79c5fb0edf855becacd433edc
   languageName: node
   linkType: hard
 
@@ -10565,8 +10555,8 @@ __metadata:
   linkType: hard
 
 "vite-node@npm:^1.2.0":
-  version: 1.3.1
-  resolution: "vite-node@npm:1.3.1"
+  version: 1.4.0
+  resolution: "vite-node@npm:1.4.0"
   dependencies:
     cac: "npm:^6.7.14"
     debug: "npm:^4.3.4"
@@ -10575,7 +10565,7 @@ __metadata:
     vite: "npm:^5.0.0"
   bin:
     vite-node: vite-node.mjs
-  checksum: d6ca8cd5b84768f9a0f12d4327a6aca5200001bd9111991df89ad742e059566a95f8298047af7144ca128120fc67cbd7d37b3fda9700ab07f8fc130d2ad58665
+  checksum: 691e828c2abe6b62d44183c4e04bdfd119fed405439126fbdc5bfb791644baee3961c1ce429a67b360cc3d8b7c472160c7e82c59491f044a232b4ff480d8a2a2
   languageName: node
   linkType: hard