diff --git a/nuxt.config.ts b/nuxt.config.ts index 2fccc56a..8ecb43cb 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -1,11 +1,10 @@ -import VueMacros from 'unplugin-vue-macros/vite' - export default defineNuxtConfig({ ssr: false, modules: [ '@vueuse/nuxt', '@unocss/nuxt', '@pinia/nuxt', + '@vue-macros/nuxt', ], experimental: { reactivityTransform: true, @@ -26,11 +25,7 @@ export default defineNuxtConfig({ build: { target: 'esnext', }, - plugins: [ - VueMacros({ - defineModel: true, - }), - ], + }, postcss: { plugins: { diff --git a/package.json b/package.json index 79686157..25f972e9 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/fs-extra": "^9.0.13", "@types/sanitize-html": "^2.6.2", "@unocss/nuxt": "^0.46.5", - "@vue-macros/volar": "^0.5.3", + "@vue-macros/nuxt": "^0.0.2", "@vueuse/nuxt": "^9.5.0", "blurhash": "^2.0.4", "eslint": "^8.27.0", @@ -35,7 +35,6 @@ "rollup-plugin-node-polyfills": "^0.2.1", "sanitize-html": "^2.7.3", "typescript": "^4.9.3", - "ufo": "^1.0.0", - "unplugin-vue-macros": "^0.16.4" + "ufo": "^1.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8648a73b..c07ca01e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ specifiers: '@types/fs-extra': ^9.0.13 '@types/sanitize-html': ^2.6.2 '@unocss/nuxt': ^0.46.5 - '@vue-macros/volar': ^0.5.3 + '@vue-macros/nuxt': ^0.0.2 '@vueuse/nuxt': ^9.5.0 blurhash: ^2.0.4 eslint: ^8.27.0 @@ -25,7 +25,6 @@ specifiers: sanitize-html: ^2.7.3 typescript: ^4.9.3 ufo: ^1.0.0 - unplugin-vue-macros: ^0.16.4 devDependencies: '@antfu/eslint-config': 0.30.1_e3uo4sehh4zr4i6m57mkkxxv7y @@ -37,7 +36,7 @@ devDependencies: '@types/fs-extra': 9.0.13 '@types/sanitize-html': 2.6.2 '@unocss/nuxt': 0.46.5 - '@vue-macros/volar': 0.5.3 + '@vue-macros/nuxt': 0.0.2_nuxt@3.0.0 '@vueuse/nuxt': 9.5.0_nuxt@3.0.0 blurhash: 2.0.4 eslint: 8.27.0 @@ -52,7 +51,6 @@ devDependencies: sanitize-html: 2.7.3 typescript: 4.9.3 ufo: 1.0.0 - unplugin-vue-macros: 0.16.4 packages: @@ -1708,8 +1706,8 @@ packages: '@vue-macros/common': 0.13.4 dev: true - /@vue-macros/better-define/0.2.0: - resolution: {integrity: sha512-hcYGpfGLGBw+32jQyAwJU4bd1eE95cD7/aqv9Ov86LJFR5nZ/d7P/Fh1HJBE4KUxC9vJa2ZtdkdiV83n6NADYA==} + /@vue-macros/better-define/1.0.0: + resolution: {integrity: sha512-SVQky3fk9wRrSH153Tw1+0sP5i6OB5iiUOtAC/mceH0IN5NGbDXt2YagELEM2+6caDquXNRL6jbG0HfRH6u0cA==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 @@ -1727,8 +1725,8 @@ packages: magic-string: 0.26.7 dev: true - /@vue-macros/define-model/0.14.1: - resolution: {integrity: sha512-Mwg/+OGDTEzaGyGXcAUJ0ZfEmgXKEVeWk3zVR6wC7l0f8OOBZ4lb1gWq9NJT+D1Xxy34mdNmkmRVoevW5kN0iQ==} + /@vue-macros/define-model/1.0.0: + resolution: {integrity: sha512-Nyh1fidDcfCzEKAo/ljwdQbpgMOrNowdJomB/qnkz/Lx4CVEaRk87LA2o3T99qIOogRfya8af+bLM8dNOq8dAQ==} engines: {node: '>=14.19.0'} peerDependencies: '@vueuse/core': ^9.0.0 @@ -1753,8 +1751,8 @@ packages: unplugin: 1.0.0 dev: true - /@vue-macros/define-render/0.13.9: - resolution: {integrity: sha512-TD4/vpVagRiOELKMzbT8VpLd0vTgYcjLzO/GVmtXLQ7LxnAgOQCTdmoQNfCp4B2Jx0KgKINgZJIoHV2c9n84pA==} + /@vue-macros/define-render/1.0.0: + resolution: {integrity: sha512-Szm25QnX65YaNMm/wbP4j2TdMKwkWQSGRU72/kadt1yH4/BzwjcQlQIYIpBxEnbYb3BeQyj0NGL5695E1jGqEg==} engines: {node: '>=14.19.0'} peerDependencies: vue: ^2.7.0 || ^3.0.0 @@ -1775,8 +1773,8 @@ packages: unplugin: 1.0.0 dev: true - /@vue-macros/hoist-static/0.12.8: - resolution: {integrity: sha512-aSjTBntS/DhQvhyvbSluXwVtrw1WRAxcGjIJTUrgXLyagurIt0KQR8B2ut4ulnMzRaxD8TYmhoWmnzkSNUpXdw==} + /@vue-macros/hoist-static/1.0.0: + resolution: {integrity: sha512-NcFVAfKM9UjChOXy+yno4vhTsSHT6qUKbmd4/I8ucoiJT8IfFyGCwFoZZ8uqgjIwlzSUDxJ/vYoDRjiziTiNKg==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 @@ -1802,6 +1800,37 @@ packages: - webpack dev: true + /@vue-macros/nuxt/0.0.2_nuxt@3.0.0: + resolution: {integrity: sha512-nY8dIbqyi9ZFLR2D5SEJOTEP9PAuxYR2V/oKJsTI9O+ZJXNktV8YrOoI5cEWxSrF6zwzYjyrR/01HsA2paHXLg==} + engines: {node: '>=14.19.0'} + peerDependencies: + nuxt: ^3.0.0 + dependencies: + '@nuxt/kit': 3.0.0 + '@vue-macros/volar': 0.5.4 + nuxt: 3.0.0_e3uo4sehh4zr4i6m57mkkxxv7y + unplugin-vue-macros: 1.0.0 + transitivePeerDependencies: + - '@vueuse/core' + - esbuild + - rollup + - supports-color + - vite + - vue + - vue-tsc + - webpack + dev: true + + /@vue-macros/setup-block/0.0.1: + resolution: {integrity: sha512-Zr7yudMN7Q+8Rb/4ZuZzNewHTejeH9fbt3104sFK53XqL4uLkDCz0fIG2AD9bR71RA+12H+yqn/jQ3vP4OaKGA==} + engines: {node: '>=14.19.0'} + dependencies: + '@rollup/pluginutils': 4.2.1 + '@vue-macros/common': 0.13.4 + '@vue/compiler-dom': 3.2.45 + unplugin: 1.0.0 + dev: true + /@vue-macros/setup-component/0.12.8: resolution: {integrity: sha512-2tRMl8l8OYMpIRYsZyAZfH0dNT7CONMTcmdGEffJb5GvK8XOmdgGk7NFUhaQg3EEnk1SUq1Kdcx+gyH/a0qE4A==} engines: {node: '>=14.19.0'} @@ -1826,8 +1855,8 @@ packages: unplugin: 1.0.0 dev: true - /@vue-macros/short-emits/0.12.9: - resolution: {integrity: sha512-DrvdyMuiqSVLY26VJCLm5neVmqiAlEVbLAmdH9gORGDn2u+OsmyY9bb2T+04PGzBsu2F64XbJwi0GmXypdcLgQ==} + /@vue-macros/short-emits/1.0.0: + resolution: {integrity: sha512-lE4poL6cz1xnvNz/orBM0+wNwrWV3Jy+B8mYYwzuWjulhNl5L/QET319lQuZbkgTxVa7HFF6UBa3cALeQmR33Q==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 @@ -1835,16 +1864,16 @@ packages: unplugin: 1.0.0 dev: true - /@vue-macros/short-vmodel/0.3.8: - resolution: {integrity: sha512-S2MP0/ZusUWpnfCJ5J9lSaEhIbaGB9uxmsUI9liA+bFH5yqPG+DDw63tod2HLfthxk9hPQcz1YZR/ZEd3wUaRA==} + /@vue-macros/short-vmodel/1.0.0: + resolution: {integrity: sha512-lSOHoIbEy675V7TCqKEn9lxRJBE3BVVSz+KvZpsqdicQehceQnE3AiMxZX8fcHOe7s8MFpbCZJqqzjz1zqhUzg==} engines: {node: '>=14.19.0'} dependencies: '@vue-macros/common': 0.13.4 '@vue/compiler-core': 3.2.45 dev: true - /@vue-macros/volar/0.5.3: - resolution: {integrity: sha512-M0dBOZrOT2kGcay3+oDYdif4EepfmBU5bNVlnojTufTGAsmEtiS/CfqexCDH+zBxfjEpc9bqHVSYFxswPkxjpA==} + /@vue-macros/volar/0.5.4: + resolution: {integrity: sha512-zOL/3CFuucnTTwStnb+INgeLp4K2/jKXj+wJ1eGRjhBree7CVMxpMK9m33WsSQhA0R+P2kRSp2HLRDnknZEGMQ==} peerDependencies: vue-tsc: ^1.0.9 peerDependenciesMeta: @@ -1854,7 +1883,7 @@ packages: '@volar/language-core': 1.0.9 '@vue-macros/common': 0.13.4 '@vue-macros/define-props': 0.0.3 - '@vue-macros/short-vmodel': 0.3.8 + '@vue-macros/short-vmodel': 1.0.0 muggle-string: 0.1.0 transitivePeerDependencies: - vue @@ -7145,8 +7174,8 @@ packages: unplugin: 0.10.2 dev: true - /unplugin-vue-define-options/0.12.8: - resolution: {integrity: sha512-/5NjICUI9Ick6LI31pc0jTh7DUdEBerLS3UKor3AanldLtqKWYd0lzjHjgg4JXUvuOEkpDf7e0f3jpqE362mKA==} + /unplugin-vue-define-options/1.0.0: + resolution: {integrity: sha512-j90zM7NhZXBL5uMlHKzSOjvU98lFcIErdgAhj7bEEdvZarkwOkEUgMFsZDwStN9FEcMAiS/BTvcyGfItu3ry/g==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 @@ -7155,26 +7184,27 @@ packages: unplugin: 1.0.0 dev: true - /unplugin-vue-macros/0.16.4: - resolution: {integrity: sha512-1dxQ/U4rZhf+LXP/7HSP2ycjCYQFCSB3QYu3zGPSiuN9M3yWjDkSTcXQcsFcdEvJGMbFWzKB/NJd4PnEqhQWOQ==} + /unplugin-vue-macros/1.0.0: + resolution: {integrity: sha512-OWJZtMSwmGDqrgLPyFn2jqTGE0NAZimr3m8BsOtSq0rR5nhsvCvB5G+TNY1T3vW7o877DxPokhGYoBmH4NBXdQ==} engines: {node: '>=14.19.0'} peerDependencies: vue: ^2.7.0 || ^3.2.25 dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/better-define': 0.2.0 - '@vue-macros/define-model': 0.14.1 + '@vue-macros/better-define': 1.0.0 + '@vue-macros/define-model': 1.0.0 '@vue-macros/define-props': 0.0.3 - '@vue-macros/define-render': 0.13.9 + '@vue-macros/define-render': 1.0.0 '@vue-macros/define-slots': 0.0.6 - '@vue-macros/hoist-static': 0.12.8 + '@vue-macros/hoist-static': 1.0.0 '@vue-macros/named-template': 0.0.6 + '@vue-macros/setup-block': 0.0.1 '@vue-macros/setup-component': 0.12.8 '@vue-macros/setup-sfc': 0.12.8 - '@vue-macros/short-emits': 0.12.9 + '@vue-macros/short-emits': 1.0.0 local-pkg: 0.4.2 unplugin-combine: 0.2.8 - unplugin-vue-define-options: 0.12.8 + unplugin-vue-define-options: 1.0.0 transitivePeerDependencies: - '@vueuse/core' - esbuild diff --git a/shim.d.ts b/shim.d.ts deleted file mode 100644 index 8872a1f9..00000000 --- a/shim.d.ts +++ /dev/null @@ -1 +0,0 @@ -/// diff --git a/tsconfig.json b/tsconfig.json index 740c4a37..4b34df15 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,3 @@ { - "extends": "./.nuxt/tsconfig.json", - "vueCompilerOptions": { - "plugins": [ - "@vue-macros/volar/define-model", - "@vue-macros/volar/short-vmodel" - ] - } + "extends": "./.nuxt/tsconfig.json" }