diff --git a/angular/src/directives/control-value-accessors/numeric-value-accesssor.ts b/angular/src/directives/control-value-accessors/numeric-value-accessor.ts similarity index 100% rename from angular/src/directives/control-value-accessors/numeric-value-accesssor.ts rename to angular/src/directives/control-value-accessors/numeric-value-accessor.ts diff --git a/angular/src/directives/proxies-list.txt b/angular/src/directives/proxies-list.ts similarity index 98% rename from angular/src/directives/proxies-list.txt rename to angular/src/directives/proxies-list.ts index 06d60e7c6f..ec6f2b4b64 100644 --- a/angular/src/directives/proxies-list.txt +++ b/angular/src/directives/proxies-list.ts @@ -1,4 +1,3 @@ - import * as d from './proxies'; export const DIRECTIVES = [ @@ -77,5 +76,5 @@ export const DIRECTIVES = [ d.IonThumbnail, d.IonTitle, d.IonToggle, - d.IonToolbar + d.IonToolbar, ]; diff --git a/angular/src/index.ts b/angular/src/index.ts index 9283675633..a28a12dfef 100644 --- a/angular/src/index.ts +++ b/angular/src/index.ts @@ -1,6 +1,6 @@ // DIRECTIVES export { BooleanValueAccessorDirective as BooleanValueAccessor } from './directives/control-value-accessors/boolean-value-accessor'; -export { NumericValueAccessorDirective as NumericValueAccessor } from './directives/control-value-accessors/numeric-value-accesssor'; +export { NumericValueAccessorDirective as NumericValueAccessor } from './directives/control-value-accessors/numeric-value-accessor'; export { RadioValueAccessorDirective as RadioValueAccessor } from './directives/control-value-accessors/radio-value-accessor'; export { SelectValueAccessorDirective as SelectValueAccessor } from './directives/control-value-accessors/select-value-accessor'; export { TextValueAccessorDirective as TextValueAccessor } from './directives/control-value-accessors/text-value-accessor'; diff --git a/angular/src/ionic-module.ts b/angular/src/ionic-module.ts index 64c5cd9003..9470fcf4c0 100644 --- a/angular/src/ionic-module.ts +++ b/angular/src/ionic-module.ts @@ -4,7 +4,7 @@ import { IonicConfig } from '@ionic/core'; import { appInitialize } from './app-initialize'; import { BooleanValueAccessorDirective } from './directives/control-value-accessors/boolean-value-accessor'; -import { NumericValueAccessorDirective } from './directives/control-value-accessors/numeric-value-accesssor'; +import { NumericValueAccessorDirective } from './directives/control-value-accessors/numeric-value-accessor'; import { RadioValueAccessorDirective } from './directives/control-value-accessors/radio-value-accessor'; import { SelectValueAccessorDirective } from './directives/control-value-accessors/select-value-accessor'; import { TextValueAccessorDirective } from './directives/control-value-accessors/text-value-accessor'; @@ -18,84 +18,7 @@ import { } from './directives/navigation/router-link-delegate'; import { IonModal } from './directives/overlays/modal'; import { IonPopover } from './directives/overlays/popover'; -import { - IonAccordion, - IonAccordionGroup, - IonApp, - IonAvatar, - IonBackButton, - IonBackdrop, - IonBadge, - IonBreadcrumb, - IonBreadcrumbs, - IonButton, - IonButtons, - IonCard, - IonCardContent, - IonCardHeader, - IonCardSubtitle, - IonCardTitle, - IonCheckbox, - IonChip, - IonCol, - IonContent, - IonDatetime, - IonDatetimeButton, - IonFab, - IonFabButton, - IonFabList, - IonFooter, - IonGrid, - IonHeader, - IonIcon, - IonImg, - IonInfiniteScroll, - IonInfiniteScrollContent, - IonInput, - IonItem, - IonItemDivider, - IonItemGroup, - IonItemOption, - IonItemOptions, - IonItemSliding, - IonLabel, - IonList, - IonListHeader, - IonMenu, - IonMenuButton, - IonMenuToggle, - IonNav, - IonNavLink, - IonNote, - IonProgressBar, - IonRadio, - IonRadioGroup, - IonRange, - IonRefresher, - IonRefresherContent, - IonReorder, - IonReorderGroup, - IonRippleEffect, - IonRow, - IonSearchbar, - IonSegment, - IonSegmentButton, - IonSelect, - IonSelectOption, - IonSkeletonText, - IonSlide, - IonSlides, - IonSpinner, - IonSplitPane, - IonTabBar, - IonTabButton, - IonText, - IonTextarea, - IonThumbnail, - IonTitle, - IonToggle, - IonToolbar, -} from './directives/proxies'; +import { DIRECTIVES } from './directives/proxies-list'; import { VirtualFooter } from './directives/virtual-scroll/virtual-footer'; import { VirtualHeader } from './directives/virtual-scroll/virtual-header'; import { VirtualItem } from './directives/virtual-scroll/virtual-item'; @@ -106,87 +29,12 @@ import { ModalController } from './providers/modal-controller'; import { PopoverController } from './providers/popover-controller'; const DECLARATIONS = [ - // proxies - IonAccordion, - IonAccordionGroup, - IonApp, - IonAvatar, - IonBackButton, - IonBackdrop, - IonBadge, - IonBreadcrumb, - IonBreadcrumbs, - IonButton, - IonButtons, - IonCard, - IonCardContent, - IonCardHeader, - IonCardSubtitle, - IonCardTitle, - IonCheckbox, - IonChip, - IonCol, - IonContent, - IonDatetime, - IonDatetimeButton, - IonFab, - IonFabButton, - IonFabList, - IonFooter, - IonGrid, - IonHeader, - IonIcon, - IonImg, - IonInfiniteScroll, - IonInfiniteScrollContent, - IonInput, - IonItem, - IonItemDivider, - IonItemGroup, - IonItemOption, - IonItemOptions, - IonItemSliding, - IonLabel, - IonList, - IonListHeader, - IonMenu, - IonMenuButton, - IonMenuToggle, - IonModal, - IonNav, - IonNavLink, - IonNote, - IonPopover, - IonProgressBar, - IonRadio, - IonRadioGroup, - IonRange, - IonRefresher, - IonRefresherContent, - IonReorder, - IonReorderGroup, - IonRippleEffect, - IonRow, - IonSearchbar, - IonSegment, - IonSegmentButton, - IonSelect, - IonSelectOption, - IonSkeletonText, - IonSlide, - IonSlides, - IonSpinner, - IonSplitPane, - IonTabBar, - IonTabButton, - IonText, - IonTextarea, - IonThumbnail, - IonToggle, - IonToolbar, - IonTitle, + // generated proxies + ...DIRECTIVES, - IonTabs, + // manual proxies + IonModal, + IonPopover, // ngModel accessors BooleanValueAccessorDirective, @@ -196,6 +44,7 @@ const DECLARATIONS = [ TextValueAccessorDirective, // navigation + IonTabs, IonRouterOutlet, IonBackButtonDelegateDirective, NavDelegate, diff --git a/core/stencil.config.ts b/core/stencil.config.ts index dd7161ce2c..675fae0d86 100644 --- a/core/stencil.config.ts +++ b/core/stencil.config.ts @@ -1,8 +1,8 @@ -import { Config } from '@stencil/core'; -import { sass } from '@stencil/sass'; import { angularOutputTarget } from '@stencil/angular-output-target'; -import { vueOutputTarget } from '@stencil/vue-output-target'; +import type { Config } from '@stencil/core'; import { reactOutputTarget } from '@stencil/react-output-target'; +import { sass } from '@stencil/sass'; +import { vueOutputTarget } from '@stencil/vue-output-target'; // @ts-ignore import { apiSpecGenerator } from './scripts/api-spec-generator'; @@ -182,7 +182,7 @@ export const config: Config = { angularOutputTarget({ componentCorePackage: '@ionic/core', directivesProxyFile: '../angular/src/directives/proxies.ts', - directivesArrayFile: '../angular/src/directives/proxies-list.txt', + directivesArrayFile: '../angular/src/directives/proxies-list.ts', excludeComponents: [ // overlays 'ion-action-sheet',