diff --git a/docs/package.json b/docs/package.json index aa7f41281..4d4256131 100644 --- a/docs/package.json +++ b/docs/package.json @@ -5,15 +5,16 @@ "scripts": { "dev": "vitepress dev", "build": "vitepress build", - "preview": "vitepress preview" + "preview": "vitepress preview", + "clean": "rimraf dist .vitepress/cache .vitepress/dist" }, "dependencies": { "prettier": "catalog:", "shiki": "catalog:" }, "devDependencies": { - "@iconify-json/logos": "^1.2.4", - "@iconify-json/ri": "^1.2.5", + "@iconify-json/logos": "catalog:", + "@iconify-json/ri": "catalog:", "@nolebase/vitepress-plugin-enhanced-mark": "catalog:", "@nolebase/vitepress-plugin-enhanced-readabilities": "catalog:", "@nolebase/vitepress-plugin-git-changelog": "catalog:", @@ -22,9 +23,9 @@ "@stylexjs/stylex": "catalog:", "@vitejs/plugin-vue-jsx": "catalog:", "@vueuse/core": "catalog:", - "vite-plugin-vue-devtools": "^7.7.2", + "vite-plugin-vue-devtools": "catalog:", "vitepress": "catalog:", - "vitepress-plugin-group-icons": "^1.3.6", + "vitepress-plugin-group-icons": "catalog:", "vue": "catalog:", "vue-macros": "workspace:*" } diff --git a/eslint.config.ts b/eslint.config.ts index 410f7b928..4842e9924 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -2,8 +2,10 @@ import { sxzz } from '@sxzz/eslint-config' import vueMacros from './packages/eslint-config/src/index.ts' -export default sxzz() - .removeRules('@typescript-eslint/no-dynamic-delete') +export default sxzz({ + pnpm: true, +}) + .removeRules('vue/valid-define-options') .append([ vueMacros, { diff --git a/package.json b/package.json index c013256c3..a66b04e82 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "monorepo-vue-macros", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "private": true, - "packageManager": "pnpm@10.6.1", + "packageManager": "pnpm@10.6.2", "description": "Monorepo for Vue Macros.", "type": "module", "author": "三咲智子 Kevin Deng ", @@ -10,7 +10,7 @@ "scripts": { "build": "pnpm run --filter=\"./packages/*\" --parallel build", "dev": "pnpm run --filter=\"./packages/*\" --parallel dev", - "clean": "rimraf packages/*/dist", + "clean": "rimraf dist coverage \"packages/*/dist\" && pnpm run -r --parallel clean", "docs:dev": "pnpm run -C ./docs dev", "docs:preview": "pnpm run -C ./docs preview", "docs:build": "pnpm run -C ./docs build", @@ -36,75 +36,64 @@ }, "devDependencies": { "@babel/types": "catalog:", - "@rspack/core": "^1.2.7", - "@sxzz/eslint-config": "^6.0.0", - "@sxzz/prettier-config": "^2.2.1", - "@types/node": "^22.13.10", + "@rspack/core": "catalog:", + "@sxzz/eslint-config": "catalog:", + "@sxzz/prettier-config": "catalog:", + "@types/node": "catalog:", "@unocss/eslint-plugin": "catalog:", "@vitest/coverage-v8": "catalog:", "@vitest/ui": "catalog:", "@vue-macros/test-utils": "workspace:*", - "bumpp": "^10.0.3", - "change-case": "^5.4.4", - "cspell": "^8.17.5", + "bumpp": "catalog:", + "change-case": "catalog:", + "cspell": "catalog:", "esbuild": "catalog:", "eslint": "catalog:", - "expect-type": "^1.2.0", - "fast-glob": "^3.3.3", - "jiti": "^2.4.2", - "monoman": "^0.6.7", - "oxc-transform": "^0.56.5", - "pkg-types": "^2.1.0", + "expect-type": "catalog:", + "fast-glob": "catalog:", + "jiti": "catalog:", + "monoman": "catalog:", + "oxc-transform": "catalog:", + "pkg-types": "catalog:", "prettier": "catalog:", - "publint": "^0.3.8", - "radix-vue": "^1.9.17", - "rimraf": "^6.0.1", - "rolldown": "^1.0.0-beta.3", + "publint": "catalog:", + "radix-vue": "catalog:", + "rimraf": "catalog:", + "rolldown": "catalog:", "rollup": "catalog:", - "rollup-plugin-dts": "^6.1.1", - "taze": "^18.7.1", - "tsup": "^8.4.0", - "tsx": "^4.19.3", + "rollup-plugin-dts": "catalog:", + "taze": "catalog:", + "tsup": "catalog:", + "tsx": "catalog:", "typescript": "catalog:", "unocss": "catalog:", "unplugin": "catalog:", - "unplugin-isolated-decl": "^0.13.2", - "unplugin-macros": "^0.16.1", - "unplugin-quansync": "^0.3.4", - "unplugin-raw": "^0.4.4", - "unplugin-unused": "^0.4.3", + "unplugin-isolated-decl": "catalog:", + "unplugin-macros": "catalog:", + "unplugin-quansync": "catalog:", + "unplugin-raw": "catalog:", + "unplugin-unused": "catalog:", "vite": "catalog:", "vitest": "catalog:", "vue": "catalog:", "vue-macros": "workspace:*", "vue-tsc": "catalog:", - "webpack": "^5.98.0" + "webpack": "catalog:" }, "engines": { "node": ">=20.18.0" }, - "pnpm": { - "peerDependencyRules": { - "ignoreMissing": [ - "nuxt", - "@algolia/client-search", - "search-insights", - "pug" - ], - "allowAny": [ - "vue" - ] - }, - "overrides": { - "@shikijs/core": "catalog:", - "@shikijs/transformers": "catalog:", - "@shikijs/types": "catalog:", - "esbuild": "catalog:", - "is-core-module": "npm:@no-shims/is-core-module", - "shiki": "catalog:", - "smartwrap": "npm:@no-shims/smartwrap", - "unconfig": "catalog:" - } + "resolutions": { + "@shikijs/core": "catalog:", + "@shikijs/transformers": "catalog:", + "@shikijs/types": "catalog:", + "@vue/language-core": "catalog:", + "esbuild": "catalog:", + "is-core-module": "npm:@no-shims/is-core-module", + "oxc-parser": "catalog:", + "shiki": "catalog:", + "smartwrap": "npm:@no-shims/smartwrap", + "unconfig": "catalog:" }, "prettier": "@sxzz/prettier-config" } diff --git a/packages/api/package.json b/packages/api/package.json index b25b9e5f6..2bc6535c9 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/api", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "General API for Vue Macros.", "type": "module", "keywords": [ @@ -51,7 +51,7 @@ }, "dependencies": { "@vue-macros/common": "workspace:*", - "oxc-resolver": "^5.0.0" + "oxc-resolver": "catalog:" }, "engines": { "node": ">=20.18.0" diff --git a/packages/astro/package.json b/packages/astro/package.json index 0b6a6ee97..0aae51203 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/astro", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "Astro integration of Vue Macros.", "type": "module", "keywords": [ @@ -60,7 +60,7 @@ }, "devDependencies": { "@vitejs/plugin-vue": "catalog:", - "astro": "^5.4.2" + "astro": "catalog:" }, "engines": { "node": ">=20.18.0" diff --git a/packages/better-define/package.json b/packages/better-define/package.json index a710e7ff1..a35bad810 100644 --- a/packages/better-define/package.json +++ b/packages/better-define/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/better-define", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "betterDefine feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/boolean-prop/package.json b/packages/boolean-prop/package.json index 8fb405074..d7b99b8ce 100644 --- a/packages/boolean-prop/package.json +++ b/packages/boolean-prop/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/boolean-prop", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "booleanProp feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/chain-call/package.json b/packages/chain-call/package.json index 1b96614c0..1f232dc83 100644 --- a/packages/chain-call/package.json +++ b/packages/chain-call/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/chain-call", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "chainCall feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/common/package.json b/packages/common/package.json index 724732bea..27d6d5430 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/common", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "common feature from Vue Macros.", "type": "module", "keywords": [ @@ -59,10 +59,10 @@ }, "dependencies": { "@vue/compiler-sfc": "catalog:", - "ast-kit": "^1.4.2", - "local-pkg": "^1.1.1", - "magic-string-ast": "^0.8.0", - "unplugin-utils": "^0.2.4" + "ast-kit": "catalog:", + "local-pkg": "catalog:", + "magic-string-ast": "catalog:", + "unplugin-utils": "catalog:" }, "devDependencies": { "@babel/parser": "catalog:", diff --git a/packages/common/src/ast.ts b/packages/common/src/ast.ts index 5ada83265..f8369c3a4 100644 --- a/packages/common/src/ast.ts +++ b/packages/common/src/ast.ts @@ -152,17 +152,16 @@ export const HELPER_PREFIX = '__MACROS_' export function importHelperFn( s: MagicString, offset: number, - local: string, + imported: string, + local: string = imported, from = 'vue', - isDefault = false, ) { - const imported = isDefault ? 'default' : local const cacheKey = `${from}@${imported}` if (!importedMap.get(s)?.has(cacheKey)) { s.appendLeft( offset, `\nimport ${ - isDefault + imported === 'default' ? HELPER_PREFIX + local : `{ ${imported} as ${HELPER_PREFIX + local} }` } from ${JSON.stringify(from)};`, diff --git a/packages/config/package.json b/packages/config/package.json index be719abba..52761a660 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/config", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "Config API for Vue Macros.", "type": "module", "keywords": [ @@ -74,7 +74,7 @@ }, "dependencies": { "@vue-macros/common": "workspace:*", - "quansync": "^0.2.8", + "quansync": "catalog:", "unconfig": "catalog:" }, "devDependencies": { diff --git a/packages/define-emit/package.json b/packages/define-emit/package.json index f121cccdd..57982358d 100644 --- a/packages/define-emit/package.json +++ b/packages/define-emit/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/define-emit", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "defineEmit feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-models/package.json b/packages/define-models/package.json index aa024332f..1c52e12ff 100644 --- a/packages/define-models/package.json +++ b/packages/define-models/package.json @@ -1,6 +1,6 @@ { "name": "@vue-macros/define-models", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "defineModels feature from Vue Macros.", "type": "module", "keywords": [ diff --git a/packages/define-models/src/core/index.ts b/packages/define-models/src/core/index.ts index 823bfc6b4..99bf3c06e 100644 --- a/packages/define-models/src/core/index.ts +++ b/packages/define-models/src/core/index.ts @@ -286,9 +286,9 @@ export function transformDefineModels( const text = `${importHelperFn( s, setupOffset, + 'default', 'useVModel', useVmodelHelperId, - true, )}(${Object.entries(map) .map(([name, { options }]) => { const prop = getPropKey(name, true) @@ -325,9 +325,9 @@ export function transformDefineModels( const content = `${importHelperFn( s, setupOffset, + 'default', 'emitHelper', emitHelperId, - true, )}(${emitsIdentifier}, '${getEventKey(String(eventName))}', ${value}${ original ? `, ${id.name}` : '' })` diff --git a/packages/define-options/package.json b/packages/define-options/package.json index c07977f54..e9a9edb5d 100644 --- a/packages/define-options/package.json +++ b/packages/define-options/package.json @@ -1,6 +1,6 @@ { "name": "unplugin-vue-define-options", - "version": "3.0.0-beta.4", + "version": "3.0.0-beta.5", "description": "Add defineOptions macro for Vue