Skip to content

Commit 156f88d

Browse files
committed
fix: nuxt rc to 3.0
1 parent f5c2f9b commit 156f88d

File tree

9 files changed

+1993
-3909
lines changed

9 files changed

+1993
-3909
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
"generate:docs": "pnpm --filter docs generate",
99
"dev:viteplay": "pnpm --filter viteplay dev",
1010
"build:viteplay": "pnpm --filter viteplay build",
11-
"prepare:vfm": "pnpm --filter vue-final-modal prepare-lib",
1211
"dev:vfm": "pnpm --filter vue-final-modal dev",
1312
"build:vfm": "pnpm --filter vue-final-modal build",
1413
"test:vfm": "pnpm --filter vue-final-modal test",
1514
"coverage:vfm": "pnpm --filter vue-final-modal coverage",
1615
"release:vfm": "pnpm --filter vue-final-modal release",
1716
"lint": "eslint . --ext=.ts,.vue --fix",
1817
"typecheck": "pnpm --parallel typecheck",
19-
"postinstall": "pnpm prepare:vfm"
18+
"postinstall": "pnpm build:vfm"
2019
},
2120
"dependencies": {
2221
"vue": "^3.2.45"
2322
},
2423
"devDependencies": {
25-
"@antfu/eslint-config": "^0.29.2",
24+
"@antfu/eslint-config": "^0.34.1",
2625
"@types/node": "^18.0.0",
2726
"@vitejs/plugin-vue": "^4.0.0",
27+
"@vitejs/plugin-vue-jsx": "^3.0.0",
2828
"@vue/test-utils": "^2.2.6",
2929
"concurrently": "^7.4.0",
30-
"eslint": "^8.26.0",
31-
"pnpm": "^7.20.0",
30+
"eslint": "^8.31.0",
31+
"pnpm": "^7.23.0",
3232
"sass": "^1.55.0",
3333
"ts-node": "^10.9.1",
3434
"typescript": "^4.8.4",
3535
"vite": "^4.0.3",
36-
"vue-tsc": "^1.0.18"
36+
"vue-tsc": "^1.0.24"
3737
}
3838
}

packages/nuxt/package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
"postinstall": "pnpm dev:prepare && pnpm prepack"
2525
},
2626
"dependencies": {
27-
"@nuxt/kit": "^3.0.0-rc.12",
27+
"@nuxt/kit": "^3.0.0",
2828
"vue-final-modal": "workspace:4.0.0-rc.8"
2929
},
3030
"devDependencies": {
31-
"@nuxt/module-builder": "^0.2.0",
32-
"@nuxt/schema": "^3.0.0-rc.12",
33-
"@nuxtjs/eslint-config-typescript": "^11.0.0",
34-
"eslint": "^8.26.0",
35-
"nuxt": "^3.0.0-rc.12",
31+
"@nuxt/module-builder": "^0.2.1",
32+
"@nuxt/schema": "^3.0.0",
33+
"@nuxtjs/eslint-config-typescript": "^12.0.0",
34+
"nuxt": "^3.0.0",
3635
"release-it": "^15.5.0"
3736
}
3837
}

packages/vue-final-modal/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"dist"
2222
],
2323
"scripts": {
24-
"prepare-lib": "vue-tsc --noEmit && vite build",
2524
"dev": "vue-tsc --noEmit && vite build -w",
2625
"build": "vue-tsc --noEmit && vite build && vue-tsc -p tsconfig.build-dts.json --declaration --emitDeclarationOnly",
2726
"test": "vitest run",
@@ -41,10 +40,13 @@
4140
"@cypress/vue": "^5.0.1",
4241
"@release-it/conventional-changelog": "^5.1.1",
4342
"@vitest/coverage-istanbul": "^0.26.2",
43+
"@vue-macros/short-vmodel": "^1.0.3",
44+
"@vue-macros/volar": "^0.5.10",
4445
"cypress": "^11.1.0",
4546
"jsdom": "^20.0.2",
4647
"release-it": "^15.5.0",
47-
"unplugin-vue-macros": "^0.15.2",
48+
"unplugin-vue-macros": "^1.3.2",
49+
"unplugin-vue-define-options": "^1.1.3",
4850
"vitest": "^0.25.7"
4951
},
5052
"peerDependencies": {

packages/vue-final-modal/tsconfig.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"types": [
77
"vite/client",
88
"vitest",
9-
"unplugin-vue-macros/macros-global",
9+
"unplugin-vue-define-options/macros-global",
1010
"cypress"
1111
],
1212
"paths": {
@@ -18,6 +18,16 @@
1818
]
1919
}
2020
},
21+
"vueCompilerOptions": {
22+
"plugins": [
23+
"@vue-macros/volar/define-model",
24+
"@vue-macros/volar/short-vmodel",
25+
"@vue-macros/volar/define-slots"
26+
],
27+
"shortVmodel": {
28+
"prefix": "$"
29+
}
30+
},
2131
"exclude": [
2232
"dist",
2333
"coverage",

packages/vue-final-modal/vite.config.ts

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import path from 'path'
2-
import vueMacros from 'unplugin-vue-macros/vite'
3-
import vue from '@vitejs/plugin-vue'
42
import { defineConfig } from 'vite'
3+
import Vue from '@vitejs/plugin-vue'
4+
import VueJsx from '@vitejs/plugin-vue-jsx'
5+
import VueMacros from 'unplugin-vue-macros/vite'
6+
import { transformShortVmodel } from '@vue-macros/short-vmodel'
7+
import DefineOptions from 'unplugin-vue-define-options/vite'
58

69
const name = 'index'
710

@@ -12,11 +15,26 @@ export default defineConfig({
1215
},
1316
},
1417
plugins: [
15-
vueMacros({
18+
VueMacros({
19+
setupBlock: true,
1620
plugins: {
17-
vue: vue(),
21+
vue: Vue({
22+
include: [/\.vue$/, /setup\.[cm]?[jt]sx?$/],
23+
reactivityTransform: true,
24+
template: {
25+
compilerOptions: {
26+
nodeTransforms: [
27+
transformShortVmodel({
28+
prefix: '$',
29+
}),
30+
],
31+
},
32+
},
33+
}),
34+
vueJsx: VueJsx(),
1835
},
1936
}),
37+
DefineOptions()
2038
],
2139
publicDir: false,
2240
build: {

0 commit comments

Comments
 (0)