From e060728c3e98e108951c46e72d4cd3657237e648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Dec 2025 07:05:10 +0000 Subject: [PATCH 1/5] Bump kotlin from 2.2.21 to 2.3.0 Bumps `kotlin` from 2.2.21 to 2.3.0. Updates `org.jetbrains.kotlin.js` from 2.2.21 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.21...v2.3.0) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.2.21 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.21...v2.3.0) Updates `org.jetbrains.kotlin.plugin.compose` from 2.2.21 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.2.21...v2.3.0) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.js dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.compose dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f664330..343f8eb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.2.21" +kotlin = "2.3.0" compose = "1.9.0" coroutines = "1.10.2" xml = "0.91.3" From 555c2e0e42b8ebe6931b6985c4bc475bbee5de2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Nov 2025 08:02:10 +0100 Subject: [PATCH 2/5] Bump compose from 1.9.0 to 1.9.3 Bumps `compose` from 1.9.0 to 1.9.3. Updates `org.jetbrains.compose.runtime:runtime` from 1.9.0 to 1.9.3 - [Release notes](https://github.com/JetBrains/compose-jb/releases) - [Changelog](https://github.com/JetBrains/compose-multiplatform/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/compose-jb/compare/v1.9.0...v1.9.3) Updates `org.jetbrains.compose.html:html-core` from 1.9.0 to 1.9.3 - [Release notes](https://github.com/JetBrains/compose-jb/releases) - [Changelog](https://github.com/JetBrains/compose-multiplatform/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/compose-jb/compare/v1.9.0...v1.9.3) Updates `org.jetbrains.compose.html:html-svg` from 1.9.0 to 1.9.3 - [Release notes](https://github.com/JetBrains/compose-jb/releases) - [Changelog](https://github.com/JetBrains/compose-multiplatform/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/compose-jb/compare/v1.9.0...v1.9.3) Updates `org.jetbrains.compose.html:html-test-utils` from 1.9.0 to 1.9.3 - [Release notes](https://github.com/JetBrains/compose-jb/releases) - [Changelog](https://github.com/JetBrains/compose-multiplatform/blob/master/CHANGELOG.md) - [Commits](https://github.com/JetBrains/compose-jb/compare/v1.9.0...v1.9.3) --- updated-dependencies: - dependency-name: org.jetbrains.compose.runtime:runtime dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.compose.html:html-core dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.compose.html:html-svg dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.compose.html:html-test-utils dependency-version: 1.9.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 343f8eb..0c6941f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlin = "2.3.0" -compose = "1.9.0" +compose = "1.9.3" coroutines = "1.10.2" xml = "0.91.3" From 41ffc6bafdccb126ccc23bb43dd42c3f44ffc33f Mon Sep 17 00:00:00 2001 From: hfhbd <22521688+hfhbd@users.noreply.github.com> Date: Fri, 9 Jan 2026 12:26:57 +0100 Subject: [PATCH 3/5] Update build --- .github/workflows/CD.yml | 4 + .github/workflows/dependencies.yml | 4 +- .../app/softwork/bootstrapcompose/Alerts.kt | 2 - .../softwork/bootstrapcompose/Autocomplete.kt | 1 - .../app/softwork/bootstrapcompose/Badge.kt | 1 - .../app/softwork/bootstrapcompose/Box.kt | 1 - .../app/softwork/bootstrapcompose/Brand.kt | 1 - .../app/softwork/bootstrapcompose/Button.kt | 2 - .../softwork/bootstrapcompose/ButtonGroup.kt | 1 - .../app/softwork/bootstrapcompose/Card.kt | 1 - .../app/softwork/bootstrapcompose/Checkbox.kt | 1 - .../softwork/bootstrapcompose/CloseButton.kt | 1 - .../app/softwork/bootstrapcompose/Collapse.kt | 1 - .../app/softwork/bootstrapcompose/Column.kt | 1 - .../softwork/bootstrapcompose/Container.kt | 1 - .../app/softwork/bootstrapcompose/DropDown.kt | 3 - .../softwork/bootstrapcompose/FormFloating.kt | 1 - .../softwork/bootstrapcompose/FormLabel.kt | 1 - .../app/softwork/bootstrapcompose/GridBox.kt | 1 - .../app/softwork/bootstrapcompose/Icon.kt | 1 - .../app/softwork/bootstrapcompose/Input.kt | 1 - .../softwork/bootstrapcompose/InputGroup.kt | 24 ------ .../softwork/bootstrapcompose/ListGroup.kt | 5 -- .../app/softwork/bootstrapcompose/Modal.kt | 1 - .../app/softwork/bootstrapcompose/Navbar.kt | 4 - .../softwork/bootstrapcompose/OffCanvas.kt | 1 - .../softwork/bootstrapcompose/Pagination.kt | 3 - .../app/softwork/bootstrapcompose/Radio.kt | 1 - .../app/softwork/bootstrapcompose/Range.kt | 1 - .../app/softwork/bootstrapcompose/Row.kt | 1 - .../app/softwork/bootstrapcompose/Select.kt | 2 - .../app/softwork/bootstrapcompose/Table.kt | 1 - .../app/softwork/bootstrapcompose/Toasts.kt | 1 - .../app/softwork/bootstrapcompose/Toggler.kt | 1 - .../app/softwork/bootstrapcompose/scss.kt | 5 -- gradle/build-logic/build.gradle.kts | 2 + gradle/build-logic/settings.gradle.kts | 1 + .../main/kotlin/MyRepos.settings.gradle.kts | 4 + .../main/kotlin/publishedLibrary.gradle.kts | 14 ++-- .../src/main/kotlin/setup.gradle.kts | 8 +- gradle/libs.versions.toml | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- kotlin-js-store/package-lock.json | 82 ++++++++++--------- settings.gradle.dcl | 1 - showcase/build.gradle.kts | 7 +- .../showcase/InputGroupView.kt | 2 +- 46 files changed, 73 insertions(+), 136 deletions(-) delete mode 100644 bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 7ca84a8..0515b71 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -12,6 +12,10 @@ jobs: build: runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + environment: name: MavenCentral diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 271ebd6..5084e68 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -19,7 +19,9 @@ jobs: - uses: gradle/actions/dependency-submission@v5 dependency-review: - runs-on: ubuntu-latest + runs-on: ubuntu-slim + permissions: {} + needs: dependency-submission if: github.event_name == 'pull_request' steps: diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt index ec7fb90..1abe287 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt @@ -12,7 +12,6 @@ public fun Alert( attrs: AttrBuilderContext? = null, content: @Composable () -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -39,7 +38,6 @@ public fun Link( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt index 947e741..e61cda8 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt @@ -60,7 +60,6 @@ public fun Autocomplete( Div( attrs = { - Style classes("dropdown-menu") if (itemsVisible) { classes("d-block") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt index 107b2ad..94f36af 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt @@ -13,7 +13,6 @@ public fun Badge( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt index 28ec8f3..e559ba5 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt @@ -10,7 +10,6 @@ public fun Box( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt index cf49a26..90ee9ec 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt @@ -10,7 +10,6 @@ public fun Brand( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt index a63f1b5..5fb8f6b 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt @@ -17,7 +17,6 @@ public fun Button( attrs: AttrBuilderContext? = null, action: () -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -63,7 +62,6 @@ public fun Button( attrs: AttrBuilderContext? = null, action: () -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt index 47108cf..ace3157 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt @@ -9,7 +9,6 @@ public fun ButtonGroup( styling: (Styling.() -> Unit)? = null, content: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt index 25bc629..3157426 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt @@ -15,7 +15,6 @@ public fun Card( bodyAttrs: AttrBuilderContext? = null, body: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt index 77b5a0c..836971f 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt @@ -19,7 +19,6 @@ public fun Checkbox( attrs: (InputAttrsScope.() -> Unit)? = null, onClick: (Boolean) -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt index 27f4804..edbbcfe 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt @@ -9,7 +9,6 @@ public fun CloseButton( disabled: Boolean = false, onClose: () -> Unit ) { - Style Button({ type(ButtonType.Button) classes("btn-close") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt index ccf433c..231a880 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt @@ -16,7 +16,6 @@ public fun Collapse( contentAttrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style Collapse Button(attrs = { classes("btn", "btn-$color") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt index ff50140..daa8752 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt @@ -13,7 +13,6 @@ public fun Column( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt index f44e71d..082a07c 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt @@ -12,7 +12,6 @@ public fun Container( attrs: AttrBuilderContext? = null, content: ContentBuilder? ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt index c33dfd8..9bc71b5 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt @@ -136,7 +136,6 @@ public fun DropDown( menuAlignment: DropDown.MenuAlignment = DropDown.MenuAlignment.Start, block: @Composable DropDownBuilder.() -> Unit ) { - Style DropDownJs popper val trigger = @Composable { classes: List? -> @@ -169,7 +168,6 @@ public fun NavbarDropDown( menuAlignment: DropDown.MenuAlignment = DropDown.MenuAlignment.Start, block: @Composable DropDownBuilder.() -> Unit ) { - Style DropDownJs val trigger = @Composable { classes: List? -> A( @@ -209,7 +207,6 @@ private fun DropDownBase( menuAlignment: DropDown.MenuAlignment, block: @Composable DropDownBuilder.() -> Unit ) { - Style DropDownJs val classes = styling?.let { Styling().apply(it).generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt index 8413454..bab230b 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt @@ -11,7 +11,6 @@ public fun FormFloating( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt index c78e5c3..393384c 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt @@ -11,7 +11,6 @@ public fun FormLabel( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt index df472ab..1e67c3e 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt @@ -13,7 +13,6 @@ public fun GridBox( attrs: AttrBuilderContext? = null, content: (@Composable GridContentBuilder.() -> Unit)? = null ) { - Style val style = GridStyle(styling) val classes = style.generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt index f046751..eea015e 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt @@ -14,7 +14,6 @@ public fun Icon( styling: (Styling.() -> Unit)? = null, attrsBuilder: AttrBuilderContext? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt index b27da04..b516abb 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt @@ -20,7 +20,6 @@ public fun Input( attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit ) { - Style Label(forId = null, attrs = { classes(labelClasses) }) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt index f2c1bd5..69ab312 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt @@ -16,7 +16,6 @@ public fun InputGroup( size: InputGroupSize = InputGroupSize.Default, content: @Composable InputGroupContext.() -> Unit ) { - Style val scope = InputGroupContext(inputId) Div( @@ -66,7 +65,6 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -89,7 +87,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -109,7 +106,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -129,7 +125,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -149,7 +144,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -167,7 +161,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -187,7 +180,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -209,7 +201,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -229,7 +220,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -249,7 +239,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -269,7 +258,6 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -289,7 +277,6 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -312,7 +299,6 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onInput: (SyntheticInputEvent) -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -344,7 +330,6 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -364,7 +349,6 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -384,7 +368,6 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -404,7 +387,6 @@ public class InputGroupContext(private val inputId: String) { onChange: (List) -> Unit, content: @Composable SelectContext.() -> Unit ) { - Style Select( disabled = disabled, id = inputId, @@ -425,7 +407,6 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -452,7 +433,6 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -480,7 +460,6 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, action: () -> Unit ) { - Style Button(title, color, size, false, type, disabled, styling, attrs, action) } @@ -492,7 +471,6 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, block: @Composable DropDownBuilder.() -> Unit ) { - Style DropDown(title, inputId, size, color, styling, block = block) } @@ -503,7 +481,6 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onClick: (Boolean) -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -531,7 +508,6 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onClick: (Boolean) -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt index 1080af4..1af7fb7 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt @@ -13,7 +13,6 @@ public fun ListGroup( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -37,7 +36,6 @@ public fun NumberedListGroup( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -82,7 +80,6 @@ public fun ListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -105,7 +102,6 @@ public fun AnchorListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -131,7 +127,6 @@ public fun ButtonListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt index 6593deb..a83a7a8 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt @@ -18,7 +18,6 @@ public fun Modal( footer: ContentBuilder? = null, content: ContentBuilder ) { - Style ModalJs val classes = styling?.let { Styling().apply(it).generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt index b51f29a..5eee366 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt @@ -29,7 +29,6 @@ public fun Navbar( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -157,7 +156,6 @@ public fun NavbarCollapse( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style Div(attrs = { classes(BSClasses.collapse, BSClasses.navbarCollapse) id(id) @@ -173,7 +171,6 @@ public fun NavbarNav( attrs: AttrBuilderContext? = null, links: ContentBuilder? = null ) { - Style Div(attrs = { classes(BSClasses.navbarNav) attrs?.invoke(this) @@ -191,7 +188,6 @@ public fun NavbarLink( link: String? = null, content: ContentBuilder? = null ) { - Style A(attrs = { classes(BSClasses.navLink) if (active) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt index 4ffab17..3b20a20 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt @@ -62,7 +62,6 @@ public fun Offcanvas( showHeaderCloseButton: Boolean = true, bodyContent: ContentBuilder? = null ) { - Style OffcanvasJs Div(attrs = { if (breakpoint == null) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt index f534b08..d25721e 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt @@ -12,7 +12,6 @@ public fun Pagination( attrs: AttrBuilderContext? = null, content: @Composable PaginationScope.() -> Unit ) { - Style val style = styling?.let { Styling().apply(it).generate() } @@ -38,7 +37,6 @@ public enum class PaginationSize(private val classes: String) { public class PaginationScope { @Composable public fun PageItem(active: Boolean = false, disabled: Boolean = false, content: ContentBuilder) { - Style Li(attrs = { classes("page-item") if (active) { @@ -54,7 +52,6 @@ public class PaginationScope { @Composable public fun PageLink(title: String, onClick: () -> Unit) { - Style A(attrs = { classes("page-link") onClick { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt index daaa423..4270c18 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt @@ -26,7 +26,6 @@ public class RadioGroupScope(private val name: String) { ) { val id = remember { "_${Uuid.random()}" } - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt index cf071bb..1e79573 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt @@ -20,7 +20,6 @@ public fun Range( attrs: AttrBuilderContext? = null, onInput: (SyntheticInputEvent) -> Unit, ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt index 09cddd4..f418dc1 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt @@ -10,7 +10,6 @@ public fun Row( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { - Style val classes = styling?.let { RowStyling(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt index 565b7b4..a5916fd 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt @@ -20,7 +20,6 @@ public fun Select( onChange: (List) -> Unit, content: @Composable SelectContext.() -> Unit ) { - Style val classes = styling?.let { Styling().apply(it).generate() } @@ -74,7 +73,6 @@ public class SelectContext { attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt index 7520cb5..d9dbd92 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt @@ -307,7 +307,6 @@ public fun Table( attrs: AttrBuilderContext? = null, map: Table.Builder.(Int, T) -> Unit ) { - Style val headers = mutableMapOf() val _footers = mutableListOf() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt index 27951bc..b6eb526 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt @@ -28,7 +28,6 @@ public fun ToastContainer( @Composable private fun Toast(message: ToastContainerState.ToastItem) { - Style ToastJs Div( attrs = { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt index 9dead62..c63178e 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt @@ -11,7 +11,6 @@ public fun Toggler( styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { - Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt deleted file mode 100644 index 8b56b32..0000000 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt +++ /dev/null @@ -1,5 +0,0 @@ -package app.softwork.bootstrapcompose - -@JsModule("bootstrap/scss/bootstrap.scss") -@JsNonModule -internal external val Style: dynamic diff --git a/gradle/build-logic/build.gradle.kts b/gradle/build-logic/build.gradle.kts index f87034b..616b661 100644 --- a/gradle/build-logic/build.gradle.kts +++ b/gradle/build-logic/build.gradle.kts @@ -9,6 +9,8 @@ dependencies { implementation(libs.plugins.licensee.toDep()) implementation(libs.plugins.detekt.toDep()) implementation(libs.plugins.mavencentral.toDep()) + implementation(libs.plugins.sigstore.toDep()) + implementation(libs.plugins.foojay.toDep()) implementation(libs.serialization.xml) { exclude("io.github.pdvrieze.xmlutil", "core") } diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts index 99a9a62..fe24033 100644 --- a/gradle/build-logic/settings.gradle.kts +++ b/gradle/build-logic/settings.gradle.kts @@ -2,6 +2,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenCentral() + gradlePluginPortal() } versionCatalogs.register("libs") { from(files("../libs.versions.toml")) diff --git a/gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts b/gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts index 223f94f..2adbffd 100644 --- a/gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts +++ b/gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") +} + dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { diff --git a/gradle/build-logic/src/main/kotlin/publishedLibrary.gradle.kts b/gradle/build-logic/src/main/kotlin/publishedLibrary.gradle.kts index b0e97fb..a1e3082 100644 --- a/gradle/build-logic/src/main/kotlin/publishedLibrary.gradle.kts +++ b/gradle/build-logic/src/main/kotlin/publishedLibrary.gradle.kts @@ -1,12 +1,11 @@ import org.gradle.api.publish.maven.* -import org.gradle.kotlin.dsl.* -import java.util.* plugins { id("setup") id("maven-publish") id("signing") id("io.github.hfhbd.mavencentral") + id("dev.sigstore.sign") } kotlin { @@ -55,11 +54,12 @@ publishing { } signing { - val signingKey = providers.gradleProperty("SIGNING_PRIVATE_KEY") - if (signingKey.isPresent) { - useInMemoryPgpKeys(signingKey.get(), providers.gradleProperty("SIGNING_PASSWORD").get()) - sign(publishing.publications) - } + useInMemoryPgpKeys( + project.providers.gradleProperty("signingKey").orNull, + project.providers.gradleProperty("signingPassword").orNull, + ) + isRequired = project.providers.gradleProperty("signingKey").isPresent + sign(publishing.publications) } // https://youtrack.jetbrains.com/issue/KT-46466 diff --git a/gradle/build-logic/src/main/kotlin/setup.gradle.kts b/gradle/build-logic/src/main/kotlin/setup.gradle.kts index cef66b9..70b2af4 100644 --- a/gradle/build-logic/src/main/kotlin/setup.gradle.kts +++ b/gradle/build-logic/src/main/kotlin/setup.gradle.kts @@ -6,14 +6,8 @@ plugins { kotlin { js { + browser() useEsModules() - browser { - commonWebpackConfig { - scssSupport { - enabled.set(true) - } - } - } compilerOptions { target.set("es2015") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c6941f..2d89d21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,3 +23,5 @@ kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.re licensee = { id = "app.cash.licensee", version = "1.14.1" } detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" } mavencentral = { id = "io.github.hfhbd.mavencentral", version = "0.0.23" } +foojay = { id = "org.gradle.toolchains.foojay-resolver-convention", version = "1.0.0" } +sigstore = { id = "dev.sigstore.sign", version = "2.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3620aed..8a84887 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=2fdde961d051e8fc4c9918aa40d3eee24fd9f1d32f705f517af9c89d758af3be -distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-rc-1-bin.zip +distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/kotlin-js-store/package-lock.json b/kotlin-js-store/package-lock.json index b1edf17..219028c 100644 --- a/kotlin-js-store/package-lock.json +++ b/kotlin-js-store/package-lock.json @@ -14,7 +14,7 @@ "packages/bootstrap-compose-bootstrap-compose-icons-test", "packages/bootstrap-compose-showcase", "packages/bootstrap-compose-showcase-test", - "packages_imported/html-core-js/1.9.0" + "packages_imported/html-core-js/1.9.3" ], "devDependencies": {} }, @@ -2744,7 +2744,7 @@ } }, "node_modules/html-core-js": { - "resolved": "packages_imported/html-core-js/1.9.0", + "resolved": "packages_imported/html-core-js/1.9.3", "link": true }, "node_modules/http-deceiver": { @@ -3192,9 +3192,9 @@ }, "node_modules/karma": { "version": "6.4.4", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.4.tgz", - "integrity": "sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==", + "resolved": "git+ssh://git@github.com/Kotlin/karma.git#239a8fc984584f0d96b1dd750e7a5e2c79da93a6", "dev": true, + "license": "MIT", "dependencies": { "@colors/colors": "1.5.0", "body-parser": "^1.19.0", @@ -3306,10 +3306,11 @@ } }, "node_modules/kotlin-web-helpers": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz", - "integrity": "sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz", + "integrity": "sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "format-util": "^1.0.5" } @@ -3570,10 +3571,11 @@ } }, "node_modules/mocha": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz", - "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==", + "version": "11.7.2", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.2.tgz", + "integrity": "sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==", "dev": true, + "license": "MIT", "dependencies": { "browser-stdout": "^1.3.1", "chokidar": "^4.0.1", @@ -4484,10 +4486,11 @@ "dev": true }, "node_modules/sass": { - "version": "1.89.2", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.2.tgz", - "integrity": "sha512-xCmtksBKd/jdJ9Bt9p7nPKiuqrlBMBuuGkQlkhZjjQk3Ty48lv93k5Dq6OPkKt4XwxDJ7tvlfrTa1MPA9bf+QA==", + "version": "1.92.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.92.0.tgz", + "integrity": "sha512-KDNI0BxgIRDAfJgzNm5wuy+4yOCIZyrUbjSpiU/JItfih+KGXAVefKL53MTml054MmBA3DDKIBMSI/7XLxZJ3A==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -5612,10 +5615,11 @@ } }, "node_modules/webpack": { - "version": "5.100.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.100.2.tgz", - "integrity": "sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==", + "version": "5.101.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz", + "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==", "dev": true, + "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", @@ -5627,7 +5631,7 @@ "acorn-import-phases": "^1.0.3", "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.17.2", + "enhanced-resolve": "^5.17.3", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -6078,6 +6082,12 @@ "packages_imported/html-core-js/1.9.0": { "name": "html-core-js", "version": "1.9.0", + "extraneous": true, + "devDependencies": {} + }, + "packages_imported/html-core-js/1.9.3": { + "name": "html-core-js", + "version": "1.9.3", "devDependencies": {} }, "packages/bootstrap-compose-bootstrap-compose": { @@ -6098,19 +6108,15 @@ "version": "0.0.0-unspecified", "devDependencies": { "bootstrap-icons": "1.13.1", - "css-loader": "7.1.2", - "karma": "6.4.4", + "karma": "github:Kotlin/karma#6.4.5", "karma-chrome-launcher": "3.2.0", "karma-mocha": "2.0.1", "karma-sourcemap-loader": "0.4.0", "karma-webpack": "5.0.1", - "kotlin-web-helpers": "2.1.0", - "mocha": "11.7.1", - "sass": "1.89.2", - "sass-loader": "16.0.5", + "kotlin-web-helpers": "3.0.0", + "mocha": "11.7.2", "source-map-loader": "5.0.0", - "style-loader": "4.0.0", - "webpack": "5.100.2", + "webpack": "5.101.3", "webpack-cli": "6.0.1" } }, @@ -6121,19 +6127,15 @@ "bootstrap": "5.3.8" }, "devDependencies": { - "css-loader": "7.1.2", - "karma": "6.4.4", + "karma": "github:Kotlin/karma#6.4.5", "karma-chrome-launcher": "3.2.0", "karma-mocha": "2.0.1", "karma-sourcemap-loader": "0.4.0", "karma-webpack": "5.0.1", - "kotlin-web-helpers": "2.1.0", - "mocha": "11.7.1", - "sass": "1.89.2", - "sass-loader": "16.0.5", + "kotlin-web-helpers": "3.0.0", + "mocha": "11.7.2", "source-map-loader": "5.0.0", - "style-loader": "4.0.0", - "webpack": "5.100.2", + "webpack": "5.101.3", "webpack-cli": "6.0.1" } }, @@ -6144,9 +6146,9 @@ "bootstrap": "5.3.8" }, "devDependencies": { - "kotlin-web-helpers": "2.1.0", + "kotlin-web-helpers": "3.0.0", "source-map-loader": "5.0.0", - "webpack": "5.100.2", + "webpack": "5.101.3", "webpack-cli": "6.0.1", "webpack-dev-server": "5.2.2" } @@ -6159,18 +6161,18 @@ }, "devDependencies": { "css-loader": "7.1.2", - "karma": "6.4.4", + "karma": "github:Kotlin/karma#6.4.5", "karma-chrome-launcher": "3.2.0", "karma-mocha": "2.0.1", "karma-sourcemap-loader": "0.4.0", "karma-webpack": "5.0.1", - "kotlin-web-helpers": "2.1.0", - "mocha": "11.7.1", - "sass": "1.89.2", + "kotlin-web-helpers": "3.0.0", + "mocha": "11.7.2", + "sass": "1.92.0", "sass-loader": "16.0.5", "source-map-loader": "5.0.0", "style-loader": "4.0.0", - "webpack": "5.100.2", + "webpack": "5.101.3", "webpack-cli": "6.0.1" } } diff --git a/settings.gradle.dcl b/settings.gradle.dcl index 2198bd5..b66011b 100644 --- a/settings.gradle.dcl +++ b/settings.gradle.dcl @@ -8,7 +8,6 @@ pluginManagement { plugins { id("MyRepos") - id("org.gradle.toolchains.foojay-resolver-convention").version("1.0.0") } enableFeaturePreview("STABLE_CONFIGURATION_CACHE") diff --git a/showcase/build.gradle.kts b/showcase/build.gradle.kts index d6ecb1d..8d2da5a 100644 --- a/showcase/build.gradle.kts +++ b/showcase/build.gradle.kts @@ -6,9 +6,10 @@ kotlin { js { browser { binaries.executable() - useEsModules() - compilerOptions { - target.set("es2015") + commonWebpackConfig { + scssSupport { + enabled.set(true) + } } } } diff --git a/showcase/src/jsMain/kotlin/app/softwork/bootstrapcompose/showcase/InputGroupView.kt b/showcase/src/jsMain/kotlin/app/softwork/bootstrapcompose/showcase/InputGroupView.kt index 4409b0d..1a8cc28 100644 --- a/showcase/src/jsMain/kotlin/app/softwork/bootstrapcompose/showcase/InputGroupView.kt +++ b/showcase/src/jsMain/kotlin/app/softwork/bootstrapcompose/showcase/InputGroupView.kt @@ -404,7 +404,7 @@ private fun CustomFileInputView() { attrs = { classes("btn-outline-secondary") } ) { upload!!.value = "" - upload!!.click() + upload.click() } } } From 68a727ed2b9a987413e4ae816abbfe6cf01e9148 Mon Sep 17 00:00:00 2001 From: hfhbd <22521688+hfhbd@users.noreply.github.com> Date: Fri, 9 Jan 2026 13:44:26 +0100 Subject: [PATCH 4/5] Revert scss --- .../app/softwork/bootstrapcompose/Alerts.kt | 2 ++ .../softwork/bootstrapcompose/Autocomplete.kt | 1 + .../app/softwork/bootstrapcompose/Badge.kt | 1 + .../app/softwork/bootstrapcompose/Box.kt | 1 + .../app/softwork/bootstrapcompose/Brand.kt | 1 + .../app/softwork/bootstrapcompose/Button.kt | 2 ++ .../softwork/bootstrapcompose/ButtonGroup.kt | 1 + .../app/softwork/bootstrapcompose/Card.kt | 1 + .../app/softwork/bootstrapcompose/Checkbox.kt | 1 + .../softwork/bootstrapcompose/CloseButton.kt | 1 + .../app/softwork/bootstrapcompose/Collapse.kt | 1 + .../app/softwork/bootstrapcompose/Column.kt | 1 + .../softwork/bootstrapcompose/Container.kt | 1 + .../app/softwork/bootstrapcompose/DropDown.kt | 3 +++ .../softwork/bootstrapcompose/FormFloating.kt | 1 + .../softwork/bootstrapcompose/FormLabel.kt | 1 + .../app/softwork/bootstrapcompose/GridBox.kt | 1 + .../app/softwork/bootstrapcompose/Icon.kt | 1 + .../app/softwork/bootstrapcompose/Input.kt | 1 + .../softwork/bootstrapcompose/InputGroup.kt | 24 +++++++++++++++++++ .../softwork/bootstrapcompose/ListGroup.kt | 5 ++++ .../app/softwork/bootstrapcompose/Modal.kt | 1 + .../app/softwork/bootstrapcompose/Navbar.kt | 4 ++++ .../softwork/bootstrapcompose/OffCanvas.kt | 1 + .../softwork/bootstrapcompose/Pagination.kt | 3 +++ .../app/softwork/bootstrapcompose/Radio.kt | 1 + .../app/softwork/bootstrapcompose/Range.kt | 1 + .../app/softwork/bootstrapcompose/Row.kt | 1 + .../app/softwork/bootstrapcompose/Select.kt | 2 ++ .../app/softwork/bootstrapcompose/Table.kt | 1 + .../app/softwork/bootstrapcompose/Toasts.kt | 1 + .../app/softwork/bootstrapcompose/Toggler.kt | 1 + .../app/softwork/bootstrapcompose/scss.kt | 5 ++++ settings.gradle.dcl | 2 +- 34 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt index 1abe287..ec7fb90 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Alerts.kt @@ -12,6 +12,7 @@ public fun Alert( attrs: AttrBuilderContext? = null, content: @Composable () -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -38,6 +39,7 @@ public fun Link( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt index e61cda8..947e741 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Autocomplete.kt @@ -60,6 +60,7 @@ public fun Autocomplete( Div( attrs = { + Style classes("dropdown-menu") if (itemsVisible) { classes("d-block") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt index 94f36af..107b2ad 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Badge.kt @@ -13,6 +13,7 @@ public fun Badge( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt index e559ba5..28ec8f3 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Box.kt @@ -10,6 +10,7 @@ public fun Box( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt index 90ee9ec..cf49a26 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Brand.kt @@ -10,6 +10,7 @@ public fun Brand( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt index 5fb8f6b..a63f1b5 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Button.kt @@ -17,6 +17,7 @@ public fun Button( attrs: AttrBuilderContext? = null, action: () -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -62,6 +63,7 @@ public fun Button( attrs: AttrBuilderContext? = null, action: () -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt index ace3157..47108cf 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ButtonGroup.kt @@ -9,6 +9,7 @@ public fun ButtonGroup( styling: (Styling.() -> Unit)? = null, content: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt index 3157426..25bc629 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Card.kt @@ -15,6 +15,7 @@ public fun Card( bodyAttrs: AttrBuilderContext? = null, body: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt index 836971f..77b5a0c 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Checkbox.kt @@ -19,6 +19,7 @@ public fun Checkbox( attrs: (InputAttrsScope.() -> Unit)? = null, onClick: (Boolean) -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt index edbbcfe..27f4804 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/CloseButton.kt @@ -9,6 +9,7 @@ public fun CloseButton( disabled: Boolean = false, onClose: () -> Unit ) { + Style Button({ type(ButtonType.Button) classes("btn-close") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt index 231a880..ccf433c 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Collapse.kt @@ -16,6 +16,7 @@ public fun Collapse( contentAttrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style Collapse Button(attrs = { classes("btn", "btn-$color") diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt index daa8752..ff50140 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Column.kt @@ -13,6 +13,7 @@ public fun Column( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt index 082a07c..f44e71d 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Container.kt @@ -12,6 +12,7 @@ public fun Container( attrs: AttrBuilderContext? = null, content: ContentBuilder? ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt index 9bc71b5..c33dfd8 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/DropDown.kt @@ -136,6 +136,7 @@ public fun DropDown( menuAlignment: DropDown.MenuAlignment = DropDown.MenuAlignment.Start, block: @Composable DropDownBuilder.() -> Unit ) { + Style DropDownJs popper val trigger = @Composable { classes: List? -> @@ -168,6 +169,7 @@ public fun NavbarDropDown( menuAlignment: DropDown.MenuAlignment = DropDown.MenuAlignment.Start, block: @Composable DropDownBuilder.() -> Unit ) { + Style DropDownJs val trigger = @Composable { classes: List? -> A( @@ -207,6 +209,7 @@ private fun DropDownBase( menuAlignment: DropDown.MenuAlignment, block: @Composable DropDownBuilder.() -> Unit ) { + Style DropDownJs val classes = styling?.let { Styling().apply(it).generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt index bab230b..8413454 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormFloating.kt @@ -11,6 +11,7 @@ public fun FormFloating( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt index 393384c..c78e5c3 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/FormLabel.kt @@ -11,6 +11,7 @@ public fun FormLabel( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt index 1e67c3e..df472ab 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/GridBox.kt @@ -13,6 +13,7 @@ public fun GridBox( attrs: AttrBuilderContext? = null, content: (@Composable GridContentBuilder.() -> Unit)? = null ) { + Style val style = GridStyle(styling) val classes = style.generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt index eea015e..f046751 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Icon.kt @@ -14,6 +14,7 @@ public fun Icon( styling: (Styling.() -> Unit)? = null, attrsBuilder: AttrBuilderContext? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt index b516abb..b27da04 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Input.kt @@ -20,6 +20,7 @@ public fun Input( attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit ) { + Style Label(forId = null, attrs = { classes(labelClasses) }) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt index 69ab312..f2c1bd5 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/InputGroup.kt @@ -16,6 +16,7 @@ public fun InputGroup( size: InputGroupSize = InputGroupSize.Default, content: @Composable InputGroupContext.() -> Unit ) { + Style val scope = InputGroupContext(inputId) Div( @@ -65,6 +66,7 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -87,6 +89,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -106,6 +109,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -125,6 +129,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -144,6 +149,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -161,6 +167,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -180,6 +187,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -201,6 +209,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -220,6 +229,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -239,6 +249,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -258,6 +269,7 @@ public class InputGroupContext(private val inputId: String) { attrsBuilder: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -277,6 +289,7 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -299,6 +312,7 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onInput: (SyntheticInputEvent) -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -330,6 +344,7 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -349,6 +364,7 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -368,6 +384,7 @@ public class InputGroupContext(private val inputId: String) { attrs: (InputAttrsScope.() -> Unit)? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -387,6 +404,7 @@ public class InputGroupContext(private val inputId: String) { onChange: (List) -> Unit, content: @Composable SelectContext.() -> Unit ) { + Style Select( disabled = disabled, id = inputId, @@ -407,6 +425,7 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -433,6 +452,7 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -460,6 +480,7 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, action: () -> Unit ) { + Style Button(title, color, size, false, type, disabled, styling, attrs, action) } @@ -471,6 +492,7 @@ public class InputGroupContext(private val inputId: String) { styling: (Styling.() -> Unit)? = null, block: @Composable DropDownBuilder.() -> Unit ) { + Style DropDown(title, inputId, size, color, styling, block = block) } @@ -481,6 +503,7 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onClick: (Boolean) -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -508,6 +531,7 @@ public class InputGroupContext(private val inputId: String) { attrs: AttrBuilderContext? = null, onClick: (Boolean) -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt index 1af7fb7..1080af4 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/ListGroup.kt @@ -13,6 +13,7 @@ public fun ListGroup( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -36,6 +37,7 @@ public fun NumberedListGroup( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -80,6 +82,7 @@ public fun ListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -102,6 +105,7 @@ public fun AnchorListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -127,6 +131,7 @@ public fun ButtonListItem( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt index a83a7a8..6593deb 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Modal.kt @@ -18,6 +18,7 @@ public fun Modal( footer: ContentBuilder? = null, content: ContentBuilder ) { + Style ModalJs val classes = styling?.let { Styling().apply(it).generate() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt index 5eee366..b51f29a 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Navbar.kt @@ -29,6 +29,7 @@ public fun Navbar( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -156,6 +157,7 @@ public fun NavbarCollapse( attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style Div(attrs = { classes(BSClasses.collapse, BSClasses.navbarCollapse) id(id) @@ -171,6 +173,7 @@ public fun NavbarNav( attrs: AttrBuilderContext? = null, links: ContentBuilder? = null ) { + Style Div(attrs = { classes(BSClasses.navbarNav) attrs?.invoke(this) @@ -188,6 +191,7 @@ public fun NavbarLink( link: String? = null, content: ContentBuilder? = null ) { + Style A(attrs = { classes(BSClasses.navLink) if (active) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt index 3b20a20..4ffab17 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/OffCanvas.kt @@ -62,6 +62,7 @@ public fun Offcanvas( showHeaderCloseButton: Boolean = true, bodyContent: ContentBuilder? = null ) { + Style OffcanvasJs Div(attrs = { if (breakpoint == null) { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt index d25721e..f534b08 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Pagination.kt @@ -12,6 +12,7 @@ public fun Pagination( attrs: AttrBuilderContext? = null, content: @Composable PaginationScope.() -> Unit ) { + Style val style = styling?.let { Styling().apply(it).generate() } @@ -37,6 +38,7 @@ public enum class PaginationSize(private val classes: String) { public class PaginationScope { @Composable public fun PageItem(active: Boolean = false, disabled: Boolean = false, content: ContentBuilder) { + Style Li(attrs = { classes("page-item") if (active) { @@ -52,6 +54,7 @@ public class PaginationScope { @Composable public fun PageLink(title: String, onClick: () -> Unit) { + Style A(attrs = { classes("page-link") onClick { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt index 4270c18..daaa423 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Radio.kt @@ -26,6 +26,7 @@ public class RadioGroupScope(private val name: String) { ) { val id = remember { "_${Uuid.random()}" } + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt index 1e79573..cf071bb 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Range.kt @@ -20,6 +20,7 @@ public fun Range( attrs: AttrBuilderContext? = null, onInput: (SyntheticInputEvent) -> Unit, ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt index f418dc1..09cddd4 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Row.kt @@ -10,6 +10,7 @@ public fun Row( attrs: AttrBuilderContext? = null, content: ContentBuilder ) { + Style val classes = styling?.let { RowStyling(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt index a5916fd..565b7b4 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Select.kt @@ -20,6 +20,7 @@ public fun Select( onChange: (List) -> Unit, content: @Composable SelectContext.() -> Unit ) { + Style val classes = styling?.let { Styling().apply(it).generate() } @@ -73,6 +74,7 @@ public class SelectContext { attrs: AttrBuilderContext? = null, content: ContentBuilder? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt index d9dbd92..7520cb5 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Table.kt @@ -307,6 +307,7 @@ public fun Table( attrs: AttrBuilderContext? = null, map: Table.Builder.(Int, T) -> Unit ) { + Style val headers = mutableMapOf() val _footers = mutableListOf() diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt index b6eb526..27951bc 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toasts.kt @@ -28,6 +28,7 @@ public fun ToastContainer( @Composable private fun Toast(message: ToastContainerState.ToastItem) { + Style ToastJs Div( attrs = { diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt index c63178e..9dead62 100644 --- a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/Toggler.kt @@ -11,6 +11,7 @@ public fun Toggler( styling: (Styling.() -> Unit)? = null, attrs: AttrBuilderContext? = null ) { + Style val classes = styling?.let { Styling().apply(it).generate() } diff --git a/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt new file mode 100644 index 0000000..8b56b32 --- /dev/null +++ b/bootstrap-compose/src/jsMain/kotlin/app/softwork/bootstrapcompose/scss.kt @@ -0,0 +1,5 @@ +package app.softwork.bootstrapcompose + +@JsModule("bootstrap/scss/bootstrap.scss") +@JsNonModule +internal external val Style: dynamic diff --git a/settings.gradle.dcl b/settings.gradle.dcl index b66011b..38f00ab 100644 --- a/settings.gradle.dcl +++ b/settings.gradle.dcl @@ -12,7 +12,7 @@ plugins { enableFeaturePreview("STABLE_CONFIGURATION_CACHE") -rootProject.name = "bootstrap-compose" +rootProject.name = "bootstrap" include(":bootstrap-compose") include(":bootstrap-compose-icons") From b5caefaa9cf421943e1da071f9bcb3bd17d5063b Mon Sep 17 00:00:00 2001 From: hfhbd <22521688+hfhbd@users.noreply.github.com> Date: Fri, 9 Jan 2026 13:46:37 +0100 Subject: [PATCH 5/5] Revert scss --- settings.gradle.dcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.dcl b/settings.gradle.dcl index 38f00ab..b66011b 100644 --- a/settings.gradle.dcl +++ b/settings.gradle.dcl @@ -12,7 +12,7 @@ plugins { enableFeaturePreview("STABLE_CONFIGURATION_CACHE") -rootProject.name = "bootstrap" +rootProject.name = "bootstrap-compose" include(":bootstrap-compose") include(":bootstrap-compose-icons")