Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Node 22 / Sass 1.80 #479

Merged
merged 15 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20
22
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default_language_version:
node: 20.15.0
node: 22.11.0
python: python3.12
repos:
- repo: https://github.com/psf/black
Expand Down Expand Up @@ -39,14 +39,14 @@ repos:
- eslint@8.20.0
- '@wagtail/eslint-config-wagtail@0.4.0'
- repo: https://github.com/thibaudcolas/pre-commit-stylelint
rev: v14.9.1
rev: v15.11.0
hooks:
- id: stylelint
files: \.scss$
args: [--report-needless-disables]
additional_dependencies:
- stylelint@14.9.1
- '@wagtail/stylelint-config-wagtail@0.5.0'
- stylelint@15.11.0
- '@wagtail/stylelint-config-wagtail@0.8.0'
- repo: https://github.com/rtts/djhtml
rev: 3.0.7
hooks:
Expand Down
9 changes: 9 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
extends: '@wagtail/stylelint-config-wagtail',
rules: {
'scss/selector-no-union-class-name': null,
'scss/at-rule-no-unknown': [
true,
{
Expand Down Expand Up @@ -79,5 +80,13 @@ module.exports = {
],
// Allow use of 'right', 'left' and 'text-transform'
'property-disallowed-list': null,
// Refined ordering to align with media mixin usage - see https://github.com/wagtail/stylelint-config-wagtail/issues/37
'order/order': [
'dollar-variables',
'custom-properties',
// Disabled until we migrate existing code.
// { type: 'at-rule', hasBlock: true }, // @-rules that have no nesting.
'declarations',
],
},
};
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# (Keep the version in sync with the node install below)
FROM node:20 as frontend
FROM node:22 as frontend

# Install front-end dependencies.
COPY package.json package-lock.json tsconfig.json webpack.config.js ./
Expand Down
Loading
Loading