Merge pull request #4321 from luke-h1/dev

merge dev into main
luke-h1 · Jan 19, 2024 · 3cc0d67 · 3cc0d67
2 parents 2ed883b + 12515f2
commit 3cc0d67
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 29 deletions.
diff --git a/next.config.js b/next.config.js
@@ -1,4 +1,5 @@
 const { createVanillaExtractPlugin } = require('@vanilla-extract/next-plugin');
+const million = require('million/compiler');
 
 const withVanillaExtract = createVanillaExtractPlugin();
 
@@ -63,6 +64,7 @@ const nextConfig = {
   },
   experimental: {
     webVitalsAttribution: ['CLS', 'LCP'],
+    optimizePackageImports: ['framer-motion'],
   },
   images: {
     remotePatterns: [
@@ -130,4 +132,9 @@ const nextConfig = {
   },
 };
 
-module.exports = withVanillaExtract(nextConfig);
+const millionConfig = {
+  mute: true,
+  auto: { rsc: true },
+};
+
+module.exports = million.next(withVanillaExtract(nextConfig), millionConfig);
diff --git a/package.json b/package.json
@@ -55,6 +55,7 @@
     "groq": "3.25.0",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
+    "million": "^2.6.4",
     "motion": "^10.17.0",
     "nanoid": "^5.0.4",
     "newrelic": "^11.9.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml