Skip to content

Commit df20451

Browse files
committed
fix: dependency conflicts
1 parent 16ebddf commit df20451

File tree

4 files changed

+1994
-1608
lines changed

4 files changed

+1994
-1608
lines changed

docs/nuxt.config.ts

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,43 @@ import { resolve } from 'node:path'
22

33
export default defineNuxtConfig({
44
extends: ['@nuxt/ui-pro'],
5+
56
features: {
67
devLogs: false,
78
},
9+
810
typescript: {
911
includeWorkspace: true,
1012
},
13+
1114
devtools: { enabled: false },
15+
1216
nitro: {
1317
devProxy: {
1418
host: '127.0.0.1',
1519
},
1620
},
21+
1722
routeRules: { '/api/search.json': { prerender: true } },
18-
vite: {
19-
$client: {
20-
build: {
21-
rollupOptions: {
22-
output: {
23-
chunkFileNames: '_nuxt/[name]-[hash].js',
24-
entryFileNames: '_nuxt/[name]-[hash].js',
25-
},
26-
},
27-
},
28-
},
29-
},
23+
24+
// vite: {
25+
// $client: {
26+
// build: {
27+
// rollupOptions: {
28+
// output: {
29+
// chunkFileNames: '_nuxt/[name]-[hash].js',
30+
// entryFileNames: '_nuxt/[name]-[hash].js',
31+
// },
32+
// },
33+
// },
34+
// },
35+
// },
3036

3137
alias: {
3238
'@vueuse/motion': resolve(__dirname, '../src/index.ts'),
33-
'@vueuse/motion/nuxt': resolve(__dirname, '../src/nuxt/module.ts'),
39+
'@vueuse/motion/nuxt': resolve(__dirname, '../src/nuxt/src/module.ts'),
3440
},
41+
3542
modules: [
3643
'@vueuse/motion/nuxt',
3744
'@nuxt/content',
@@ -45,7 +52,8 @@ export default defineNuxtConfig({
4552
icons: ['simple-icons'],
4653
},
4754

48-
uiPro: { license: 'oss' }, // special license for nuxt & nuxt-modules orgs
55+
// special license for nuxt & nuxt-modules orgs
56+
uiPro: { license: 'oss' },
4957

5058
// Nuxt Content
5159
content: {},
@@ -56,4 +64,6 @@ export default defineNuxtConfig({
5664
download: true,
5765
families: { 'DM+Sans': [400, 500, 600, 700] },
5866
},
59-
})
67+
68+
compatibilityDate: '2024-10-09',
69+
})

docs/package.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
"@vueuse/motion": "workspace:~"
1111
},
1212
"devDependencies": {
13-
"@iconify-json/heroicons": "^1.1.21",
14-
"@iconify-json/simple-icons": "^1.1.103",
15-
"@nuxt/content": "^2.12.1",
16-
"@nuxt/image": "^1.7.0",
17-
"@nuxt/ui-pro": "^1.2.0",
18-
"@nuxtjs/fontaine": "^0.4.2",
13+
"@iconify-json/heroicons": "^1.2.1",
14+
"@iconify-json/simple-icons": "^1.2.7",
15+
"@nuxt/content": "^2.13.2",
16+
"@nuxt/image": "^1.8.1",
17+
"@nuxt/ui-pro": "^1.4.3",
18+
"@nuxtjs/fontaine": "^0.4.3",
1919
"@nuxtjs/google-fonts": "^3.2.0",
20-
"@nuxtjs/mdc": "^0.7.1",
21-
"nuxt": "^3.11.2",
22-
"nuxt-og-image": "3.0.0-rc.54"
20+
"nuxt": "^3.13.2",
21+
"nuxt-og-image": "3.0.4"
2322
}
2423
}

package.json

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
"style-value-types": "^5.1.2"
8888
},
8989
"optionalDependencies": {
90-
"@nuxt/kit": "^3.13.0"
90+
"@nuxt/kit": "^3.13.2"
9191
},
9292
"devDependencies": {
9393
"@antfu/eslint-config": "^2.19.1",
94-
"@nuxt/kit": "^3.13.0",
95-
"@nuxt/module-builder": "^0.8.3",
96-
"@nuxt/schema": "^3.13.0",
94+
"@nuxt/kit": "^3.13.2",
95+
"@nuxt/module-builder": "^0.8.4",
96+
"@nuxt/schema": "^3.13.2",
9797
"@vitest/coverage-v8": "^1.6.0",
9898
"@vue/test-utils": "^2.4.6",
9999
"bumpp": "^9.5.2",
@@ -104,17 +104,20 @@
104104
"happy-dom": "^14.12.0",
105105
"jiti": "^1.21.6",
106106
"lint-staged": "^15.2.5",
107-
"nuxt": "^3.13.0",
107+
"nuxt": "^3.13.2",
108108
"pkg-pr-new": "^0.0.20",
109109
"prettier": "^3.2.5",
110110
"typescript": "^5.4.5",
111111
"unbuild": "^2.0.0",
112112
"vite": "5.2.12",
113113
"vitest": "^1.6.0",
114-
"vue": "^3.4.38",
114+
"vue": "^3.5.11",
115115
"yorkie": "^2.0.0"
116116
},
117117
"pnpm": {
118+
"overrides": {
119+
"nitropack": "2.9.6"
120+
},
118121
"peerDependencyRules": {
119122
"ignoreMissing": [
120123
"@algolia/client-search",

0 commit comments

Comments
 (0)