Skip to content

chore(dev-deps): bump @nextcloud/stylelint-config from 3.0.1 to 3.1.0 and fix errors #6955

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.

Sign up for GitHub

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

Merged
susnux merged 7 commits into from
May 26, 2025
Merged

chore(dev-deps): bump @nextcloud/stylelint-config from 3.0.1 to 3.1.0 and fix errors #6955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c6a664
chore(package.json): remove duplicated scripts
ShGKme May 22, 2025
9185947
chore(dev-deps): bump @nextcloud/stylelint-config from 3.0.1 to 3.1.0
ShGKme May 26, 2025
3e00ceb
chore(stylelint): remove stylelintignore
ShGKme May 22, 2025
ebab5bc
chore(stylelint): remove stylelint-use-logical - added in upstream
ShGKme May 22, 2025
6e01853
chore: replace deprecated `word-break: break-word` with `overflow-wra…
ShGKme May 26, 2025
3f7e933
chore(stylelint): require extension
ShGKme May 26, 2025
f4abbca
chore: adjust package.json scripts
susnux May 26, 2025
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
4 changes: 0 additions & 4 deletions .stylelintignore
View file
Open in desktop

This file was deleted.

97 changes: 62 additions & 35 deletions package-lock.json
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@
"test:component:gui": "playwright test --ui -c playwright.config.ts",
"test:coverage": "vitest run --coverage",
"ts:check": "vue-tsc --noEmit",
"update:snapshots": "npm run test:component -- --grep @visual --update-snapshots",
"watch": "npm run dev:watch"
"update:snapshots": "npm run test:component -- --grep @visual --update-snapshots"
},
"browserslist": [
"extends @nextcloud/browserslist-config"
Expand Down Expand Up @@ -121,7 +120,7 @@
"@nextcloud/babel-config": "^1.2.0",
"@nextcloud/browserslist-config": "^3.0.1",
"@nextcloud/eslint-config": "^8.4.2",
"@nextcloud/stylelint-config": "^3.0.1",
"@nextcloud/stylelint-config": "^3.1.0",
"@nextcloud/vite-config": "^2.3.2",
"@nextcloud/webpack-vue-config": "github:nextcloud/webpack-vue-config#vue3",
"@playwright/experimental-ct-vue": "^1.51.1",
Expand All @@ -142,7 +141,6 @@
"resolve-url-loader": "^5.0.0",
"sass": "^1.86.1",
"stylelint": "^16.17.0",
"stylelint-use-logical": "^2.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.8.2",
"url-loader": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcHeaderMenu/header-menu__trigger.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
@use 'variables' as variables;
@use 'variables.scss' as variables;

.header-menu {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcRichContenteditable/NcRichContenteditable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ export default {
padding-inline: var(--contenteditable-inline-start-offset) var(--contenteditable-inline-end-offset);
cursor: text;
white-space: pre-wrap;
word-break: break-word;
overflow-wrap: break-word;
color: var(--color-main-text);
border: 2px solid var(--color-border-maxcontrast);
border-radius: var(--border-radius-large);
Expand Down
2 changes: 1 addition & 1 deletion src/components/NcRichText/NcRichText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ export default {

// Plain text styles
.rich-text--wrapper {
word-break: break-word;
overflow-wrap: break-word;
line-height: 1.5;

.rich-text--fallback, .rich-text-component {
Expand Down
27 changes: 1 addition & 26 deletions stylelint.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const stylelintConfig = require('@nextcloud/stylelint-config')

module.exports = {
extends: ['@nextcloud/stylelint-config'],
plugins: ['stylelint-use-logical'],
rules: {
// For CSS Modules
// If there will be more rules for CSS Modules - consider extending stylelint-config-css-modules
Expand All @@ -17,30 +16,6 @@ module.exports = {
ignorePseudoClasses: [...stylelintConfig.rules['selector-pseudo-class-no-unknown'][1].ignorePseudoClasses, 'global'],
},
],
'csstools/use-logical': [
'always',
{
severity: 'error',
// Only lint LTR-RTL properties for now
except: [
// Position properties
'top',
'bottom',
// Position properties with directional suffixes
/-top$/,
/-bottom$/,
// also for e.g. border-bottom-color
/-top-/,
/-bottom-/,
// Size properties
'width',
'max-width',
'min-width',
'height',
'max-height',
'min-height',
],
},
],
'scss/load-partial-extension': ['always'],

@susnux susnux May 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems to be unrelated?

@ShGKme ShGKme May 26, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

@susnux susnux May 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New rule not really "fix errors" ;)

@ShGKme ShGKme May 26, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the problem. I did not say it "fixes errors". Although it technically does - it decreases ammount error from 7 to 1.

As said in the note in the PR description, it is the opposite of what we had in the past. But in the past the rule (that was deprecated and replaced) worked differently - so we had mixed style.

I corrected the rule to the style we use in the repository de facto. If this is fine - we can addjust the rule in upstream as well.

If we actually want the opposite, we can remove the rule, and fix it the other way around.

There are 2 options - that why there was a question in the PR desription ;)

@susnux susnux May 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand the problem

Its not a problem but unexpected with the PR description.
I expected only fixing errors in code and adjusting the config for the updated deps, not new rules to be enforced ;)

},
}
Loading