Skip to content

Commit

Permalink
fix: #5903 (#6088)
Browse files Browse the repository at this point in the history
* fix: #5903

* renaming GlobalComponentConstructor #6088 (comment)

* Delete package-lock.json

* Update how component types are defined
  • Loading branch information
2234839 authored Oct 9, 2024
1 parent 9d9ae35 commit 1500542
Show file tree
Hide file tree
Showing 168 changed files with 335 additions and 337 deletions.
6 changes: 2 additions & 4 deletions packages/core/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AllowedComponentProps, ComponentCustomProps, MethodOptions, ObjectEmitsOptions, SlotsType, VNode, VNodeProps, DefineComponent as _DefineComponent } from 'vue';
import { AllowedComponentProps, ComponentCustomProps, ObjectEmitsOptions, VNode, VNodeProps } from 'vue';

declare type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps;

Expand All @@ -14,9 +14,7 @@ export declare type EmitFn<Options = ObjectEmitsOptions, Event extends keyof Opt
}[Event]
>;

export type DefineComponent<P = {}, S = {}, E = {}, M = {}> = _DefineComponent<P, {}, {}, {}, M & MethodOptions, {}, {}, E & ObjectEmitsOptions, string, {}, {}, {}, S & SlotsType>;

export type GlobalComponentConstructor<P = {}, S = {}, E = {}, M = {}> = {
export type DefineComponent<P = {}, S = {}, E = {}, M = {}> = {
new (): {
$props: P & PublicProps;
$slots: S;
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angledoubledown/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleDoubleDownIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleDoubleDownIcon: GlobalComponentConstructor<AngleDoubleDownIcon>;
AngleDoubleDownIcon: DefineComponent<AngleDoubleDownIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angledoubleleft/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleDoubleLeftIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleDoubleLeftIcon: GlobalComponentConstructor<AngleDoubleLeftIcon>;
AngleDoubleLeftIcon: DefineComponent<AngleDoubleLeftIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angledoubleright/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleDoubleRightIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleDoubleRightIcon: GlobalComponentConstructor<AngleDoubleRightIcon>;
AngleDoubleRightIcon: DefineComponent<AngleDoubleRightIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angledoubleup/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleDoubleUpIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleDoubleUpIcon: GlobalComponentConstructor<AngleDoubleUpIcon>;
AngleDoubleUpIcon: DefineComponent<AngleDoubleUpIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angledown/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleDownIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleDownIcon: GlobalComponentConstructor<AngleDownIcon>;
AngleDownIcon: DefineComponent<AngleDownIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angleleft/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleLeftIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleLeftIcon: GlobalComponentConstructor<AngleLeftIcon>;
AngleLeftIcon: DefineComponent<AngleLeftIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angleright/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleRightIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleRightIcon: GlobalComponentConstructor<AngleRightIcon>;
AngleRightIcon: DefineComponent<AngleRightIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/angleup/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class AngleUpIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
AngleUpIcon: GlobalComponentConstructor<AngleUpIcon>;
AngleUpIcon: DefineComponent<AngleUpIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/arrowdown/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ArrowDownIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ArrowDownIcon: GlobalComponentConstructor<ArrowDownIcon>;
ArrowDownIcon: DefineComponent<ArrowDownIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/arrowup/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ArrowUpIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ArrowUpIcon: GlobalComponentConstructor<ArrowUpIcon>;
ArrowUpIcon: DefineComponent<ArrowUpIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/ban/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class BanIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
BanIcon: GlobalComponentConstructor<BanIcon>;
BanIcon: DefineComponent<BanIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/bars/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class BarsIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
BarsIcon: GlobalComponentConstructor<BarsIcon>;
BarsIcon: DefineComponent<BarsIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/blank/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class BlankIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
BlankIcon: GlobalComponentConstructor<BlankIcon>;
BlankIcon: DefineComponent<BlankIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/calendar/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class CalendarIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
CalendarIcon: GlobalComponentConstructor<CalendarIcon>;
CalendarIcon: DefineComponent<CalendarIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/check/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class CheckIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
CheckIcon: GlobalComponentConstructor<CheckIcon>;
CheckIcon: DefineComponent<CheckIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/chevrondown/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ChevronDownIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ChevronDownIcon: GlobalComponentConstructor<ChevronDownIcon>;
ChevronDownIcon: DefineComponent<ChevronDownIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/chevronleft/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ChevronLeftIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ChevronLeftIcon: GlobalComponentConstructor<ChevronLeftIcon>;
ChevronLeftIcon: DefineComponent<ChevronLeftIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/chevronright/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ChevronRightIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ChevronRightIcon: GlobalComponentConstructor<ChevronRightIcon>;
ChevronRightIcon: DefineComponent<ChevronRightIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/chevronup/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ChevronUpIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ChevronUpIcon: GlobalComponentConstructor<ChevronUpIcon>;
ChevronUpIcon: DefineComponent<ChevronUpIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/exclamationtriangle/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class ExclamationTriangleIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
ExclamationTriangleIcon: GlobalComponentConstructor<ExclamationTriangleIcon>;
ExclamationTriangleIcon: DefineComponent<ExclamationTriangleIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/eye/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class EyeIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
EyeIcon: GlobalComponentConstructor<EyeIcon>;
EyeIcon: DefineComponent<EyeIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/eyeslash/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class EyeSlashIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
EyeSlashIcon: GlobalComponentConstructor<EyeSlashIcon>;
EyeSlashIcon: DefineComponent<EyeSlashIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/filter/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class FilterIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
FilterIcon: GlobalComponentConstructor<FilterIcon>;
FilterIcon: DefineComponent<FilterIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/filterslash/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class FilterSlashIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
FilterSlashIcon: GlobalComponentConstructor<FilterSlashIcon>;
FilterSlashIcon: DefineComponent<FilterSlashIcon>;
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/icons/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { DefineComponent, EmitFn } from '@primevue/core';
import type { EmitFn } from '@primevue/core';

export interface IconProps {
label?: string | undefined;
Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/infocircle/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class InfoCircleIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
InfoCircleIcon: GlobalComponentConstructor<InfoCircleIcon>;
InfoCircleIcon: DefineComponent<InfoCircleIcon>;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/icons/src/minus/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { GlobalComponentConstructor } from '@primevue/core';
import type { DefineComponent } from '@primevue/core';
import type { Icon } from '@primevue/icons';

declare class MinusIcon extends Icon {}

declare module 'vue' {
export interface GlobalComponents {
MinusIcon: GlobalComponentConstructor<MinusIcon>;
MinusIcon: DefineComponent<MinusIcon>;
}
}

Expand Down
Loading

0 comments on commit 1500542

Please sign in to comment.