diff --git a/package.json b/package.json index 3d0f0523e..43a193d87 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,9 @@ "README.md", "dist/index.d.ts" ], + "dependencies": { + "js-beautify": "1.14.6" + }, "devDependencies": { "@rollup/plugin-commonjs": "24.0.0", "@rollup/plugin-json": "6.0.0", @@ -37,13 +40,11 @@ "@vue/compat": "3.2.45", "@vue/compiler-dom": "3.2.45", "@vue/compiler-sfc": "3.2.45", - "@vue/runtime-core": "3.2.45", "c8": "7.12.0", "eslint": "8.32.0", "eslint-config-prettier": "8.6.0", "eslint-plugin-prettier": "4.2.1", "husky": "8.0.3", - "js-beautify": "1.14.6", "jsdom": "21.0.0", "jsdom-global": "3.0.2", "lint-staged": "13.1.0", @@ -63,6 +64,7 @@ "vuex": "4.1.0" }, "peerDependencies": { + "@vue/compiler-dom": "^3.0.1", "vue": "^3.0.1" }, "author": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c022ff14..075b513ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,6 @@ specifiers: '@vue/compat': 3.2.45 '@vue/compiler-dom': 3.2.45 '@vue/compiler-sfc': 3.2.45 - '@vue/runtime-core': 3.2.45 c8: 7.12.0 eslint: 8.32.0 eslint-config-prettier: 8.6.0 @@ -41,6 +40,9 @@ specifiers: vue-tsc: 1.0.24 vuex: 4.1.0 +dependencies: + js-beautify: 1.14.6 + devDependencies: '@rollup/plugin-commonjs': 24.0.0_rollup@3.10.0 '@rollup/plugin-json': 6.0.0_rollup@3.10.0 @@ -57,13 +59,11 @@ devDependencies: '@vue/compat': 3.2.45_vue@3.2.45 '@vue/compiler-dom': 3.2.45 '@vue/compiler-sfc': 3.2.45 - '@vue/runtime-core': 3.2.45 c8: 7.12.0 eslint: 8.32.0 eslint-config-prettier: 8.6.0_eslint@8.32.0 eslint-plugin-prettier: 4.2.1_cn4lalcyadplruoxa5mhp7j3dq husky: 8.0.3 - js-beautify: 1.14.6 jsdom: 21.0.0 jsdom-global: 3.0.2_jsdom@21.0.0 lint-staged: 13.1.0 @@ -1380,7 +1380,7 @@ packages: /abbrev/1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - dev: true + dev: false /acorn-globals/7.0.1: resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==} @@ -1526,7 +1526,6 @@ packages: /balanced-match/1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true /binary-extensions/2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} @@ -1544,7 +1543,6 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: true /braces/3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -1730,7 +1728,7 @@ packages: /commander/2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} - dev: true + dev: false /commander/9.4.1: resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==} @@ -1750,7 +1748,7 @@ packages: dependencies: ini: 1.3.8 proto-list: 1.2.4 - dev: true + dev: false /convert-source-map/1.8.0: resolution: {integrity: sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==} @@ -1874,7 +1872,7 @@ packages: lru-cache: 4.1.5 semver: 5.7.1 sigmund: 1.0.1 - dev: true + dev: false /electron-to-chromium/1.4.284: resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==} @@ -2418,7 +2416,6 @@ packages: /fs.realpath/1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - dev: true /fsevents/2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} @@ -2485,7 +2482,6 @@ packages: inherits: 2.0.4 minimatch: 5.1.1 once: 1.4.0 - dev: true /globals/11.12.0: resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} @@ -2620,15 +2616,13 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 - dev: true /inherits/2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - dev: true /ini/1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} - dev: true + dev: false /is-binary-path/2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} @@ -2736,7 +2730,7 @@ packages: editorconfig: 0.15.3 glob: 8.0.3 nopt: 6.0.0 - dev: true + dev: false /js-sdsl/4.1.4: resolution: {integrity: sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw==} @@ -2932,7 +2926,7 @@ packages: dependencies: pseudomap: 1.0.2 yallist: 2.1.2 - dev: true + dev: false /lru-cache/6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} @@ -3011,7 +3005,6 @@ packages: engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 - dev: true /mlly/1.1.0: resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==} @@ -3054,7 +3047,7 @@ packages: hasBin: true dependencies: abbrev: 1.1.1 - dev: true + dev: false /normalize-path/3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} @@ -3080,7 +3073,6 @@ packages: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 - dev: true /onetime/5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} @@ -3282,11 +3274,11 @@ packages: /proto-list/1.2.4: resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} - dev: true + dev: false /pseudomap/1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - dev: true + dev: false /psl/1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} @@ -3418,7 +3410,7 @@ packages: /semver/5.7.1: resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==} hasBin: true - dev: true + dev: false /semver/6.3.0: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} @@ -3451,7 +3443,7 @@ packages: /sigmund/1.0.1: resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==} - dev: true + dev: false /signal-exit/3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -4083,7 +4075,6 @@ packages: /wrappy/1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - dev: true /ws/8.11.0: resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==} @@ -4114,7 +4105,7 @@ packages: /yallist/2.1.2: resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - dev: true + dev: false /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} diff --git a/src/utils/componentName.ts b/src/utils/componentName.ts index 318e0ed81..4bac06c60 100644 --- a/src/utils/componentName.ts +++ b/src/utils/componentName.ts @@ -1,5 +1,4 @@ -import { ComponentInternalInstance } from '@vue/runtime-core' -import { VNodeTypes } from 'vue' +import { ComponentInternalInstance, VNodeTypes } from 'vue' import { isFunctionalComponent, isObjectComponent } from '../utils' import { isLegacyExtendedComponent, diff --git a/src/vueWrapper.ts b/src/vueWrapper.ts index 1d5fb40a0..4f53f8987 100644 --- a/src/vueWrapper.ts +++ b/src/vueWrapper.ts @@ -2,7 +2,8 @@ import { nextTick, App, ComponentCustomProperties, - ComponentPublicInstance + ComponentPublicInstance, + VNode } from 'vue' import { config } from './config' @@ -18,7 +19,6 @@ import { registerFactory, WrapperType } from './wrapperFactory' -import { VNode } from '@vue/runtime-core' import { ShapeFlags } from './utils/vueShared' /** diff --git a/types/testing.d.ts b/types/testing.d.ts index e67dcaac7..130e22330 100644 --- a/types/testing.d.ts +++ b/types/testing.d.ts @@ -1,6 +1,6 @@ import type { Router } from 'vue-router' -declare module '@vue/runtime-core' { +declare module 'vue' { interface ComponentCustomProperties { $router: Router $t: (key: string) => string