fix: dependency conflicts

vueuse · Oct 9, 2024 · df20451 · df20451
1 parent 16ebddf
commit df20451
Show file tree

Hide file tree

Showing 4 changed files with 1,994 additions and 1,608 deletions.
diff --git a/docs/nuxt.config.ts b/docs/nuxt.config.ts
@@ -2,36 +2,43 @@ import { resolve } from 'node:path'
 
 export default defineNuxtConfig({
   extends: ['@nuxt/ui-pro'],
+
   features: {
     devLogs: false,
   },
+
   typescript: {
     includeWorkspace: true,
   },
+
   devtools: { enabled: false },
+
   nitro: {
     devProxy: {
       host: '127.0.0.1',
     },
   },
+
   routeRules: { '/api/search.json': { prerender: true } },
-  vite: {
-    $client: {
-      build: {
-        rollupOptions: {
-          output: {
-            chunkFileNames: '_nuxt/[name]-[hash].js',
-            entryFileNames: '_nuxt/[name]-[hash].js',
-          },
-        },
-      },
-    },
-  },
+
+  // vite: {
+  //   $client: {
+  //     build: {
+  //       rollupOptions: {
+  //         output: {
+  //           chunkFileNames: '_nuxt/[name]-[hash].js',
+  //           entryFileNames: '_nuxt/[name]-[hash].js',
+  //         },
+  //       },
+  //     },
+  //   },
+  // },
 
   alias: {
     '@vueuse/motion': resolve(__dirname, '../src/index.ts'),
-    '@vueuse/motion/nuxt': resolve(__dirname, '../src/nuxt/module.ts'),
+    '@vueuse/motion/nuxt': resolve(__dirname, '../src/nuxt/src/module.ts'),
   },
+
   modules: [
     '@vueuse/motion/nuxt',
     '@nuxt/content',
@@ -45,7 +52,8 @@ export default defineNuxtConfig({
     icons: ['simple-icons'],
   },
 
-  uiPro: { license: 'oss' }, // special license for nuxt & nuxt-modules orgs
+  // special license for nuxt & nuxt-modules orgs
+  uiPro: { license: 'oss' },
 
   // Nuxt Content
   content: {},
@@ -56,4 +64,6 @@ export default defineNuxtConfig({
     download: true,
     families: { 'DM+Sans': [400, 500, 600, 700] },
   },
-})
+
+  compatibilityDate: '2024-10-09',
+})
diff --git a/docs/package.json b/docs/package.json
@@ -10,15 +10,14 @@
     "@vueuse/motion": "workspace:~"
   },
   "devDependencies": {
-    "@iconify-json/heroicons": "^1.1.21",
-    "@iconify-json/simple-icons": "^1.1.103",
-    "@nuxt/content": "^2.12.1",
-    "@nuxt/image": "^1.7.0",
-    "@nuxt/ui-pro": "^1.2.0",
-    "@nuxtjs/fontaine": "^0.4.2",
+    "@iconify-json/heroicons": "^1.2.1",
+    "@iconify-json/simple-icons": "^1.2.7",
+    "@nuxt/content": "^2.13.2",
+    "@nuxt/image": "^1.8.1",
+    "@nuxt/ui-pro": "^1.4.3",
+    "@nuxtjs/fontaine": "^0.4.3",
     "@nuxtjs/google-fonts": "^3.2.0",
-    "@nuxtjs/mdc": "^0.7.1",
-    "nuxt": "^3.11.2",
-    "nuxt-og-image": "3.0.0-rc.54"
+    "nuxt": "^3.13.2",
+    "nuxt-og-image": "3.0.4"
   }
 }
diff --git a/package.json b/package.json
@@ -87,13 +87,13 @@
     "style-value-types": "^5.1.2"
   },
   "optionalDependencies": {
-    "@nuxt/kit": "^3.13.0"
+    "@nuxt/kit": "^3.13.2"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^2.19.1",
-    "@nuxt/kit": "^3.13.0",
-    "@nuxt/module-builder": "^0.8.3",
-    "@nuxt/schema": "^3.13.0",
+    "@nuxt/kit": "^3.13.2",
+    "@nuxt/module-builder": "^0.8.4",
+    "@nuxt/schema": "^3.13.2",
     "@vitest/coverage-v8": "^1.6.0",
     "@vue/test-utils": "^2.4.6",
     "bumpp": "^9.5.2",
@@ -104,17 +104,20 @@
     "happy-dom": "^14.12.0",
     "jiti": "^1.21.6",
     "lint-staged": "^15.2.5",
-    "nuxt": "^3.13.0",
+    "nuxt": "^3.13.2",
     "pkg-pr-new": "^0.0.20",
     "prettier": "^3.2.5",
     "typescript": "^5.4.5",
     "unbuild": "^2.0.0",
     "vite": "5.2.12",
     "vitest": "^1.6.0",
-    "vue": "^3.4.38",
+    "vue": "^3.5.11",
     "yorkie": "^2.0.0"
   },
   "pnpm": {
+    "overrides": {
+      "nitropack": "2.9.6"
+    },
     "peerDependencyRules": {
       "ignoreMissing": [
         "@algolia/client-search",