Skip to content

Commit 5404394

Browse files
fix(vue): resolve remaining issues
1 parent fc40152 commit 5404394

File tree

10 files changed

+415
-438
lines changed

10 files changed

+415
-438
lines changed

packages/angular/src/directives/proxies.ts

Lines changed: 85 additions & 85 deletions
Large diffs are not rendered by default.

packages/angular/standalone/src/directives/proxies.ts

Lines changed: 74 additions & 74 deletions
Large diffs are not rendered by default.

packages/vue/package-lock.json

Lines changed: 81 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/vue/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
"@babel/types": "^7.18.4",
5353
"@ionic/eslint-config": "^0.3.0",
5454
"@ionic/prettier-config": "^2.0.0",
55+
"@rollup/plugin-node-resolve": "^16.0.0",
5556
"@rollup/plugin-typescript": "^11.1.5",
5657
"@typescript-eslint/eslint-plugin": "^5.48.2",
5758
"@typescript-eslint/parser": "^5.48.2",

packages/vue/rollup.config.mjs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import resolve from '@rollup/plugin-node-resolve';
12
import typescript from '@rollup/plugin-typescript';
3+
24
const external = ['vue', 'vue-router'];
35

46
export default {
@@ -12,6 +14,13 @@ export default {
1214
sourcemap: true
1315
},
1416
],
15-
plugins: [typescript()],
16-
external: id => external.includes(id) || id.startsWith('@ionic/core') || id.startsWith('ionicons')
17+
plugins: [
18+
typescript(),
19+
resolve()
20+
],
21+
external: (
22+
id => external.includes(id) ||
23+
id.startsWith('@ionic/core') ||
24+
id.startsWith('ionicons')
25+
)
1726
};

packages/vue/scripts/copy-overlays.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function generateOverlays() {
3737
let componentImports = [];
3838
let componentDefinitions = [];
3939

40-
components.forEach(component => {
40+
components.sort((a, b) => a.tag.localeCompare(b.tag)).forEach(component => {
4141
const docsBlock = getDocsBlock(component.tag);
4242
const props = getPropsFromDocsBlock(docsBlock);
4343

@@ -57,13 +57,12 @@ export const ${component.name} = /*@__PURE__*/ defineOverlayContainer<JSX.${comp
5757
* Changes made to this file will be overwritten on build.
5858
*/
5959
60-
import {
60+
import type {
6161
JSX,
6262
} from '@ionic/core/components';
63-
6463
${componentImports.join('\n')}
6564
66-
import { defineOverlayContainer } from '../vue-component-lib/overlays';
65+
import { defineOverlayContainer } from '../utils/overlays';
6766
${componentDefinitions.join('')}
6867
`;
6968

packages/vue/src/components/Overlays.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,30 @@
33
* Changes made to this file will be overwritten on build.
44
*/
55

6-
import {
6+
import type {
77
JSX,
88
} from '@ionic/core/components';
9-
109
import { defineCustomElement as defineIonActionSheetCustomElement } from '@ionic/core/components/ion-action-sheet.js'
1110
import { defineCustomElement as defineIonAlertCustomElement } from '@ionic/core/components/ion-alert.js'
1211
import { defineCustomElement as defineIonLoadingCustomElement } from '@ionic/core/components/ion-loading.js'
13-
import { defineCustomElement as defineIonPickerLegacyCustomElement } from '@ionic/core/components/ion-picker-legacy.js'
14-
import { defineCustomElement as defineIonToastCustomElement } from '@ionic/core/components/ion-toast.js'
1512
import { defineCustomElement as defineIonModalCustomElement } from '@ionic/core/components/ion-modal.js'
13+
import { defineCustomElement as defineIonPickerLegacyCustomElement } from '@ionic/core/components/ion-picker-legacy.js'
1614
import { defineCustomElement as defineIonPopoverCustomElement } from '@ionic/core/components/ion-popover.js'
15+
import { defineCustomElement as defineIonToastCustomElement } from '@ionic/core/components/ion-toast.js'
1716

18-
import { defineOverlayContainer } from '../vue-component-lib/overlays';
17+
import { defineOverlayContainer } from '../utils/overlays';
1918

2019
export const IonActionSheet = /*@__PURE__*/ defineOverlayContainer<JSX.IonActionSheet>('ion-action-sheet', defineIonActionSheetCustomElement, ['animated', 'backdropDismiss', 'buttons', 'cssClass', 'enterAnimation', 'header', 'htmlAttributes', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'subHeader', 'translucent', 'trigger']);
2120

2221
export const IonAlert = /*@__PURE__*/ defineOverlayContainer<JSX.IonAlert>('ion-alert', defineIonAlertCustomElement, ['animated', 'backdropDismiss', 'buttons', 'cssClass', 'enterAnimation', 'header', 'htmlAttributes', 'inputs', 'isOpen', 'keyboardClose', 'leaveAnimation', 'message', 'mode', 'subHeader', 'translucent', 'trigger']);
2322

2423
export const IonLoading = /*@__PURE__*/ defineOverlayContainer<JSX.IonLoading>('ion-loading', defineIonLoadingCustomElement, ['animated', 'backdropDismiss', 'cssClass', 'duration', 'enterAnimation', 'htmlAttributes', 'isOpen', 'keyboardClose', 'leaveAnimation', 'message', 'mode', 'showBackdrop', 'spinner', 'translucent', 'trigger']);
2524

26-
export const IonPickerLegacy = /*@__PURE__*/ defineOverlayContainer<JSX.IonPickerLegacy>('ion-picker-legacy', defineIonPickerLegacyCustomElement, ['animated', 'backdropDismiss', 'buttons', 'columns', 'cssClass', 'duration', 'enterAnimation', 'htmlAttributes', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'showBackdrop', 'trigger']);
27-
28-
export const IonToast = /*@__PURE__*/ defineOverlayContainer<JSX.IonToast>('ion-toast', defineIonToastCustomElement, ['animated', 'buttons', 'color', 'cssClass', 'duration', 'enterAnimation', 'header', 'htmlAttributes', 'icon', 'isOpen', 'keyboardClose', 'layout', 'leaveAnimation', 'message', 'mode', 'position', 'positionAnchor', 'swipeGesture', 'translucent', 'trigger']);
29-
3025
export const IonModal = /*@__PURE__*/ defineOverlayContainer<JSX.IonModal>('ion-modal', defineIonModalCustomElement, ['animated', 'backdropBreakpoint', 'backdropDismiss', 'breakpoints', 'canDismiss', 'enterAnimation', 'focusTrap', 'handle', 'handleBehavior', 'htmlAttributes', 'initialBreakpoint', 'isOpen', 'keepContentsMounted', 'keyboardClose', 'leaveAnimation', 'mode', 'presentingElement', 'showBackdrop', 'trigger'], true);
3126

27+
export const IonPickerLegacy = /*@__PURE__*/ defineOverlayContainer<JSX.IonPickerLegacy>('ion-picker-legacy', defineIonPickerLegacyCustomElement, ['animated', 'backdropDismiss', 'buttons', 'columns', 'cssClass', 'duration', 'enterAnimation', 'htmlAttributes', 'isOpen', 'keyboardClose', 'leaveAnimation', 'mode', 'showBackdrop', 'trigger']);
28+
3229
export const IonPopover = /*@__PURE__*/ defineOverlayContainer<JSX.IonPopover>('ion-popover', defineIonPopoverCustomElement, ['alignment', 'animated', 'arrow', 'backdropDismiss', 'component', 'componentProps', 'dismissOnSelect', 'enterAnimation', 'event', 'focusTrap', 'htmlAttributes', 'isOpen', 'keepContentsMounted', 'keyboardClose', 'leaveAnimation', 'mode', 'reference', 'showBackdrop', 'side', 'size', 'translucent', 'trigger', 'triggerAction']);
3330

31+
export const IonToast = /*@__PURE__*/ defineOverlayContainer<JSX.IonToast>('ion-toast', defineIonToastCustomElement, ['animated', 'buttons', 'color', 'cssClass', 'duration', 'enterAnimation', 'header', 'htmlAttributes', 'icon', 'isOpen', 'keyboardClose', 'layout', 'leaveAnimation', 'message', 'mode', 'position', 'positionAnchor', 'swipeGesture', 'translucent', 'trigger']);
32+

0 commit comments

Comments
 (0)