From 3492f5edf16c5f309b510ebdd07bbbc80f468b34 Mon Sep 17 00:00:00 2001 From: Eiinu Date: Mon, 10 Jul 2023 11:37:04 +0800 Subject: [PATCH] =?UTF-8?q?fix(build):=20=E4=BF=AE=E5=A4=8D=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=20(#2403)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 89 +++++++++++++------------- src/packages/__VUE/popup/common.ts | 10 +-- src/packages/__VUE/popup/doc.en-US.md | 4 +- src/packages/__VUE/popup/doc.md | 4 +- src/packages/__VUE/popup/doc.taro.md | 4 +- src/packages/utils/create/component.ts | 20 ++---- 7 files changed, 61 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index 32919f1c2b..155cf05e90 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "vite-plugin-md": "^0.21.5", "vitest": "^0.32.2", "vue": "^3.3.4", - "vue-tsc": "^1.4.4" + "vue-tsc": "^1.8.4" }, "eslintConfig": { "root": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1a5e6d873c..914acbe006 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -133,8 +133,8 @@ importers: specifier: ^3.3.4 version: 3.3.4 vue-tsc: - specifier: ^1.4.4 - version: 1.4.4(typescript@4.9.3) + specifier: ^1.8.4 + version: 1.8.4(typescript@4.9.3) packages/nutui-playground: dependencies: @@ -4924,49 +4924,22 @@ packages: pretty-format: 27.5.1 dev: true - /@volar/language-core@1.4.1: - resolution: {integrity: sha512-EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ==} + /@volar/language-core@1.8.0: + resolution: {integrity: sha512-ZHTvZPM3pEbOOuaq+ybNz5TQlHUqPQPK0G1+SonvApGq0e3qgGijjhtL5T7hsCtUEmxfix8FrAuCH14tMBOhTg==} dependencies: - '@volar/source-map': 1.4.1 + '@volar/source-map': 1.8.0 dev: true - /@volar/source-map@1.4.1: - resolution: {integrity: sha512-bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA==} + /@volar/source-map@1.8.0: + resolution: {integrity: sha512-d35aV0yFkIrkynRSKgrN5hgbMv6ekkFvcJsJGmOZ8UEjqLStto9zq7RSvpp6/PZ7/pa4Gn1f6K1qDt0bq0oUew==} dependencies: - muggle-string: 0.2.2 + muggle-string: 0.3.1 dev: true - /@volar/typescript@1.4.1(typescript@4.9.3): - resolution: {integrity: sha512-phTy6p9yG6bgMIKQWEeDOi/aeT0njZsb1a/G1mrEuDsLmAn24Le4gDwSsGNhea6Uhu+3gdpUZn2PmZXa+WG2iQ==} - peerDependencies: - typescript: '*' + /@volar/typescript@1.8.0: + resolution: {integrity: sha512-T/U1XLLhXv6tNr40Awznfc6QZWizSL99t6M0DeXtIMbnvSCqjjCVRnwlsq+DK9C1RlO3k8+i0Z8iJn7O1GGtoA==} dependencies: - '@volar/language-core': 1.4.1 - typescript: 4.9.3 - dev: true - - /@volar/vue-language-core@1.4.4: - resolution: {integrity: sha512-c3hL6un+CfoOlusGvpypcodmk9ke/ImrWIUc0GkgI+imoQpUGzgu3tEQWlPs604R7AhxeZwWUi8hQNfax0R/zA==} - dependencies: - '@volar/language-core': 1.4.1 - '@volar/source-map': 1.4.1 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-sfc': 3.3.4 - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 - minimatch: 9.0.1 - muggle-string: 0.2.2 - vue-template-compiler: 2.7.14 - dev: true - - /@volar/vue-typescript@1.4.4(typescript@4.9.3): - resolution: {integrity: sha512-L61Fk15jlJw3QtIddD4cVE5jei5i6zbLJRiaEMYDDnUKB259/qUrdvnMfnZUFVyDwlevzdstjtaUyreeG/0nPQ==} - peerDependencies: - typescript: '*' - dependencies: - '@volar/typescript': 1.4.1(typescript@4.9.3) - '@volar/vue-language-core': 1.4.4 - typescript: 4.9.3 + '@volar/language-core': 1.8.0 dev: true /@vscode/test-electron@2.0.3: @@ -5169,6 +5142,25 @@ packages: - supports-color dev: true + /@vue/language-core@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-pnNtNcJVfkGYluW0vsVO+Y1gyX+eA0voaS7+1JOhCp5zKeCaL/PAmGYOgfvwML62neL+2H8pnhY7sffmrGpEhw==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@volar/language-core': 1.8.0 + '@volar/source-map': 1.8.0 + '@vue/compiler-dom': 3.3.4 + '@vue/reactivity': 3.3.4 + '@vue/shared': 3.3.4 + minimatch: 9.0.1 + muggle-string: 0.3.1 + typescript: 4.9.3 + vue-template-compiler: 2.7.14 + dev: true + /@vue/reactivity-transform@3.3.4: resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} dependencies: @@ -5229,6 +5221,15 @@ packages: vue-component-type-helpers: 1.6.5 dev: true + /@vue/typescript@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-sioQfIY5xcmEAz+cPLvv6CtzGPtGhIdR0Za87zB8M4mPe4OSsE3MBGkXcslf+EzQgF+fm6Gr1SRMSX8r5ZmzDA==} + dependencies: + '@volar/typescript': 1.8.0 + '@vue/language-core': 1.8.4(typescript@4.9.3) + transitivePeerDependencies: + - typescript + dev: true + /@webassemblyjs/ast@1.11.6: resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==} dependencies: @@ -13096,8 +13097,8 @@ packages: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} dev: true - /muggle-string@0.2.2: - resolution: {integrity: sha512-YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg==} + /muggle-string@0.3.1: + resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} dev: true /multicast-dns-service-types@1.1.0: @@ -18094,14 +18095,14 @@ packages: resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==} dev: true - /vue-tsc@1.4.4(typescript@4.9.3): - resolution: {integrity: sha512-2XsCjF2mLo6gwOVcOpngwJkP8GzYQjNh20A+Pr2FGdsWzr9jjXJ0k08/DfcslfncsuCrTrnWtb4KEL3gcDtlNA==} + /vue-tsc@1.8.4(typescript@4.9.3): + resolution: {integrity: sha512-+hgpOhIx11vbi8/AxEdaPj3fiRwN9wy78LpsNNw2V995/IWa6TMyQxHbaw2ZKUpdwjySSHgrT6ohDEhUgFxGYw==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@volar/vue-language-core': 1.4.4 - '@volar/vue-typescript': 1.4.4(typescript@4.9.3) + '@vue/language-core': 1.8.4(typescript@4.9.3) + '@vue/typescript': 1.8.4(typescript@4.9.3) semver: 7.3.8 typescript: 4.9.3 dev: true diff --git a/src/packages/__VUE/popup/common.ts b/src/packages/__VUE/popup/common.ts index 8e157c63e6..f35f75777e 100644 --- a/src/packages/__VUE/popup/common.ts +++ b/src/packages/__VUE/popup/common.ts @@ -11,7 +11,7 @@ export const component = (componentName: string, components: any) => { props: { ...popupProps }, - emits: ['click-pop', 'click-close-icon', 'open', 'close', 'opend', 'closed', 'click-overlay', 'update:visible'], + emits: ['click-pop', 'click-close-icon', 'open', 'close', 'opened', 'closed', 'click-overlay', 'update:visible'], setup(props: any, { emit }: any) { const state = reactive({ @@ -85,12 +85,12 @@ export const component = (componentName: string, components: any) => { } }; - const onOpened = (e: Event) => { - emit('opend', e); + const onOpened = (el: Element) => { + emit('opened', el); }; - const onClosed = (e: Event) => { - emit('closed', e); + const onClosed = (el: Element) => { + emit('closed', el); }; watch( diff --git a/src/packages/__VUE/popup/doc.en-US.md b/src/packages/__VUE/popup/doc.en-US.md index f0dc012b24..e05b09213c 100644 --- a/src/packages/__VUE/popup/doc.en-US.md +++ b/src/packages/__VUE/popup/doc.en-US.md @@ -250,8 +250,8 @@ Specify the mount node through `teleport` | click-close-icon | Triggered when the close icon is clicked | `event: Event` | | open | Triggered when the pop-up box is opened | - | | close | Triggered when the pop-up box is closed | - | -| opend | Triggered at the end of the mask open animation | `event: Event` | -| closed | Triggered when the mask closes and the animation ends | `event: Event` | +| opened | Triggered at the end of the mask open animation | `el: Element` | +| closed | Triggered when the mask closes and the animation ends | `el: Element` | | click-overlay | Click mask trigger | `event: Event` | ### Slots diff --git a/src/packages/__VUE/popup/doc.md b/src/packages/__VUE/popup/doc.md index fc3c1429dc..dbf7834236 100644 --- a/src/packages/__VUE/popup/doc.md +++ b/src/packages/__VUE/popup/doc.md @@ -247,8 +247,8 @@ app.use(Popup); | click-close-icon | 点击关闭图标时触发 | `event: Event` | | open | 打开弹框时触发 | - | | close | 关闭弹框时触发 | - | -| opend | 遮罩打开动画结束时触发 | `event: Event` | -| closed | 遮罩关闭动画结束时触发 | `event: Event` | +| opened | 遮罩打开动画结束时触发 | `el: Element` | +| closed | 遮罩关闭动画结束时触发 | `el: Element` | | click-overlay | 点击遮罩触发 | `event: Event` | ### Slots diff --git a/src/packages/__VUE/popup/doc.taro.md b/src/packages/__VUE/popup/doc.taro.md index fb956c096e..b597e0b353 100644 --- a/src/packages/__VUE/popup/doc.taro.md +++ b/src/packages/__VUE/popup/doc.taro.md @@ -217,8 +217,8 @@ app.use(Popup); | click-close-icon | 点击关闭图标时触发 | `event: Event` | | open | 打开弹框时触发 | - | | close | 关闭弹框时触发 | - | -| opend | 遮罩打开动画结束时触发 | `event: Event` | -| closed | 遮罩关闭动画结束时触发 | `event: Event` | +| opened | 遮罩打开动画结束时触发 | `el: Element` | +| closed | 遮罩关闭动画结束时触发 | `el: Element` | | click-overlay | 点击遮罩触发 | `event: Event` | ### Slots diff --git a/src/packages/utils/create/component.ts b/src/packages/utils/create/component.ts index b15f1c7025..8290a7eb0c 100644 --- a/src/packages/utils/create/component.ts +++ b/src/packages/utils/create/component.ts @@ -2,6 +2,7 @@ import { App, defineComponent, ComponentPropsOptions, + ComponentOptions, ExtractPropTypes, SetupContext, RenderFunction, @@ -20,26 +21,13 @@ export function createComponent(name: string) { const text = getPropByPath(languages, `${name.replace('-', '')}.${keyPath}`) || getPropByPath(languages, keyPath); return isFunction(text) ? text(...args) : text; }, - create: function < - PropsOptions extends Readonly, - Props extends Readonly> - >(_component: { - name?: string; - baseName?: string; - install?: (vue: App) => void; - props?: PropsOptions; - components?: Record; - setup?: (props: Props, setupContext: SetupContext) => RenderFunction | Record | any; - emits?: string[]; - [optionKey: string]: any; - }) { - _component.baseName = name; + create: function (_component: ComponentOptions) { _component.name = componentName; _component.install = (vue: App) => { vue.component(_component.name as string, _component as any); }; - return defineComponent(_component as any); - }, + return defineComponent(_component as ComponentOptions); + } as typeof defineComponent, createDemo: function < PropsOptions extends Readonly, Props extends Readonly>