Skip to content

Commit 52869e4

Browse files
committed
Merge branch 'main' of github.com:ionic-team/ionic-framework into pr/vunizhona/30147
2 parents be90ec9 + 7789bb5 commit 52869e4

File tree

35 files changed

+493
-269
lines changed

35 files changed

+493
-269
lines changed

.github/workflows/actions/test-core-screenshot/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ runs:
4949
# which is why we not using the upload-archive
5050
# composite step here.
5151
run: |
52-
npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots
52+
npm run test.e2e.docker.ci ${{ inputs.component }} -- --shard=${{ inputs.shard }}/${{ inputs.totalShards }} --update-snapshots='changed'
5353
git add src/\*.png --force
5454
mkdir updated-screenshots
5555
cd ../ && rsync -R --progress $(git diff --name-only --cached) core/updated-screenshots

CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.1](https://github.com/ionic-team/ionic-framework/compare/v8.5.0...v8.5.1) (2025-03-19)
7+
8+
9+
### Bug Fixes
10+
11+
* **modal:** consider scrollable content while dragging when expandToScroll is false ([#30257](https://github.com/ionic-team/ionic-framework/issues/30257)) ([68be8e9](https://github.com/ionic-team/ionic-framework/commit/68be8e915ce5637b20591bb0acfb3653c2184ff6))
12+
* **vue:** update output target and fix incorrect types ([#30259](https://github.com/ionic-team/ionic-framework/issues/30259)) ([f4186c6](https://github.com/ionic-team/ionic-framework/commit/f4186c6761c46bf386f8effecf90d88831c34726)), closes [#30254](https://github.com/ionic-team/ionic-framework/issues/30254)
13+
14+
15+
### Performance Improvements
16+
17+
* **modal:** fixing performance regression on modal sheets when expandToScroll is false ([#30267](https://github.com/ionic-team/ionic-framework/issues/30267)) ([c4b9212](https://github.com/ionic-team/ionic-framework/commit/c4b92126405ae5b7160ce03f40557563e755a8a5))
18+
19+
20+
21+
22+
23+
## [8.4.6](https://github.com/ionic-team/ionic-framework/compare/v8.4.5...v8.4.6) (2025-03-19)
24+
25+
26+
### Bug Fixes
27+
28+
* **vue:** update output target and fix incorrect types ([#30259](https://github.com/ionic-team/ionic-framework/issues/30259)) ([0eaee78](https://github.com/ionic-team/ionic-framework/commit/0eaee78fe1cae8f8a6cb04a01abad8c05dec0723)), closes [#30254](https://github.com/ionic-team/ionic-framework/issues/30254)
29+
30+
31+
32+
33+
634
# [8.5.0](https://github.com/ionic-team/ionic-framework/compare/v8.4.5...v8.5.0) (2025-03-13)
735

836

core/CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [8.5.1](https://github.com/ionic-team/ionic-framework/compare/v8.5.0...v8.5.1) (2025-03-19)
7+
8+
9+
### Bug Fixes
10+
11+
* **modal:** consider scrollable content while dragging when expandToScroll is false ([#30257](https://github.com/ionic-team/ionic-framework/issues/30257)) ([68be8e9](https://github.com/ionic-team/ionic-framework/commit/68be8e915ce5637b20591bb0acfb3653c2184ff6))
12+
* **vue:** update output target and fix incorrect types ([#30259](https://github.com/ionic-team/ionic-framework/issues/30259)) ([f4186c6](https://github.com/ionic-team/ionic-framework/commit/f4186c6761c46bf386f8effecf90d88831c34726)), closes [#30254](https://github.com/ionic-team/ionic-framework/issues/30254)
13+
14+
15+
### Performance Improvements
16+
17+
* **modal:** fixing performance regression on modal sheets when expandToScroll is false ([#30267](https://github.com/ionic-team/ionic-framework/issues/30267)) ([c4b9212](https://github.com/ionic-team/ionic-framework/commit/c4b92126405ae5b7160ce03f40557563e755a8a5))
18+
19+
20+
21+
22+
23+
## [8.4.6](https://github.com/ionic-team/ionic-framework/compare/v8.4.5...v8.4.6) (2025-03-19)
24+
25+
26+
### Bug Fixes
27+
28+
* **vue:** update output target and fix incorrect types ([#30259](https://github.com/ionic-team/ionic-framework/issues/30259)) ([0eaee78](https://github.com/ionic-team/ionic-framework/commit/0eaee78fe1cae8f8a6cb04a01abad8c05dec0723)), closes [#30254](https://github.com/ionic-team/ionic-framework/issues/30254)
29+
30+
31+
32+
33+
634
# [8.5.0](https://github.com/ionic-team/ionic-framework/compare/v8.4.5...v8.5.0) (2025-03-13)
735

836

core/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Get Playwright
2-
FROM mcr.microsoft.com/playwright:v1.51.0
2+
FROM mcr.microsoft.com/playwright:v1.51.1
33

44
# Set the working directory
55
WORKDIR /ionic

core/package-lock.json

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

core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/core",
3-
"version": "8.5.0",
3+
"version": "8.5.1",
44
"description": "Base components for Ionic",
55
"keywords": [
66
"ionic",
@@ -44,13 +44,13 @@
4444
"@clack/prompts": "^0.10.0",
4545
"@ionic/eslint-config": "^0.3.0",
4646
"@ionic/prettier-config": "^2.0.0",
47-
"@playwright/test": "^1.51.0",
47+
"@playwright/test": "^1.51.1",
4848
"@rollup/plugin-node-resolve": "^8.4.0",
4949
"@rollup/plugin-virtual": "^2.0.3",
5050
"@stencil/angular-output-target": "^0.10.0",
5151
"@stencil/react-output-target": "0.5.3",
5252
"@stencil/sass": "^3.0.9",
53-
"@stencil/vue-output-target": "0.10.5",
53+
"@stencil/vue-output-target": "0.10.7",
5454
"@types/jest": "^29.5.6",
5555
"@types/node": "^14.6.0",
5656
"@typescript-eslint/eslint-plugin": "^6.7.2",
@@ -93,13 +93,13 @@
9393
"test": "npm run test.spec && npm run test.e2e",
9494
"test.spec": "stencil test --spec --max-workers=2",
9595
"test.e2e": "npx playwright test",
96-
"test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots",
96+
"test.e2e.update-snapshots": "npm run test.e2e -- --update-snapshots='changed'",
9797
"test.watch": "jest --watch --no-cache",
9898
"test.treeshake": "node scripts/treeshaking.js dist/index.js",
9999
"validate": "npm run lint && npm run test && npm run build && npm run test.treeshake",
100100
"docker.build": "docker build -t ionic-playwright .",
101101
"test.e2e.docker": "npm run docker.build && node ./scripts/docker.mjs",
102-
"test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots",
102+
"test.e2e.docker.update-snapshots": "npm run test.e2e.docker -- --update-snapshots='changed'",
103103
"test.e2e.docker.ci": "npm run docker.build && CI=true node ./scripts/docker.mjs",
104104
"test.e2e.script": "node scripts/testing/e2e-script.mjs"
105105
},

core/src/components/infinite-scroll/test/top/infinite-scroll.e2e.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ import { configs, test } from '@utils/test/playwright';
33

44
configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
55
test.describe(title('infinite-scroll: top'), () => {
6-
test('should load more items when scrolled to the top', async ({ page }) => {
6+
test('should load more items when scrolled to the top', async ({ page, skip }) => {
7+
// TODO(FW-6394): remove once flaky issue is resolved
8+
skip.browser('webkit', 'Safari is flaky on CI');
9+
710
await page.goto('/src/components/infinite-scroll/test/top', config);
811

912
const ionInfiniteComplete = await page.spyOnEvent('ionInfiniteComplete');

0 commit comments

Comments
 (0)