Skip to content

Commit d02ae67

Browse files
authored
Merge branch 'develop' into 7487-fix-drawer-slot-style-v3
2 parents 4e6ab61 + f7d51f5 commit d02ae67

File tree

105 files changed

+2038
-563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2038
-563
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@
3737
"javascript.updateImportsOnFileMove.enabled": "always",
3838
"typescript.preferences.importModuleSpecifier": "relative",
3939
"typescript.updateImportsOnFileMove.enabled": "always",
40-
"html.customData": ["./node_modules/@public-ui/components/vscode-custom-data.json"]
40+
"html.customData": ["./node_modules/@public-ui/components/vscode-custom-data.json"],
41+
"stylelint.validate": ["css", "scss", "sass", "less"]
4142
}

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"prettier": "3.5.3",
1414
"rimraf": "6.0.1",
1515
"ts-node": "10.9.2",
16-
"ts-prune": "0.10.3",
1716
"typescript": "5.8.2"
1817
},
1918
"engines": {
@@ -27,9 +26,11 @@
2726
"clean:pnpm": "pnpm -r exec rimraf pnpm-lock.yaml && rimraf pnpm-lock.yaml && pnpm clean",
2827
"format": "pnpm -r format",
2928
"lint": "pnpm -r lint",
29+
"lint:eslint": "pnpm -r --no-bail lint:eslint",
30+
"lint:stylelint": "pnpm -r --no-bail lint:stylelint",
31+
"lint:tsc": "pnpm -r --no-bail lint:tsc",
3032
"lint-staged": "lint-staged",
3133
"unused": "pnpm -r unused",
32-
"ts-prune": "git clean -f -d -X packages/adapters/**/src && pnpm -r exec npx ts-prune src -e",
3334
"ncu:major": "ncu && pnpm -r exec ncu",
3435
"ncu:minor": "ncu -t minor -u && pnpm -r exec ncu -t minor -u -x @types/react,@stencil/core,@unocss/*",
3536
"ncu:patch": "ncu -t patch -u && pnpm -r exec ncu -t patch -u -x @types/react",

packages/.ts-prunerc.js

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/assets/
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"extends": ["stylelint-config-standard", "stylelint-config-recommended-scss"],
3+
"plugins": ["stylelint-scss"],
4+
"rules": {
5+
"block-no-empty": true,
6+
"color-no-invalid-hex": true,
7+
"custom-property-pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*(?:--[a-z0-9]+(?:-[a-z0-9]+)*)*$",
8+
"declaration-block-no-duplicate-properties": true,
9+
"declaration-property-value-no-unknown": null,
10+
"no-duplicate-selectors": true,
11+
"selector-class-pattern": "^[a-z0-9]+(?:-[a-z0-9]+)*(?:__(?:[a-z0-9]+(?:-[a-z0-9]+)*))?(?:--(?:[a-z0-9]+(?:-[a-z0-9]+)*))?$",
12+
13+
"scss/load-no-partial-leading-underscore": true,
14+
"scss/at-mixin-pattern": "^[a-z][a-z0-9-]*$",
15+
"scss/dollar-variable-pattern": "^[a-z][a-z0-9-]*$",
16+
17+
"comment-empty-line-before": null,
18+
"declaration-empty-line-before": null,
19+
"selector-pseudo-element-colon-notation": null,
20+
"color-function-notation": null,
21+
"alpha-value-notation": null,
22+
"value-keyword-case": null,
23+
"property-no-vendor-prefix": null,
24+
"rule-empty-line-before": null,
25+
"at-rule-empty-line-before": null,
26+
"media-feature-range-notation": null,
27+
"declaration-block-no-redundant-longhand-properties": null,
28+
"shorthand-property-no-redundant-values": null,
29+
"comment-whitespace-inside": null,
30+
"declaration-property-value-keyword-no-deprecated": null,
31+
"declaration-block-no-duplicate-properties": null,
32+
"no-descending-specificity": null,
33+
"no-duplicate-selectors": null,
34+
"font-family-no-missing-generic-family-keyword": null,
35+
"keyframes-name-pattern": null,
36+
"declaration-block-no-shorthand-property-overrides": null,
37+
"color-hex-length": null,
38+
"custom-property-empty-line-before": null,
39+
"scss/at-mixin-pattern": null,
40+
"scss/dollar-variable-pattern": null
41+
}
42+
}

packages/components/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,10 @@
6060
"clear": "rimraf -g dist doc loader www ../adapters/angular/v15/src ../adapters/angular/v16/src ../adapters/angular/v17/src ../adapters/angular/v18/src ../adapters/hydrate/dist ../adapters/react/src ../adapters/solid/src ../adapters/vaadin/*.java ../adapters/vue/src",
6161
"format": "prettier --check src",
6262
"lighthouse": "lighthouse --chrome-flags=\"--headless\" --output-path lighthouse.report.html --preset=desktop --quiet",
63-
"lint": "tsc --noemit && eslint src",
63+
"lint": "pnpm lint:eslint && pnpm lint:stylelint && pnpm lint:tsc",
64+
"lint:eslint": "eslint src",
65+
"lint:stylelint": "stylelint \"src/**/*.{css,scss}\"",
66+
"lint:tsc": "tsc --noemit",
6467
"dev": "cross-env NODE_ENV=development stencil build --prod --watch",
6568
"test": "pnpm test:unit",
6669
"test:unit": "cross-env NODE_ENV=test stencil test --spec --json --outputFile dist/jest-test-results.json",
@@ -123,6 +126,10 @@
123126
"pug": "3.0.3",
124127
"rimraf": "6.0.1",
125128
"stencil-awesome-test": "1.0.6",
129+
"stylelint": "16.17.0",
130+
"stylelint-config-recommended-scss": "14.1.0",
131+
"stylelint-config-standard": "37.0.0",
132+
"stylelint-scss": "6.11.1",
126133
"terser": "5.39.0",
127134
"twig": "1.17.1",
128135
"typescript": "5.8.2"

packages/components/src/components/@else/all/component.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ type States = Generic.Element.Members<RequiredStates, OptionalStates>;
1313
// @Component({
1414
// tag: 'kol-all',
1515
// })
16-
// ts-prune-ignore-next
1716
export class KolAll implements Generic.Element.ComponentApi<RequiredProps, OptionalProps, RequiredStates, OptionalStates> {
1817
@State() public state: States = {};
1918

packages/components/src/components/@else/counter/component.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { h, Host, State } from '@stencil/core';
1010
// },
1111
// shadow: true,
1212
// })
13-
// ts-prune-ignore-next
1413
export class KolCounter {
1514
@State() public state = {
1615
_count: 0,
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@use 'mixins' as *;
2+
3+
@mixin kol-popover-button-styles {
4+
@layer kol-component {
5+
.kol-popover-button {
6+
&__button {
7+
display: inline-block; // critical for floating UI to work correctly
8+
}
9+
10+
&__popover {
11+
border: 1px solid #000;
12+
margin: 0;
13+
padding: 0;
14+
}
15+
}
16+
}
17+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
@use './mixins' as *;
2+
3+
@mixin kol-table-settings-styles {
4+
@layer kol-component {
5+
.kol-table-settings {
6+
background: #fff;
7+
position: absolute;
8+
right: 0;
9+
top: 0;
10+
z-index: 1;
11+
12+
&__columns-container {
13+
margin-top: rem(16);
14+
max-height: rem(200);
15+
overflow: auto;
16+
}
17+
18+
&__columns {
19+
align-items: center;
20+
display: grid;
21+
gap: rem(8);
22+
grid-auto-rows: min-content;
23+
grid-template-columns: min-content 1fr rem(100) auto auto;
24+
overflow: hidden;
25+
}
26+
27+
&__column {
28+
display: contents;
29+
}
30+
}
31+
}
32+
}

0 commit comments

Comments
 (0)