Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a37b8be
First pass at adding a stylelint script.
afercia Aug 6, 2026
936103f
Remove custom rule from gutenberg.
afercia Aug 6, 2026
d587236
Clean up stylelintignore.
afercia Aug 6, 2026
bdb3875
Clean up config.
afercia Aug 6, 2026
32fe7f0
Add Grunt task and clean up.
afercia Aug 7, 2026
58fe3e2
Remove stylelint-config-wordpress package.
afercia Aug 7, 2026
6443a6b
Ignore admin color scheme auto generated files.
afercia Aug 8, 2026
62498ff
Ignore files copied to wp-includes js.
afercia Aug 8, 2026
251ca30
Remove Stylelint configuration from Twenty Twenty theme.
afercia Aug 9, 2026
03eba4f
Remove Stylelint configuration from Twenty Twenty-One theme.
afercia Aug 9, 2026
eaffed6
Remove comments.
afercia Aug 9, 2026
21b8a8d
Add lint:css:themes script for bundled themes.
afercia Aug 9, 2026
2304f58
Build theme files.
afercia Aug 9, 2026
f70bd8c
Use the root stylelintrc for twentytwentyone.
afercia Aug 9, 2026
435a5b2
For twentytwentyone try adding a postcss script and run it twice.
afercia Aug 10, 2026
b8dd30b
Start refining rules.
afercia Aug 10, 2026
8740dfc
Add rules for empty lines before.
afercia Aug 10, 2026
c6260a3
Solve the indentation and leading space issues avoiding to run postcs…
afercia Aug 10, 2026
ba87b95
Improve comment-empty-line-before.
afercia Aug 10, 2026
c839411
Improve comment.
afercia Aug 10, 2026
1b7bd3a
Improve selector-list-comma-space-after.
afercia Aug 10, 2026
d7def63
Refine empty libe before rule.
afercia Aug 11, 2026
b385263
Add selector-no-qualifying-type warning.
afercia Aug 11, 2026
33c71a5
Refine more rules.
afercia Aug 11, 2026
82996cd
Improve order of rules related to indentation.
afercia Aug 11, 2026
2db1072
Reduce max-empty-lines to 1.
afercia Aug 11, 2026
37106bd
Disable comment-empty-line-before.
afercia Aug 11, 2026
ada9cbe
Run stylelint directly so that it walks upwards until it finds the ro…
afercia Aug 11, 2026
fa3c320
Update test-and-zip-default-themes gh action.
afercia Aug 11, 2026
6b98823
Add bacl @wordpress/scripts to twentytwentyone.
afercia Aug 11, 2026
5d35fc0
Add stylelint-plugin-logical-css to twentytwentyone.
afercia Aug 11, 2026
8175004
Update twentytwentyone styles.
afercia Aug 11, 2026
b3c8e48
Pass the glob as a quoted pattern.
afercia Aug 11, 2026
56e52da
Add optimizeLegibility to value-keyword-case exceptions.
afercia Aug 12, 2026
18cae71
Add @stylistic/selector-descendant-combinator-no-non-space true.
afercia Aug 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test-and-zip-default-themes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,20 +242,20 @@ jobs:
persist-credentials: false

- name: Set up Node.js for themes needing minification
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive' || matrix.theme == 'twentytwentyone'
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
with:
node-version-file: '.nvmrc'
cache: npm
cache-dependency-path: src/wp-content/themes/${{ matrix.theme }}/package-lock.json

- name: Install npm dependencies
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive' || matrix.theme == 'twentytwentyone'
run: npm ci
working-directory: src/wp-content/themes/${{ matrix.theme }}

- name: Build theme assets
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive'
if: matrix.theme == 'twentytwentytwo' || matrix.theme == 'twentytwentyfive' || matrix.theme == 'twentytwentyone'
run: npm run build
working-directory: src/wp-content/themes/${{ matrix.theme }}

Expand Down
27 changes: 27 additions & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Ignore WordPress plugin files.
src/wp-content/plugins/**/*

# Ignore WordPress theme files.
src/wp-content/themes/**/*

# Ignore WordPress block files.
src/wp-includes/blocks/**/*

# Ignore admin color schemes auto generated files.
src/wp-admin/css/colors/*/*.css

# Ignore WordPress included dist files.
src/wp-includes/css/dist/**/*

# Ignore files copied to wp-includes js.
src/wp-includes/js/**/*

# Ignore WordPress JS vendor files.
src/js/_enqueues/vendor/**/*

# Ignore minified CSS files.
**/*.min.css

# Ignore RTL CSS files.
**/*-rtl.css
**/*-rtl.min.css
9 changes: 9 additions & 0 deletions .stylelintignore-themes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Ignore Node modules.
node_modules

# Ignore minified CSS files.
**/*.min.css

# Ignore RTL CSS files.
**/*-rtl.css
**/*-rtl.min.css
99 changes: 99 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/** @type {import('stylelint').Config} */
module.exports = {
extends: '@wordpress/stylelint-config/scss-stylistic',
plugins: [
'stylelint-plugin-logical-css',
'@wordpress/theme/stylelint-plugins/no-token-fallback-values',
],
reportNeedlessDisables: true,
rules: {
'at-rule-empty-line-before': [
'always',
{
'ignore': ['first-nested', 'after-comment'],
},
],
'comment-empty-line-before': null,
'declaration-property-unit-allowed-list': [
{
'line-height': [],
},
],
'declaration-property-value-allowed-list': [
{
'flex-direction': '/^(?!(row|column)-reverse).*$/',
},
{
message: ( property, value ) =>
`Avoid "${ value }" value for the "${ property }" property. For accessibility reasons, visual, reading, and DOM order must match. Only use the reverse values when they do not affect reading order, meaning, and interaction.`,
},
],
'font-weight-notation': 'numeric',
'function-disallowed-list': ['rgb'],
'no-descending-specificity': null,
'no-invalid-position-at-import-rule': null,
'property-disallowed-list': [
[ 'order' ],
{
message:
'Avoid the order property. For accessibility reasons, visual, reading, and DOM order must match. Only use the order property when it does not affect reading order, meaning, and interaction.',
},
],
'rule-empty-line-before': [
'always',
{
except: ['first-nested'],
ignore: ['after-comment'],
},
],
'selector-class-pattern': [
'^[a-z][a-z0-9]*(?:(?:__|--|-)[a-z0-9]+)*$',
{
message:
'Class selector should use lowercase class segments separated with hyphens, double hyphens, or double underscores',
},
],
'selector-no-qualifying-type': [
true,
{
severity: 'warning',
},
],
'value-keyword-case': [
'lower',
{
ignoreKeywords: [
'currentColor',
'optimizeLegibility'
],
},
],
'scss/at-else-empty-line-before': null,
'scss/at-extend-no-missing-placeholder': null,
'scss/at-if-closing-brace-newline-after': null,
'scss/at-if-closing-brace-space-after': null,
'scss/comment-no-empty': null,
'scss/load-partial-extension': null,
'scss/no-global-function-names': null,
'scss/operator-no-newline-after': null,
'scss/operator-no-unspaced': null,
'scss/selector-no-redundant-nesting-selector': null,
'@stylistic/max-empty-lines': 1,
'@stylistic/max-line-length': null,
'@stylistic/selector-descendant-combinator-no-non-space': true,
// Keep these lines. Don't change their order otherwise indentation will break.
// It's not about a literal 'execution order', but rather a compatibility issue.
'@stylistic/block-closing-brace-newline-before': 'always',
'@stylistic/block-opening-brace-newline-after': 'always',
'@stylistic/declaration-block-semicolon-newline-after': 'always',
'@stylistic/selector-list-comma-space-after': 'always-single-line',
'@stylistic/selector-list-comma-newline-after': 'always',
'@stylistic/declaration-colon-newline-after': 'always-multi-line',
'@stylistic/indentation': 'tab',
// End keep these lines.
},
reportDescriptionlessDisables: true,
ignorePath: '.stylelintignore',
};


22 changes: 21 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -1760,8 +1760,28 @@ module.exports = function(grunt) {
'qunit:compiled'
] );

grunt.registerTask( 'lint:css', 'Runs Stylelint on core CSS.', function() {
var done = this.async();

grunt.util.spawn( {
cmd: 'npx',
args: [
'wp-scripts',
'lint-style',
SOURCE_DIR + '**/*.{css,scss}',
// By default, the Stylelint CLI looks for files to ignore in
// .stylelintignore in process.cwd(). This way, the configuration
// is consistent with the one for the NPM script in .stylelintrc.js.
],
opts: { stdio: 'inherit' }
}, function( error ) {
done( ! error );
} );
} );

grunt.registerTask( 'precommit:css', [
'postcss:core'
'postcss:core',
'lint:css',
] );

grunt.registerTask( 'precommit:php', [
Expand Down
11 changes: 11 additions & 0 deletions package-lock.json

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

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"sinon": "16.1.3",
"sinon-test": "~3.1.6",
"source-map-loader": "5.0.0",
"stylelint-plugin-logical-css": "2.1.0",
"typescript": "6.0.3",
"uuid": "14.0.1",
"wait-on": "9.0.10",
Expand Down Expand Up @@ -125,6 +126,10 @@
"grunt": "grunt",
"lint:jsdoc": "wp-scripts lint-js",
"lint:jsdoc:fix": "wp-scripts lint-js --fix",
"lint:css": "wp-scripts lint-style \"src/**/*.{css,scss}\"",
"lint:css:fix": "npm run lint:css -- --fix",
"lint:css:themes": "wp-scripts lint-style \"src/wp-content/themes/**/*.{css,scss}\" --ignore-path .stylelintignore-themes",
"lint:css:themes:fix": "npm run lint:css:themes -- --fix",
"typecheck:js": "tsc --build",
"env:start": "node ./tools/local-env/scripts/start.js && node ./tools/local-env/scripts/docker.js run -T --rm php composer update -W",
"env:stop": "node ./tools/local-env/scripts/docker.js down",
Expand Down
12 changes: 0 additions & 12 deletions src/wp-content/themes/twentytwenty/.stylelintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions src/wp-content/themes/twentytwenty/assets/css/font-inter.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Inter variable font. Usage:

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: normal;
font-display: swap;
src: url(../fonts/inter/Inter-upright-var.woff2) format("woff2");
}

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: italic;
font-display: swap;
src: url(../fonts/inter/Inter-italic-var.woff2) format("woff2");
Expand Down
21 changes: 1 addition & 20 deletions src/wp-content/themes/twentytwenty/package-lock.json

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

4 changes: 1 addition & 3 deletions src/wp-content/themes/twentytwenty/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
"concurrently": "^9.2.1",
"postcss": "^8.5.6",
"postcss-cli": "^11.0.1",
"rtlcss": "^4.3.0",
"stylelint-a11y": "^1.2.3"
"rtlcss": "^4.3.0"
},
"browserslist": [
"extends @wordpress/browserslist-config"
Expand All @@ -56,7 +55,6 @@
"build:vendor-prefixes-style": "postcss -r --no-map style.css assets/css/editor-style-block.css assets/css/editor-style-classic.css",
"build:vendor-prefixes-esb": "postcss -r --no-map assets/css/editor-style-block.css ",
"build:vendor-prefixes-esc": "postcss -r --no-map assets/css/editor-style-classic.css",
"lint:css": "wp-scripts lint-style 'style.css' 'assets/**/*.css'",
"lint:js": "wp-scripts lint-js 'assets/**/*.js'",
"lint:pkg-json": "wp-scripts lint-pkg-json"
}
Expand Down
4 changes: 2 additions & 2 deletions src/wp-content/themes/twentytwenty/style-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,15 @@ Inter variable font. Usage:

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: normal;
font-display: swap;
src: url(./assets/fonts/inter/Inter-upright-var.woff2) format("woff2");
}

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: italic;
font-display: swap;
src: url(./assets/fonts/inter/Inter-italic-var.woff2) format("woff2");
Expand Down
4 changes: 2 additions & 2 deletions src/wp-content/themes/twentytwenty/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,15 @@ Inter variable font. Usage:

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: normal;
font-display: swap;
src: url(./assets/fonts/inter/Inter-upright-var.woff2) format("woff2");
}

@font-face {
font-family: "Inter var";
font-weight: 100 900; /* stylelint-disable-line font-weight-notation */
font-weight: 100 900;
font-style: italic;
font-display: swap;
src: url(./assets/fonts/inter/Inter-italic-var.woff2) format("woff2");
Expand Down
10 changes: 0 additions & 10 deletions src/wp-content/themes/twentytwentyone/.stylelintignore

This file was deleted.

Loading
Loading