Skip to content

Commit 2a8aa65

Browse files
authored
Merge pull request #6955 from nextcloud-libraries/chore/stylelint-upgrade
chore(dev-deps): bump @nextcloud/stylelint-config from 3.0.1 to 3.1.0 and fix errors
2 parents 4db2f93 + f4abbca commit 2a8aa65

7 files changed

Lines changed: 68 additions & 72 deletions

File tree

.stylelintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

package-lock.json

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

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
"test:component:gui": "playwright test --ui -c playwright.config.ts",
6262
"test:coverage": "vitest run --coverage",
6363
"ts:check": "vue-tsc --noEmit",
64-
"update:snapshots": "npm run test:component -- --grep @visual --update-snapshots",
65-
"watch": "npm run dev:watch"
64+
"update:snapshots": "npm run test:component -- --grep @visual --update-snapshots"
6665
},
6766
"browserslist": [
6867
"extends @nextcloud/browserslist-config"
@@ -121,7 +120,7 @@
121120
"@nextcloud/babel-config": "^1.2.0",
122121
"@nextcloud/browserslist-config": "^3.0.1",
123122
"@nextcloud/eslint-config": "^8.4.2",
124-
"@nextcloud/stylelint-config": "^3.0.1",
123+
"@nextcloud/stylelint-config": "^3.1.0",
125124
"@nextcloud/vite-config": "^2.3.2",
126125
"@nextcloud/webpack-vue-config": "github:nextcloud/webpack-vue-config#vue3",
127126
"@playwright/experimental-ct-vue": "^1.51.1",
@@ -142,7 +141,6 @@
142141
"resolve-url-loader": "^5.0.0",
143142
"sass": "^1.86.1",
144143
"stylelint": "^16.17.0",
145-
"stylelint-use-logical": "^2.1.2",
146144
"ts-node": "^10.9.2",
147145
"typescript": "^5.8.2",
148146
"url-loader": "^4.1.1",

src/components/NcHeaderMenu/header-menu__trigger.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: AGPL-3.0-or-later
44
*/
5-
@use 'variables' as variables;
5+
@use 'variables.scss' as variables;
66

77
.header-menu {
88
position: relative;

src/components/NcRichContenteditable/NcRichContenteditable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,7 @@ export default {
10171017
padding-inline: var(--contenteditable-inline-start-offset) var(--contenteditable-inline-end-offset);
10181018
cursor: text;
10191019
white-space: pre-wrap;
1020-
word-break: break-word;
1020+
overflow-wrap: break-word;
10211021
color: var(--color-main-text);
10221022
border: 2px solid var(--color-border-maxcontrast);
10231023
border-radius: var(--border-radius-large);

src/components/NcRichText/NcRichText.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ export default {
575575
576576
// Plain text styles
577577
.rich-text--wrapper {
578-
word-break: break-word;
578+
overflow-wrap: break-word;
579579
line-height: 1.5;
580580
581581
.rich-text--fallback, .rich-text-component {

stylelint.config.cjs

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const stylelintConfig = require('@nextcloud/stylelint-config')
77

88
module.exports = {
99
extends: ['@nextcloud/stylelint-config'],
10-
plugins: ['stylelint-use-logical'],
1110
rules: {
1211
// For CSS Modules
1312
// If there will be more rules for CSS Modules - consider extending stylelint-config-css-modules
@@ -17,30 +16,6 @@ module.exports = {
1716
ignorePseudoClasses: [...stylelintConfig.rules['selector-pseudo-class-no-unknown'][1].ignorePseudoClasses, 'global'],
1817
},
1918
],
20-
'csstools/use-logical': [
21-
'always',
22-
{
23-
severity: 'error',
24-
// Only lint LTR-RTL properties for now
25-
except: [
26-
// Position properties
27-
'top',
28-
'bottom',
29-
// Position properties with directional suffixes
30-
/-top$/,
31-
/-bottom$/,
32-
// also for e.g. border-bottom-color
33-
/-top-/,
34-
/-bottom-/,
35-
// Size properties
36-
'width',
37-
'max-width',
38-
'min-width',
39-
'height',
40-
'max-height',
41-
'min-height',
42-
],
43-
},
44-
],
19+
'scss/load-partial-extension': ['always'],
4520
},
4621
}

0 commit comments

Comments
 (0)