Skip to content

Commit

Permalink
Merge branch 'master' into browser-bundle
Browse files Browse the repository at this point in the history
# By jeddy3 (4) and others
# Via GitHub
* master:
  Create new 'prepareReturnValue' module (#4832)
  13.6.1
  Scope eslint disable
  Prepare 13.6.1
  Update deps
  Update CHANGELOG.md
  Fix false positives for idents within ::part pseudo-elements in selector-type-no-unknown (#4828)
  Bump np from 6.2.3 to 6.2.4 (#4830)
  • Loading branch information
m-allanson committed Jun 20, 2020
2 parents c8dd0a9 + e110b4c commit 30cc66f
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 93 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,10 +2,11 @@

All notable changes to this project are documented in this file.

## Head
## 13.6.1

- Fixed: `max-empty-lines` TypeError from inline comment with autofix and sugarss syntax ([#4821](https://github.com/stylelint/stylelint/pull/4821)).
- Fixed: `property-no-unknown` false positives for namespaced variables ([#4803](https://github.com/stylelint/stylelint/pull/4803)).
- Fixed: `selector-type-no-unknown` false positives for idents within `::part` pseudo-elements ([#4828](https://github.com/stylelint/stylelint/pull/4828)).

## 13.6.0

Expand Down
2 changes: 1 addition & 1 deletion lib/createPartialStylelintResult.js
Expand Up @@ -57,7 +57,7 @@ module.exports = function (postcssResult, cssSyntaxError) {
deprecations,
invalidOptionWarnings,
// TODO TYPES check which types are valid? postcss? stylelint?
/* eslint-disable-next-line */
/* eslint-disable-next-line object-shorthand */
parseErrors: /** @type {any} */ (parseErrors),
errored: postcssResult.stylelint.stylelintError,
warnings: postcssResult.messages.map((message) => {
Expand Down
4 changes: 4 additions & 0 deletions lib/rules/selector-type-no-unknown/__tests__/index.js
Expand Up @@ -422,6 +422,10 @@ testRule({
code: 'x-foo {}',
description: 'custom element',
},
{
code: 'custom-element::part(foo) {}',
description: 'shadow parts',
},
],

reject: [
Expand Down
5 changes: 5 additions & 0 deletions lib/utils/__tests__/isStandardSyntaxTypeSelector.test.js
Expand Up @@ -75,6 +75,11 @@ describe('isStandardSyntaxTypeSelector', () => {
expect(isStandardSyntaxTypeSelector(func)).toBeFalsy();
});
});
it('shadow-parts ident', () => {
rules('::part(foo) {}', (func) => {
expect(isStandardSyntaxTypeSelector(func)).toBeFalsy();
});
});
it('lowercase reference combinators', () => {
rules('.foo /for/ .bar {}', (func) => {
expect(isStandardSyntaxTypeSelector(func)).toBeFalsy();
Expand Down
3 changes: 2 additions & 1 deletion lib/utils/isStandardSyntaxTypeSelector.js
Expand Up @@ -27,7 +27,8 @@ module.exports = function (node) {
if (
parentType === 'pseudo' &&
(keywordSets.aNPlusBNotationPseudoClasses.has(normalisedParentName) ||
keywordSets.linguisticPseudoClasses.has(normalisedParentName))
keywordSets.linguisticPseudoClasses.has(normalisedParentName) ||
keywordSets.shadowTreePseudoElements.has(normalisedParentName))
) {
return false;
}
Expand Down
145 changes: 61 additions & 84 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "stylelint",
"version": "13.6.0",
"version": "13.6.1",
"description": "A mighty, modern CSS linter.",
"keywords": [
"css-in-js",
Expand Down Expand Up @@ -116,7 +116,7 @@
"@stylelint/postcss-markdown": "^0.36.1",
"autoprefixer": "^9.8.0",
"balanced-match": "^1.0.0",
"chalk": "^4.0.0",
"chalk": "^4.1.0",
"cosmiconfig": "^6.0.0",
"debug": "^4.1.1",
"execall": "^2.0.0",
Expand Down Expand Up @@ -173,23 +173,23 @@
"benchmark": "^2.1.4",
"common-tags": "^1.8.0",
"del": "^5.1.0",
"eslint": "^7.1.0",
"eslint": "^7.2.0",
"eslint-config-stylelint": "^12.0.0",
"got": "^11.3.0",
"husky": "^4.2.5",
"jest": "^26.0.1",
"jest-circus": "^26.0.1",
"jest-preset-stylelint": "^3.0.0",
"jest-watch-typeahead": "^0.6.0",
"lint-staged": "^10.2.9",
"np": "^6.2.3",
"lint-staged": "^10.2.11",
"np": "^6.2.4",
"npm-run-all": "^4.1.5",
"parcel": "^2.0.0-beta.1",
"postcss-import": "^12.0.1",
"prettier": "^2.0.5",
"remark-cli": "^8.0.0",
"replace-in-file": "^6.0.0",
"typescript": "^3.9.3"
"typescript": "^3.9.5"
},
"engines": {
"node": ">=10.13.0"
Expand Down

0 comments on commit 30cc66f

Please sign in to comment.