Skip to content

Commit 4e18c31

Browse files
crazyservercrazyserver
committedMar 18, 2025·
MOBILE-4653 npm: Update ionic to 8.5 and cordova-builders to 12
·
v5.0.0-beta
1 parent e439a22 commit 4e18c31

File tree

4 files changed

+3896
-816
lines changed

4 files changed

+3896
-816
lines changed
 

‎package-lock.json

+3,809-731
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+33-33
Original file line numberDiff line numberDiff line change
@@ -52,27 +52,27 @@
5252
"@angular/platform-browser": "^17.3.12",
5353
"@angular/platform-browser-dynamic": "^17.3.12",
5454
"@angular/router": "^17.3.12",
55-
"@awesome-cordova-plugins/badge": "^6.9.0",
56-
"@awesome-cordova-plugins/camera": "^6.9.0",
57-
"@awesome-cordova-plugins/clipboard": "^6.9.0",
58-
"@awesome-cordova-plugins/core": "^6.9.0",
59-
"@awesome-cordova-plugins/device": "^6.9.0",
60-
"@awesome-cordova-plugins/file": "^6.9.0",
61-
"@awesome-cordova-plugins/file-opener": "^6.9.0",
62-
"@awesome-cordova-plugins/http": "^6.9.0",
63-
"@awesome-cordova-plugins/in-app-browser": "^6.9.0",
64-
"@awesome-cordova-plugins/ionic-webview": "^6.9.0",
65-
"@awesome-cordova-plugins/keyboard": "^6.9.0",
66-
"@awesome-cordova-plugins/local-notifications": "^6.9.0",
67-
"@awesome-cordova-plugins/media-capture": "^6.9.0",
68-
"@awesome-cordova-plugins/network": "^6.9.0",
69-
"@awesome-cordova-plugins/push": "^6.9.0",
70-
"@awesome-cordova-plugins/splash-screen": "^6.9.0",
71-
"@awesome-cordova-plugins/sqlite": "^6.9.0",
72-
"@awesome-cordova-plugins/status-bar": "^6.9.0",
73-
"@awesome-cordova-plugins/web-intent": "^6.9.0",
74-
"@ionic/angular": "^8.4.1",
75-
"@ionic/cordova-builders": "^11.0.0",
55+
"@awesome-cordova-plugins/badge": "^6.15.0",
56+
"@awesome-cordova-plugins/camera": "^6.15.0",
57+
"@awesome-cordova-plugins/clipboard": "^6.15.0",
58+
"@awesome-cordova-plugins/core": "^6.15.0",
59+
"@awesome-cordova-plugins/device": "^6.15.0",
60+
"@awesome-cordova-plugins/file": "^6.15.0",
61+
"@awesome-cordova-plugins/file-opener": "^6.15.0",
62+
"@awesome-cordova-plugins/http": "^6.15.0",
63+
"@awesome-cordova-plugins/in-app-browser": "^6.15.0",
64+
"@awesome-cordova-plugins/ionic-webview": "^6.15.0",
65+
"@awesome-cordova-plugins/keyboard": "^6.15.0",
66+
"@awesome-cordova-plugins/local-notifications": "^6.15.0",
67+
"@awesome-cordova-plugins/media-capture": "^6.15.0",
68+
"@awesome-cordova-plugins/network": "^6.15.0",
69+
"@awesome-cordova-plugins/push": "^6.15.0",
70+
"@awesome-cordova-plugins/splash-screen": "^6.15.0",
71+
"@awesome-cordova-plugins/sqlite": "^6.15.0",
72+
"@awesome-cordova-plugins/status-bar": "^6.15.0",
73+
"@awesome-cordova-plugins/web-intent": "^6.15.0",
74+
"@ionic/angular": "^8.5.0",
75+
"@ionic/cordova-builders": "^12.1.2",
7676
"@moodlehq/cordova-plugin-advanced-http": "3.3.1-moodle.1",
7777
"@moodlehq/cordova-plugin-camera": "7.0.0-moodle.1",
7878
"@moodlehq/cordova-plugin-file-opener": "4.0.0-moodle.1",
@@ -101,7 +101,7 @@
101101
"cordova-plugin-chooser": "^1.3.2",
102102
"cordova-plugin-customurlscheme": "^5.0.2",
103103
"cordova-plugin-device": "^2.1.0",
104-
"cordova-plugin-file": "^8.1.0",
104+
"cordova-plugin-file": "^8.1.3",
105105
"cordova-plugin-ionic-keyboard": "^2.2.0",
106106
"cordova-plugin-local-notification": "1.0.0",
107107
"cordova-plugin-network-information": "^3.0.0",
@@ -110,7 +110,7 @@
110110
"cordova-plugin-wkuserscript": "^1.0.1",
111111
"cordova-plugin-wkwebview-cookies": "^1.0.1",
112112
"cordova-sqlite-storage": "^6.1.0",
113-
"core-js": "^3.38.1",
113+
"core-js": "^3.41.0",
114114
"dayjs": "^1.11.13",
115115
"es6-promise-plugin": "^4.2.2",
116116
"ionicons": "^7.4.0",
@@ -120,31 +120,31 @@
120120
"nl.kingsquare.cordova.background-audio": "^1.0.1",
121121
"ogv": "^1.9.0",
122122
"rxjs": "~7.8.1",
123-
"swiper": "^11.1.14",
123+
"swiper": "^11.2.5",
124124
"ts-md5": "^1.3.1",
125-
"tslib": "^2.7.0",
126-
"video.js": "^8.21.1",
127-
"zone.js": "~0.14.10"
125+
"tslib": "^2.8.1",
126+
"video.js": "8.21.1",
127+
"zone.js": "^0.14.10"
128128
},
129129
"devDependencies": {
130130
"@angular-builders/custom-webpack": "^17.0.2",
131-
"@angular-devkit/build-angular": "^17.3.10",
131+
"@angular-devkit/build-angular": "^17.3.13",
132132
"@angular-eslint/builder": "^17.5.3",
133133
"@angular-eslint/eslint-plugin": "^17.5.3",
134134
"@angular-eslint/eslint-plugin-template": "^17.5.3",
135135
"@angular-eslint/schematics": "^17.5.3",
136136
"@angular-eslint/template-parser": "^17.5.3",
137-
"@angular/cli": "^17.3.10",
137+
"@angular/cli": "^17.3.13",
138138
"@angular/compiler-cli": "^17.3.12",
139139
"@angular/language-service": "^17.3.12",
140140
"@ionic/angular-toolkit": "^11.0.1",
141141
"@ionic/cli": "^7.2.0",
142142
"@jsdevtools/coverage-istanbul-loader": "^3.0.5",
143143
"@types/faker": "^5.5.9",
144144
"@types/jest": "^26.0.24",
145-
"@types/node": "^18.19.53",
145+
"@types/node": "^18.19.80",
146146
"@types/resize-observer-browser": "^0.1.11",
147-
"@types/webpack-env": "^1.18.5",
147+
"@types/webpack-env": "^1.18.8",
148148
"@typescript-eslint/eslint-plugin": "^6.21.0",
149149
"@typescript-eslint/parser": "^6.21.0",
150150
"check-es-compat": "^3.2.1",
@@ -171,8 +171,8 @@
171171
"native-run": "^2.0.1",
172172
"nyc": "^15.1.0",
173173
"patch-package": "^6.5.1",
174-
"terser-webpack-plugin": "^5.3.10",
175-
"ts-jest": "^29.2.5",
174+
"terser-webpack-plugin": "^5.3.14",
175+
"ts-jest": "^29.2.6",
176176
"ts-node": "^8.10.2",
177177
"typescript": "~5.3.3",
178178
"vinyl": "^3.0.0"

‎patches/@ionic+core+8.4.1.patch ‎patches/@ionic+core+8.5.0.patch

+53-51
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/@ionic/core/components/popover.js b/node_modules/@ionic/core/components/popover.js
2-
index 394d7e6..1f36f24 100644
2+
index df0b0f6..ffd1bac 100644
33
--- a/node_modules/@ionic/core/components/popover.js
44
+++ b/node_modules/@ionic/core/components/popover.js
55
@@ -763,8 +763,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -29,7 +29,7 @@ index 394d7e6..1f36f24 100644
2929
const contentEl = root.querySelector('.popover-content');
3030
const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
3131
diff --git a/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js b/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
32-
index 004effa..84389bf 100644
32+
index c644264..175df2e 100644
3333
--- a/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
3434
+++ b/node_modules/@ionic/core/dist/cjs/ion-popover.cjs.entry.js
3535
@@ -769,8 +769,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -92,8 +92,55 @@ index 603923a..ff10a25 100644
9292
const root = getElementRoot(baseEl);
9393
const contentEl = root.querySelector('.popover-content');
9494
const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
95+
diff --git a/node_modules/@ionic/core/dist/esm/input-shims-3070628a.js b/node_modules/@ionic/core/dist/esm/input-shims-3070628a.js
96+
index cc59b33..2c24dc3 100644
97+
--- a/node_modules/@ionic/core/dist/esm/input-shims-3070628a.js
98+
+++ b/node_modules/@ionic/core/dist/esm/input-shims-3070628a.js
99+
@@ -340,7 +340,8 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
100+
const focusOut = () => {
101+
hasKeyboardBeenPresentedForTextField = false;
102+
win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
103+
- componentEl.removeEventListener('focusout', focusOut);
104+
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
105+
+ inputEl.removeEventListener('focusout', focusOut);
106+
};
107+
/**
108+
* When the input is about to receive
109+
@@ -360,13 +361,15 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
110+
}
111+
jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
112+
win === null || win === void 0 ? void 0 : win.addEventListener('ionKeyboardDidShow', keyboardShow);
113+
- componentEl.addEventListener('focusout', focusOut);
114+
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
115+
+ inputEl.addEventListener('focusout', focusOut);
116+
};
117+
- componentEl.addEventListener('focusin', focusIn);
118+
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
119+
+ inputEl.addEventListener('focusin', focusIn);
120+
return () => {
121+
- componentEl.removeEventListener('focusin', focusIn);
122+
+ inputEl.removeEventListener('focusin', focusIn);
123+
win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
124+
- componentEl.removeEventListener('focusout', focusOut);
125+
+ inputEl.removeEventListener('focusout', focusOut);
126+
};
127+
};
128+
/**
129+
diff --git a/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js b/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js
130+
index 4b8d277..fc26329 100644
131+
--- a/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js
132+
+++ b/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js
133+
@@ -109,7 +109,7 @@ const Item = class {
134+
// inputs, then those need to individually get each click
135+
hasCover() {
136+
const inputs = this.el.querySelectorAll('ion-checkbox, ion-datetime, ion-select, ion-radio');
137+
- return inputs.length === 1 && !this.multipleInputs;
138+
+ return inputs.length === 1;
139+
}
140+
// If the item has an href or button property it will render a native
141+
// anchor or button that is clickable
95142
diff --git a/node_modules/@ionic/core/dist/esm/ion-popover.entry.js b/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
96-
index 9b06217..70b4015 100644
143+
index d32e60c..491c281 100644
97144
--- a/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
98145
+++ b/node_modules/@ionic/core/dist/esm/ion-popover.entry.js
99146
@@ -765,8 +765,10 @@ const iosEnterAnimation = (baseEl, opts) => {
@@ -123,10 +170,10 @@ index 9b06217..70b4015 100644
123170
const contentEl = root.querySelector('.popover-content');
124171
const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
125172
diff --git a/node_modules/@ionic/core/hydrate/index.js b/node_modules/@ionic/core/hydrate/index.js
126-
index c3d2d8e..bc40d4f 100644
173+
index 6de5db2..e9c8ecc 100644
127174
--- a/node_modules/@ionic/core/hydrate/index.js
128175
+++ b/node_modules/@ionic/core/hydrate/index.js
129-
@@ -23882,8 +23882,10 @@ const iosEnterAnimation$1 = (baseEl, opts) => {
176+
@@ -24183,8 +24183,10 @@ const iosEnterAnimation$1 = (baseEl, opts) => {
130177
const { event: ev, size, trigger, reference, side, align } = opts;
131178
const doc = baseEl.ownerDocument;
132179
const isRTL = doc.dir === 'rtl';
@@ -139,7 +186,7 @@ index c3d2d8e..bc40d4f 100644
139186
const root = getElementRoot(baseEl);
140187
const contentEl = root.querySelector('.popover-content');
141188
const arrowEl = root.querySelector('.popover-arrow');
142-
@@ -24003,8 +24005,10 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
189+
@@ -24304,8 +24306,10 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
143190
const { event: ev, size, trigger, reference, side, align } = opts;
144191
const doc = baseEl.ownerDocument;
145192
const isRTL = doc.dir === 'rtl';
@@ -152,48 +199,3 @@ index c3d2d8e..bc40d4f 100644
152199
const root = getElementRoot(baseEl);
153200
const contentEl = root.querySelector('.popover-content');
154201
const referenceSizeEl = trigger || ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a.ionShadowTarget) || (ev === null || ev === void 0 ? void 0 : ev.target);
155-
diff --git a/node_modules/@ionic/core/dist/esm/input-shims-0314bbe5.js b/node_modules/@ionic/core/dist/esm/input-shims-0314bbe5.js
156-
index dd9d410..846146f 100644
157-
--- a/node_modules/@ionic/core/dist/esm/input-shims-0314bbe5.js
158-
+++ b/node_modules/@ionic/core/dist/esm/input-shims-0314bbe5.js
159-
@@ -338,7 +338,8 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
160-
const focusOut = () => {
161-
hasKeyboardBeenPresentedForTextField = false;
162-
win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
163-
- componentEl.removeEventListener('focusout', focusOut);
164-
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
165-
+ inputEl.removeEventListener('focusout', focusOut);
166-
};
167-
/**
168-
* When the input is about to receive
169-
@@ -358,13 +358,15 @@ const enableScrollAssist = (componentEl, inputEl, contentEl, footerEl, keyboardH
170-
}
171-
jsSetFocus(componentEl, inputEl, contentEl, footerEl, keyboardHeight, addScrollPadding, disableClonedInput, platformHeight);
172-
win === null || win === void 0 ? void 0 : win.addEventListener('ionKeyboardDidShow', keyboardShow);
173-
- componentEl.addEventListener('focusout', focusOut);
174-
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
175-
+ inputEl.addEventListener('focusout', focusOut);
176-
};
177-
- componentEl.addEventListener('focusin', focusIn);
178-
+ // Patched: Attach focusin/focusout events to inputEl instead of componentEl to allow focusing buttons inside <ion-input>.
179-
+ inputEl.addEventListener('focusin', focusIn);
180-
return () => {
181-
- componentEl.removeEventListener('focusin', focusIn);
182-
+ inputEl.removeEventListener('focusin', focusIn);
183-
win === null || win === void 0 ? void 0 : win.removeEventListener('ionKeyboardDidShow', keyboardShow);
184-
- componentEl.removeEventListener('focusout', focusOut);
185-
+ inputEl.removeEventListener('focusout', focusOut);
186-
};
187-
};
188-
/**
189-
--- a/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js
190-
+++ b/node_modules/@ionic/core/dist/esm/ion-item_8.entry.js
191-
@@ -109,7 +109,7 @@ const Item = class {
192-
// inputs, then those need to individually get each click
193-
hasCover() {
194-
const inputs = this.el.querySelectorAll('ion-checkbox, ion-datetime, ion-select, ion-radio');
195-
- return inputs.length === 1 && !this.multipleInputs;
196-
+ return inputs.length === 1;
197-
}
198-
// If the item has an href or button property it will render a native
199-
// anchor or button that is clickable

‎src/theme/components/ion-action-sheet.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ion-action-sheet {
5151
}
5252

5353
// We need [class] to increase the specificity. See: https://ionicframework.com/docs/api/action-sheet#theming
54-
.action-sheet-button[class] {
54+
.action-sheet-button.select-interface-option[class] {
5555
&, &.ion-focused, &.ion-activated {
5656
color: var(--text-color);
5757
}

0 commit comments

Comments
 (0)
Please sign in to comment.