Skip to content

Commit adf220b

Browse files
authored
chore: sync with main (#29300)
Issue number: N/A --------- <!-- Please do not submit updates to dependencies unless it fixes an issue. --> <!-- Please try to limit your pull request to one type (bugfix, feature, etc). Submit multiple pull requests if needed. --> ## What is the current behavior? <!-- Please describe the current behavior that you are modifying. --> ## What is the new behavior? <!-- Please describe the behavior or changes that are being added by this PR. --> - Syncs the `feature.8.0` branch with the latest from `main`. ## Does this introduce a breaking change? - [ ] Yes - [x] No <!-- If this introduces a breaking change: 1. Describe the impact and migration path for existing applications below. 2. Update the BREAKING.md file with the breaking change. 3. Add "BREAKING CHANGE: [...]" to the commit description when merging. See https://github.com/ionic-team/ionic-framework/blob/main/docs/CONTRIBUTING.md#footer for more information. --> ## Other information <!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. -->
2 parents 4d6edee + e64015a commit adf220b

37 files changed

+1173
-425
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,7 @@
1313

1414
* @ionic-team/framework
1515

16-
# Frameworks
17-
18-
## Angular
19-
20-
/packages/angular/ @sean-perkins @thetaPC
21-
/packages/angular-server @sean-perkins @thetaPC
22-
/packages/angular/test @thetaPC
23-
24-
## Vue
25-
26-
/packages/vue/ @thetaPC
27-
/packages/vue-router/ @liamdebeasi @thetaPC
28-
/packages/vue/test/ @thetaPC
29-
/packages/vue-router/__tests__ @thetaPC
30-
31-
# Components
32-
33-
/core/src/components/datetime/ @sean-perkins
34-
35-
/core/src/components/nav/ @sean-perkins
36-
/core/src/components/nav-link/ @sean-perkins
37-
3816
# Utilities
3917

40-
/core/src/utils/content/ @sean-perkins
4118
/core/src/utils/gesture/ @liamdebeasi
4219
/core/src/utils/input-shims/ @liamdebeasi

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Issue number: resolves #
2525
If this introduces a breaking change:
2626
1. Describe the impact and migration path for existing applications below.
2727
2. Update the BREAKING.md file with the breaking change.
28-
3. Add "BREAKING CHANGE: [...]" to the commit description when merging. See https://github.com/ionic-team/ionic-framework/blob/main/.github/CONTRIBUTING.md#footer for more information.
28+
3. Add "BREAKING CHANGE: [...]" to the commit description when merging. See https://github.com/ionic-team/ionic-framework/blob/main/docs/CONTRIBUTING.md#footer for more information.
2929
-->
3030

3131

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<a href="https://github.com/ionic-team/ionic-framework/blob/main/LICENSE">
2121
<img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="Ionic Framework is released under the MIT license." />
2222
</a>
23-
<a href="https://github.com/ionic-team/ionic/blob/main/.github/CONTRIBUTING.md">
23+
<a href="https://github.com/ionic-team/ionic/blob/main/docs/CONTRIBUTING.md">
2424
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
2525
</a>
2626
<a href="https://twitter.com/Ionicframework">
@@ -38,7 +38,7 @@
3838
Documentation
3939
</a>
4040
<span> · </span>
41-
<a href="https://github.com/ionic-team/ionic/blob/main/.github/CONTRIBUTING.md">Contribute</a>
41+
<a href="https://github.com/ionic-team/ionic/blob/main/docs/CONTRIBUTING.md">Contribute</a>
4242
<span> · </span>
4343
<a href="https://blog.ionicframework.com/">Blog</a>
4444
<br />
@@ -88,7 +88,7 @@ The Ionic Conference App is a full featured Ionic app. It is the perfect startin
8888
### Contributing
8989

9090
Thanks for your interest in contributing! Read up on our guidelines for
91-
[contributing](https://github.com/ionic-team/ionic/blob/main/.github/CONTRIBUTING.md)
91+
[contributing](https://github.com/ionic-team/ionic/blob/main/docs/CONTRIBUTING.md)
9292
and then look through our issues with a [help wanted](https://github.com/ionic-team/ionic/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
9393
label.
9494

core/api.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ ion-infinite-scroll-content,prop,loadingText,IonicSafeString | string | undefine
549549

550550
ion-input,scoped
551551
ion-input,prop,autocapitalize,string,'off',false,false
552-
ion-input,prop,autocomplete,"name" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "email" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "url" | "photo",'off',false,false
552+
ion-input,prop,autocomplete,"name" | "email" | "tel" | "url" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "photo",'off',false,false
553553
ion-input,prop,autocorrect,"off" | "on",'off',false,false
554554
ion-input,prop,autofocus,boolean,false,false,false
555555
ion-input,prop,clearInput,boolean,false,false,false
@@ -1173,7 +1173,7 @@ ion-row,shadow
11731173
ion-searchbar,scoped
11741174
ion-searchbar,prop,animated,boolean,false,false,false
11751175
ion-searchbar,prop,autocapitalize,string,'off',false,false
1176-
ion-searchbar,prop,autocomplete,"name" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "email" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "url" | "photo",'off',false,false
1176+
ion-searchbar,prop,autocomplete,"name" | "email" | "tel" | "url" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "photo",'off',false,false
11771177
ion-searchbar,prop,autocorrect,"off" | "on",'off',false,false
11781178
ion-searchbar,prop,cancelButtonIcon,string,config.get('backButtonIcon', arrowBackSharp) as string,false,false
11791179
ion-searchbar,prop,cancelButtonText,string,'Cancel',false,false

core/package-lock.json

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

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"build.docs.json": "stencil build --docs-json dist/docs.json",
7878
"clean": "node scripts/clean.js",
7979
"css.minify": "cleancss -O2 -o ./css/ionic.bundle.css ./css/ionic.bundle.css",
80-
"css.sass": "sass --embed-sources src/css:./css",
80+
"css.sass": "sass --embed-sources --style compressed src/css:./css",
8181
"eslint": "eslint src",
8282
"lint": "npm run lint.ts && npm run lint.sass && npm run prettier -- --write --cache",
8383
"lint.fix": "npm run lint.ts.fix && npm run lint.sass.fix && npm run prettier -- --write --cache",

core/scripts/readme.md

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,4 @@
11

2-
## Build
2+
# Core Scripts
33

4-
### 1. Clone ionic
5-
6-
[email protected]:ionic-team/ionic.git
7-
cd ionic
8-
9-
### 2. Run `npm install`
10-
11-
cd core
12-
npm install
13-
14-
15-
Notice that `@ionic/core` lives in `core`.
16-
17-
### 3. Run `npm start`
18-
19-
Make sure you are inside the `core` directory.
20-
21-
npm start
22-
23-
With the `dev` command, Ionic components will be built with [Stencil](https://stenciljs.com/), changes to source files are watched, a local http server will startup, and http://localhost:3333/ will open in a browser.
24-
25-
### 4. Preview
26-
27-
Navigate to http://localhost:3333/src/components/. Each component has small e2e apps found in the `test` directory, for example: http://localhost:3333/src/components/button/test/basic
28-
29-
As changes are made in an editor to source files, the e2e app will live-reload.
30-
31-
## How to contribute
32-
33-
1. `npm start` allows you to modify the components and have live reloading, just like another ionic app.
34-
35-
2. When everything looks good, run `npm run validate` to verify the tests linter and production build passes.
36-
37-
38-
# Deploy
39-
40-
1. `npm run prepare.deploy`
41-
2. Review/update changelog
42-
3. Commit updates using the package name and version number as the commit message.
43-
4. `npm run deploy`
44-
5. :tada:
4+
This file has been moved to [/docs/core/testing/preview-changes.md](/docs/core/testing/preview-changes.md).
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
# Ionic E2E Tests Guide
22

3-
This directory contains information on how to get the most out of Ionic's E2E test infrastructure when writing tests.
4-
5-
## Directory
6-
7-
| Directory | Description |
8-
| - | - |
9-
| [Usage Instructions](./usage-instructions.md) | How to run tests and update screenshots |
10-
| [Best Practices](./best-practices.md) | Contains information on conventions to follow as well as pitfalls to avoid when writing tests |
11-
| [API](./api.md) | Documents the custom functionality that has been built on top of Playwright |
3+
Refer to the [Core Testing documentation](/docs/core/testing/README.md) in order to build and run the e2e tests.

.github/CONTRIBUTING.md renamed to docs/CONTRIBUTING.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Contributing
22

3-
Thanks for your interest in contributing to the Ionic Framework! :tada:
3+
Thanks for your interest in contributing to the Ionic Framework! 🎉
44

55
- [Contributing Etiquette](#contributing-etiquette)
66
- [Creating an Issue](#creating-an-issue)
77
* [Creating a Good Code Reproduction](#creating-a-good-code-reproduction)
8+
- [Using VS Code on Windows](#using-vs-code-on-windows)
89
- [Creating a Pull Request](#creating-a-pull-request)
910
* [Requirements](#requirements)
1011
* [Setup](#setup)
@@ -81,6 +82,19 @@ Without a reliable code reproduction, it is unlikely we will be able to resolve
8182
* **No secret code needed:** Creating a minimal reproduction of the issue prevents you from having to publish any proprietary code used in your project.
8283
* **Get help fixing the issue:** If we can reliably reproduce an issue, there is a good chance we will be able to address it.
8384

85+
## Using VS Code on Windows
86+
87+
To contribute on Windows, do the following:
88+
89+
- Configure VS Code to read/save files using line breaks (LF) instead of carriage returns (CRLF). Set it globally by navigating to: Settings -> Text Editor -> Files -> Eol. Set to `\n`.
90+
91+
- You can optionally use the following settings in your `.vscode/settings.json`:
92+
```json
93+
{ "files.eol": "\n" }
94+
```
95+
96+
- Check that the Git setting `core.autocrlf` is set to `false`: run `git config -l | grep autocrlf`. Switch it to false using: `git config --global core.autocrlf false`.
97+
- If you've already cloned the `ionic-framework` repo, the files may already be cached as LF. To undo this, you need to clean the cache files of the repository. Run the following (make sure you stage or commit your changes first): `git rm --cached -r .` then `git reset --hard`.
8498

8599
## Creating a Pull Request
86100

@@ -246,6 +260,14 @@ npm install file:/~/ionic-vue-router-7.0.1.tgz
246260

247261
#### Lint Changes
248262

263+
> [!IMPORTANT]
264+
> If you are using a Windows machine, you will need to configure your local development environment to use the correct line endings.
265+
> - Check that the Git setting `core.autocrlf` is set to `false`: run `git config -l | grep autocrlf`. Switch it to false using: `git config --global core.autocrlf false`.
266+
> - If you've already cloned the `ionic-docs` repo, the files may already be cached as LF. To undo this, you need to clean the cache files of the repository. Run the following (make sure you stage or commit your changes first): `git rm --cached -r .` then `git reset --hard`.
267+
268+
269+
270+
249271
1. Run `npm run lint` to lint the TypeScript and Sass.
250272
2. If there are lint errors, run `npm run lint.fix` to automatically fix any errors. Repeat step 1 to ensure the errors have been fixed, and manually fix them if not.
251273
3. To lint and fix only TypeScript errors, run `npm run lint.ts` and `npm run lint.ts.fix`, respectively.

docs/README.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<p align="center">
2+
<img alt="Ionic Logo" src="https://github.com/ionic-team/ionic-framework/blob/main/.github/assets/logo.png?raw=true" width="60" />
3+
</p>
4+
5+
<h1 align="center">
6+
Ionic Framework Developer Resources
7+
</h1>
8+
9+
<p align="center">
10+
This documentation includes guidelines on contributing, coding conventions, best practices, testing steps, and more. It should serve as a collective resource for all documentation related to developing Ionic Framework.
11+
</p>
12+
13+
## What is Ionic Framework?
14+
15+
Ionic Framework is an open source app development toolkit for building modern, fast, top-quality cross-platform native and Progressive Web Apps from a single codebase with JavaScript and the Web.
16+
17+
It is based on <a href="https://www.webcomponents.org/introduction">Web Components</a>, which enables significant performance, usability, and feature improvements alongside support for popular web frameworks like <a href="https://angular.io/">Angular</a>, <a href="https://reactjs.com/">React</a>, and <a href="https://vuejs.org/">Vue</a>.
18+
19+
## Guides
20+
21+
| Guide | Description |
22+
| ----------------------------------------| ---------------------------------------------------------------------------------------- |
23+
| [Contributing](./CONTRIBUTING.md) | How to contribute including creating pull requests, commit message guidelines, and more. |
24+
| [Component Guide](./component-guide.md) | Guidelines for implementing component states, accessibility, and more. |
25+
| [Sass Guidelines](./sass-guidelines.md) | Outlines scenarios where Sass members and comments should be used. |
26+
27+
## Packages
28+
29+
| Project | Package | Documentation | Guides |
30+
| ---------------- | -------------------------------------------------------------------------- | ---------------------------------| ----------------------------------------------------------------- |
31+
| **Core** | [`@ionic/core`](https://www.npmjs.com/package/@ionic/core) | [Readme](core/README.md) | [Testing](core/testing/README.md) |
32+
| **Angular** | [`@ionic/angular`](https://www.npmjs.com/package/@ionic/angular) | [Readme](angular/README.md) | [Testing](angular/testing.md) |
33+
| **React** | [`@ionic/react`](https://www.npmjs.com/package/@ionic/react) | [Readme](react/README.md) | [Testing](react/testing.md) |
34+
| **React Router** | [`@ionic/react-router`](https://www.npmjs.com/package/@ionic/react-router) | [Readme](react-router/README.md) | [Testing](react-router/testing.md) |
35+
| **Vue** | [`@ionic/vue`](https://www.npmjs.com/package/@ionic/vue) | [Readme](vue/README.md) | [Testing](vue/testing.md) |
36+
| **Vue Router** | [`@ionic/vue-router`](https://www.npmjs.com/package/@ionic/vue-router) | [Readme](vue-router/README.md) | [Testing](vue-router/testing.md) |

0 commit comments

Comments
 (0)