Skip to content

Commit

Permalink
Merge branch 'master' into refactor/extract-node-type-parameters-to-var
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryBrown0 committed Nov 3, 2023
2 parents 7b443d1 + 9da1bb0 commit b4199ac
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ jobs:
- run: |
npm link
npm link eslint-plugin-react
- uses: AriPerkkio/eslint-remote-tester-run-action@v3
- uses: AriPerkkio/eslint-remote-tester-run-action@v4
with:
issue-title: 'Results of weekly scheduled smoke test'
issue-label: 'smoke-test'
eslint-remote-tester-config: test/eslint-remote-tester.config.js
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ This change log adheres to standards from [Keep a CHANGELOG](https://keepachange

### Added
* [`sort-prop-types`]: give errors on TS types ([#3615][] @akulsr0)
* [`no-invalid-html-attribute`]: add support for `apple-touch-startup-image` `rel` attributes in `link` tags ([#3638][] @thomashockaday)

### Fixed
* [`jsx-no-leaked-render`]: preserve RHS parens for multiline jsx elements while fixing ([#3623][] @akulsr0)
* [`jsx-key`]: detect conditional returns ([#3630][] @yialo)
* [`jsx-newline`]: prevent a crash when `allowMultilines ([#3633][] @ljharb)

[#3638]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3638
[#3633]: https://github.com/jsx-eslint/eslint-plugin-react/issues/3633
[#3630]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3630
[#3623]: https://github.com/jsx-eslint/eslint-plugin-react/pull/3623
Expand Down
1 change: 1 addition & 0 deletions lib/rules/no-invalid-html-attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const getMessageData = require('../util/message');
const rel = new Map([
['alternate', new Set(['link', 'area', 'a'])],
['apple-touch-icon', new Set(['link'])],
['apple-touch-startup-image', new Set(['link'])],
['author', new Set(['link', 'area', 'a'])],
['bookmark', new Set(['area', 'a'])],
['canonical', new Set(['link'])],
Expand Down
6 changes: 6 additions & 0 deletions tests/lib/rules/no-invalid-html-attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ ruleTester.run('no-invalid-html-attribute', rule, {
{
code: '<link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon-180x180.png" />',
},
{
code: '<link rel="apple-touch-startup-image" href="launch.png" />',
},
{
code: '<link rel="apple-touch-startup-image" href="iphone5.png" media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2)" />',
},
{
code: '<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#fff" />',
},
Expand Down

0 comments on commit b4199ac

Please sign in to comment.