migrate to kjs plugin

mpetuska · Jul 4, 2023 · e61eca6 · e61eca6
1 parent 0b2df55
commit e61eca6
Show file tree

Hide file tree

Showing 259 changed files with 3,067 additions and 42 deletions.
diff --git a/build-conventions/src/main/kotlin/convention.library-js.gradle.kts b/build-conventions/src/main/kotlin/convention.library-js.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
   id("convention.common")
-  kotlin("multiplatform")
+  kotlin("js")
   id("convention.dokka")
   id("convention.compose")
 }
 
 kotlin {
   explicitApi()
-  js(IR) {
+  js {
     useCommonJs()
     browser {
       commonWebpackConfig {
@@ -20,7 +20,7 @@ kotlin {
     }
     compilations["test"].defaultSourceSet {
       dependencies {
-        implementation(compose.html.testUtils)
+//        implementation(compose.html.testUtils)
         implementation(libs.kotlin.test)
         implementation(libs.kotest.assertions.core)
       }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -14,6 +14,9 @@ versions-update = "0.8.0"
 
 [libraries]
 compose-routing = "app.softwork:routing-compose:0.2.12"
+compose-html-core = { module = "org.jetbrains.compose.html:html-core", version.ref = "compose" }
+compose-html-svg = { module = "org.jetbrains.compose.html:html-svg", version.ref = "compose" }
+compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" }
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
 kotest-assertions-core = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
@@ -33,5 +36,6 @@ plugin-versions-update = { module = "nl.littlerobots.vcu:plugin", version.ref =
 [plugins]
 build-config = { id = "com.github.gmazzo.buildconfig", version.ref = "build-config" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
 versions-update = { id = "nl.littlerobots.version-catalog-update", version.ref = "versions-update" }
diff --git a/katalog/katalog-runtime/build.gradle.kts b/katalog/katalog-runtime/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.runtime)
-        api(compose.html.core)
+        api(libs.compose.runtime)
+        api(libs.compose.html.core)
         implementation(libs.compose.routing)
       }
     }

diff --git a/...untime/src/jsMain/kotlin/KatalogConfig.kt → ...-runtime/src/main/kotlin/KatalogConfig.kt b/...untime/src/jsMain/kotlin/KatalogConfig.kt → ...-runtime/src/main/kotlin/KatalogConfig.kt
diff --git a/...log-runtime/src/jsMain/kotlin/Showcase.kt → ...talog-runtime/src/main/kotlin/Showcase.kt b/...log-runtime/src/jsMain/kotlin/Showcase.kt → ...talog-runtime/src/main/kotlin/Showcase.kt
diff --git a/...og-runtime/src/jsMain/kotlin/UtilStyle.kt → ...alog-runtime/src/main/kotlin/UtilStyle.kt b/...og-runtime/src/jsMain/kotlin/UtilStyle.kt → ...alog-runtime/src/main/kotlin/UtilStyle.kt
diff --git a/...ntime/src/jsMain/kotlin/domain/Katalog.kt → ...runtime/src/main/kotlin/domain/Katalog.kt b/...ntime/src/jsMain/kotlin/domain/Katalog.kt → ...runtime/src/main/kotlin/domain/Katalog.kt
diff --git a/...time/src/jsMain/kotlin/domain/Showcase.kt → ...untime/src/main/kotlin/domain/Showcase.kt b/...time/src/jsMain/kotlin/domain/Showcase.kt → ...untime/src/main/kotlin/domain/Showcase.kt
diff --git a/...ntime/src/jsMain/kotlin/layout/Divider.kt → ...runtime/src/main/kotlin/layout/Divider.kt b/...ntime/src/jsMain/kotlin/layout/Divider.kt → ...runtime/src/main/kotlin/layout/Divider.kt
diff --git a/...Main/kotlin/layout/InteractiveShowcase.kt → ...main/kotlin/layout/InteractiveShowcase.kt b/...Main/kotlin/layout/InteractiveShowcase.kt → ...main/kotlin/layout/InteractiveShowcase.kt
diff --git a/...untime/src/jsMain/kotlin/renderKatalog.kt → ...-runtime/src/main/kotlin/renderKatalog.kt b/...untime/src/jsMain/kotlin/renderKatalog.kt → ...-runtime/src/main/kotlin/renderKatalog.kt
diff --git a/...e/src/jsMain/kotlin/theme/KatalogTheme.kt → ...ime/src/main/kotlin/theme/KatalogTheme.kt b/...e/src/jsMain/kotlin/theme/KatalogTheme.kt → ...ime/src/main/kotlin/theme/KatalogTheme.kt
diff --git a/...og-runtime/src/jsMain/kotlin/ui/Header.kt → ...alog-runtime/src/main/kotlin/ui/Header.kt b/...og-runtime/src/jsMain/kotlin/ui/Header.kt → ...alog-runtime/src/main/kotlin/ui/Header.kt
diff --git a/...g-runtime/src/jsMain/kotlin/ui/Katalog.kt → ...log-runtime/src/main/kotlin/ui/Katalog.kt b/...g-runtime/src/jsMain/kotlin/ui/Katalog.kt → ...log-runtime/src/main/kotlin/ui/Katalog.kt
diff --git a/...jsMain/kotlin/ui/KatalogThemeVariables.kt → ...c/main/kotlin/ui/KatalogThemeVariables.kt b/...jsMain/kotlin/ui/KatalogThemeVariables.kt → ...c/main/kotlin/ui/KatalogThemeVariables.kt
diff --git a/...ntime/src/jsMain/kotlin/ui/ShowcaseBox.kt → ...runtime/src/main/kotlin/ui/ShowcaseBox.kt b/...ntime/src/jsMain/kotlin/ui/ShowcaseBox.kt → ...runtime/src/main/kotlin/ui/ShowcaseBox.kt
diff --git a/...runtime/src/jsMain/kotlin/ui/Showcases.kt → ...g-runtime/src/main/kotlin/ui/Showcases.kt b/...runtime/src/jsMain/kotlin/ui/Showcases.kt → ...g-runtime/src/main/kotlin/ui/Showcases.kt
diff --git a/...log-runtime/src/jsMain/kotlin/util/css.kt → ...talog-runtime/src/main/kotlin/util/css.kt b/...log-runtime/src/jsMain/kotlin/util/css.kt → ...talog-runtime/src/main/kotlin/util/css.kt
diff --git a/...og-runtime/src/jsMain/kotlin/util/data.kt → ...alog-runtime/src/main/kotlin/util/data.kt b/...og-runtime/src/jsMain/kotlin/util/data.kt → ...alog-runtime/src/main/kotlin/util/data.kt
diff --git a/kmdc/build.gradle.kts b/kmdc/build.gradle.kts
@@ -7,7 +7,7 @@ description = "Compose Multiplatform Kotlin/JS wrappers for @material/material-c
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         subprojects.forEach(::api)
       }

diff --git a/kmdc/kmdc-banner/build.gradle.kts b/kmdc/kmdc-banner/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("button"))
       }

diff --git a/.../kmdc-banner/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-banner/src/main/kotlin/Actions.kt b/.../kmdc-banner/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-banner/src/main/kotlin/Actions.kt
diff --git a/.../kmdc-banner/src/jsMain/kotlin/Content.kt → kmdc/kmdc-banner/src/main/kotlin/Content.kt b/.../kmdc-banner/src/jsMain/kotlin/Content.kt → kmdc/kmdc-banner/src/main/kotlin/Content.kt
diff --git a/...mdc-banner/src/jsMain/kotlin/MDCBanner.kt → .../kmdc-banner/src/main/kotlin/MDCBanner.kt b/...mdc-banner/src/jsMain/kotlin/MDCBanner.kt → .../kmdc-banner/src/main/kotlin/MDCBanner.kt
diff --git a/.../kmdc-banner/src/jsMain/kotlin/_events.kt → kmdc/kmdc-banner/src/main/kotlin/_events.kt b/.../kmdc-banner/src/jsMain/kotlin/_events.kt → kmdc/kmdc-banner/src/main/kotlin/_events.kt
diff --git a/.../kmdc-banner/src/jsMain/kotlin/_module.kt → kmdc/kmdc-banner/src/main/kotlin/_module.kt b/.../kmdc-banner/src/jsMain/kotlin/_module.kt → kmdc/kmdc-banner/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-base/build.gradle.kts b/kmdc/kmdc-base/build.gradle.kts
@@ -8,10 +8,10 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.runtime)
-        api(compose.html.core)
+        api(libs.compose.runtime)
+        api(libs.compose.html.core)
       }
     }
   }

diff --git a/...mdc-base/src/jsMain/kotlin/MDCProvider.kt → .../kmdc-base/src/main/kotlin/MDCProvider.kt b/...mdc-base/src/jsMain/kotlin/MDCProvider.kt → .../kmdc-base/src/main/kotlin/MDCProvider.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/_module.kt → kmdc/kmdc-base/src/main/kotlin/_module.kt b/kmdc/kmdc-base/src/jsMain/kotlin/_module.kt → kmdc/kmdc-base/src/main/kotlin/_module.kt
diff --git a/...mdc-base/src/jsMain/kotlin/annotations.kt → .../kmdc-base/src/main/kotlin/annotations.kt b/...mdc-base/src/jsMain/kotlin/annotations.kt → .../kmdc-base/src/main/kotlin/annotations.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/attrs.kt → kmdc/kmdc-base/src/main/kotlin/attrs.kt b/kmdc/kmdc-base/src/jsMain/kotlin/attrs.kt → kmdc/kmdc-base/src/main/kotlin/attrs.kt
diff --git a/...dc-base/src/jsMain/kotlin/domain/Point.kt → ...kmdc-base/src/main/kotlin/domain/Point.kt b/...dc-base/src/jsMain/kotlin/domain/Point.kt → ...kmdc-base/src/main/kotlin/domain/Point.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/effects.kt → kmdc/kmdc-base/src/main/kotlin/effects.kt b/kmdc/kmdc-base/src/jsMain/kotlin/effects.kt → kmdc/kmdc-base/src/main/kotlin/effects.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/events.kt → kmdc/kmdc-base/src/main/kotlin/events.kt b/kmdc/kmdc-base/src/jsMain/kotlin/events.kt → kmdc/kmdc-base/src/main/kotlin/events.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/mdc.kt → kmdc/kmdc-base/src/main/kotlin/mdc.kt b/kmdc/kmdc-base/src/jsMain/kotlin/mdc.kt → kmdc/kmdc-base/src/main/kotlin/mdc.kt
diff --git a/kmdc/kmdc-base/src/jsMain/kotlin/util.kt → kmdc/kmdc-base/src/main/kotlin/util.kt b/kmdc/kmdc-base/src/jsMain/kotlin/util.kt → kmdc/kmdc-base/src/main/kotlin/util.kt
diff --git a/kmdc/kmdc-button/build.gradle.kts b/kmdc/kmdc-button/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
         api(kmdc("ripple"))
         api(kmdc("touch-target"))
         api(kmdc("elevation"))

diff --git a/kmdc/kmdc-button/src/jsMain/kotlin/Icon.kt → kmdc/kmdc-button/src/main/kotlin/Icon.kt b/kmdc/kmdc-button/src/jsMain/kotlin/Icon.kt → kmdc/kmdc-button/src/main/kotlin/Icon.kt
diff --git a/kmdc/kmdc-button/src/jsMain/kotlin/Label.kt → kmdc/kmdc-button/src/main/kotlin/Label.kt b/kmdc/kmdc-button/src/jsMain/kotlin/Label.kt → kmdc/kmdc-button/src/main/kotlin/Label.kt
diff --git a/...mdc-button/src/jsMain/kotlin/MDCButton.kt → .../kmdc-button/src/main/kotlin/MDCButton.kt b/...mdc-button/src/jsMain/kotlin/MDCButton.kt → .../kmdc-button/src/main/kotlin/MDCButton.kt
diff --git a/kmdc/kmdc-card/build.gradle.kts b/kmdc/kmdc-card/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("button"))
         api(kmdc("icon-button"))

diff --git a/kmdc/kmdc-card/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-card/src/main/kotlin/Actions.kt b/kmdc/kmdc-card/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-card/src/main/kotlin/Actions.kt
diff --git a/kmdc/kmdc-card/src/jsMain/kotlin/Content.kt → kmdc/kmdc-card/src/main/kotlin/Content.kt b/kmdc/kmdc-card/src/jsMain/kotlin/Content.kt → kmdc/kmdc-card/src/main/kotlin/Content.kt
diff --git a/kmdc/kmdc-card/src/jsMain/kotlin/MDCCard.kt → kmdc/kmdc-card/src/main/kotlin/MDCCard.kt b/kmdc/kmdc-card/src/jsMain/kotlin/MDCCard.kt → kmdc/kmdc-card/src/main/kotlin/MDCCard.kt
diff --git a/kmdc/kmdc-card/src/jsMain/kotlin/Media.kt → kmdc/kmdc-card/src/main/kotlin/Media.kt b/kmdc/kmdc-card/src/jsMain/kotlin/Media.kt → kmdc/kmdc-card/src/main/kotlin/Media.kt
diff --git a/...c-card/src/jsMain/kotlin/PrimaryAction.kt → ...mdc-card/src/main/kotlin/PrimaryAction.kt b/...c-card/src/jsMain/kotlin/PrimaryAction.kt → ...mdc-card/src/main/kotlin/PrimaryAction.kt
diff --git a/kmdc/kmdc-checkbox/build.gradle.kts b/kmdc/kmdc-checkbox/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
         api(kmdc("form-field"))
         api(kmdc("touch-target"))
       }

diff --git a/...checkbox/src/jsMain/kotlin/MDCCheckbox.kt → ...c-checkbox/src/main/kotlin/MDCCheckbox.kt b/...checkbox/src/jsMain/kotlin/MDCCheckbox.kt → ...c-checkbox/src/main/kotlin/MDCCheckbox.kt
diff --git a/...mdc-checkbox/src/jsMain/kotlin/_module.kt → .../kmdc-checkbox/src/main/kotlin/_module.kt b/...mdc-checkbox/src/jsMain/kotlin/_module.kt → .../kmdc-checkbox/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-chips/build.gradle.kts b/kmdc/kmdc-chips/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
         api(kmdc("touch-target"))
       }
     }

diff --git a/kmdc/kmdc-chips/src/jsMain/kotlin/Chip.kt → kmdc/kmdc-chips/src/main/kotlin/Chip.kt b/kmdc/kmdc-chips/src/jsMain/kotlin/Chip.kt → kmdc/kmdc-chips/src/main/kotlin/Chip.kt
diff --git a/.../kmdc-chips/src/jsMain/kotlin/MDCChips.kt → kmdc/kmdc-chips/src/main/kotlin/MDCChips.kt b/.../kmdc-chips/src/jsMain/kotlin/MDCChips.kt → kmdc/kmdc-chips/src/main/kotlin/MDCChips.kt
diff --git a/kmdc/kmdc-chips/src/jsMain/kotlin/_events.kt → kmdc/kmdc-chips/src/main/kotlin/_events.kt b/kmdc/kmdc-chips/src/jsMain/kotlin/_events.kt → kmdc/kmdc-chips/src/main/kotlin/_events.kt
diff --git a/kmdc/kmdc-chips/src/jsMain/kotlin/_module.kt → kmdc/kmdc-chips/src/main/kotlin/_module.kt b/kmdc/kmdc-chips/src/jsMain/kotlin/_module.kt → kmdc/kmdc-chips/src/main/kotlin/_module.kt
diff --git a/...-chips/src/jsMain/kotlin/action/Action.kt → ...dc-chips/src/main/kotlin/action/Action.kt b/...-chips/src/jsMain/kotlin/action/Action.kt → ...dc-chips/src/main/kotlin/action/Action.kt
diff --git a/...chips/src/jsMain/kotlin/action/Graphic.kt → ...c-chips/src/main/kotlin/action/Graphic.kt b/...chips/src/jsMain/kotlin/action/Graphic.kt → ...c-chips/src/main/kotlin/action/Graphic.kt
diff --git a/...dc-chips/src/jsMain/kotlin/action/Icon.kt → ...kmdc-chips/src/main/kotlin/action/Icon.kt b/...dc-chips/src/jsMain/kotlin/action/Icon.kt → ...kmdc-chips/src/main/kotlin/action/Icon.kt
diff --git a/...c-chips/src/jsMain/kotlin/action/Label.kt → ...mdc-chips/src/main/kotlin/action/Label.kt b/...c-chips/src/jsMain/kotlin/action/Label.kt → ...mdc-chips/src/main/kotlin/action/Label.kt
diff --git a/...-chips/src/jsMain/kotlin/action/Ripple.kt → ...dc-chips/src/main/kotlin/action/Ripple.kt b/...-chips/src/jsMain/kotlin/action/Ripple.kt → ...dc-chips/src/main/kotlin/action/Ripple.kt
diff --git a/...hips/src/jsMain/kotlin/grid/ActionChip.kt → ...-chips/src/main/kotlin/grid/ActionChip.kt b/...hips/src/jsMain/kotlin/grid/ActionChip.kt → ...-chips/src/main/kotlin/grid/ActionChip.kt
diff --git a/...-chips/src/jsMain/kotlin/grid/ChipCell.kt → ...dc-chips/src/main/kotlin/grid/ChipCell.kt b/...-chips/src/jsMain/kotlin/grid/ChipCell.kt → ...dc-chips/src/main/kotlin/grid/ChipCell.kt
diff --git a/...hips/src/jsMain/kotlin/grid/GridAction.kt → ...-chips/src/main/kotlin/grid/GridAction.kt b/...hips/src/jsMain/kotlin/grid/GridAction.kt → ...-chips/src/main/kotlin/grid/GridAction.kt
diff --git a/...chips/src/jsMain/kotlin/grid/InputChip.kt → ...c-chips/src/main/kotlin/grid/InputChip.kt b/...chips/src/jsMain/kotlin/grid/InputChip.kt → ...c-chips/src/main/kotlin/grid/InputChip.kt
diff --git a/...ps/src/jsMain/kotlin/grid/MDCChipsGrid.kt → ...hips/src/main/kotlin/grid/MDCChipsGrid.kt b/...ps/src/jsMain/kotlin/grid/MDCChipsGrid.kt → ...hips/src/main/kotlin/grid/MDCChipsGrid.kt
diff --git a/...s/src/jsMain/kotlin/listbox/FilterChip.kt → ...ips/src/main/kotlin/listbox/FilterChip.kt b/...s/src/jsMain/kotlin/listbox/FilterChip.kt → ...ips/src/main/kotlin/listbox/FilterChip.kt
diff --git a/.../jsMain/kotlin/listbox/MDCChipsListbox.kt → ...rc/main/kotlin/listbox/MDCChipsListbox.kt b/.../jsMain/kotlin/listbox/MDCChipsListbox.kt → ...rc/main/kotlin/listbox/MDCChipsListbox.kt
diff --git a/kmdc/kmdc-circular-progress/build.gradle.kts b/kmdc/kmdc-circular-progress/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
       }
     }
   }

diff --git a/.../src/jsMain/kotlin/MDCCircularProgress.kt → ...ss/src/main/kotlin/MDCCircularProgress.kt b/.../src/jsMain/kotlin/MDCCircularProgress.kt → ...ss/src/main/kotlin/MDCCircularProgress.kt
diff --git a/...lar-progress/src/jsMain/kotlin/_module.kt → ...cular-progress/src/main/kotlin/_module.kt b/...lar-progress/src/jsMain/kotlin/_module.kt → ...cular-progress/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-data-table/build.gradle.kts b/kmdc/kmdc-data-table/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("checkbox"))
         api(kmdc("linear-progress"))

diff --git a/...kmdc-data-table/src/jsMain/kotlin/Body.kt → kmdc/kmdc-data-table/src/main/kotlin/Body.kt b/...kmdc-data-table/src/jsMain/kotlin/Body.kt → kmdc/kmdc-data-table/src/main/kotlin/Body.kt
diff --git a/...dc-data-table/src/jsMain/kotlin/Header.kt → ...kmdc-data-table/src/main/kotlin/Header.kt b/...dc-data-table/src/jsMain/kotlin/Header.kt → ...kmdc-data-table/src/main/kotlin/Header.kt
diff --git a/...a-table/src/jsMain/kotlin/MDCDataTable.kt → ...ata-table/src/main/kotlin/MDCDataTable.kt b/...a-table/src/jsMain/kotlin/MDCDataTable.kt → ...ata-table/src/main/kotlin/MDCDataTable.kt
diff --git a/...le/src/jsMain/kotlin/ProgressIndicator.kt → ...able/src/main/kotlin/ProgressIndicator.kt b/...le/src/jsMain/kotlin/ProgressIndicator.kt → ...able/src/main/kotlin/ProgressIndicator.kt
diff --git a/...c-data-table/src/jsMain/kotlin/_events.kt → ...mdc-data-table/src/main/kotlin/_events.kt b/...c-data-table/src/jsMain/kotlin/_events.kt → ...mdc-data-table/src/main/kotlin/_events.kt
diff --git a/...c-data-table/src/jsMain/kotlin/_module.kt → ...mdc-data-table/src/main/kotlin/_module.kt b/...c-data-table/src/jsMain/kotlin/_module.kt → ...mdc-data-table/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-dialog/build.gradle.kts b/kmdc/kmdc-dialog/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("button"))
         api(kmdc("icon-button"))

diff --git a/.../kmdc-dialog/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-dialog/src/main/kotlin/Actions.kt b/.../kmdc-dialog/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-dialog/src/main/kotlin/Actions.kt
diff --git a/.../kmdc-dialog/src/jsMain/kotlin/Content.kt → kmdc/kmdc-dialog/src/main/kotlin/Content.kt b/.../kmdc-dialog/src/jsMain/kotlin/Content.kt → kmdc/kmdc-dialog/src/main/kotlin/Content.kt
diff --git a/kmdc/kmdc-dialog/src/jsMain/kotlin/Header.kt → kmdc/kmdc-dialog/src/main/kotlin/Header.kt b/kmdc/kmdc-dialog/src/jsMain/kotlin/Header.kt → kmdc/kmdc-dialog/src/main/kotlin/Header.kt
diff --git a/...mdc-dialog/src/jsMain/kotlin/MDCDialog.kt → .../kmdc-dialog/src/main/kotlin/MDCDialog.kt b/...mdc-dialog/src/jsMain/kotlin/MDCDialog.kt → .../kmdc-dialog/src/main/kotlin/MDCDialog.kt
diff --git a/kmdc/kmdc-dialog/src/jsMain/kotlin/Title.kt → kmdc/kmdc-dialog/src/main/kotlin/Title.kt b/kmdc/kmdc-dialog/src/jsMain/kotlin/Title.kt → kmdc/kmdc-dialog/src/main/kotlin/Title.kt
diff --git a/.../kmdc-dialog/src/jsMain/kotlin/_events.kt → kmdc/kmdc-dialog/src/main/kotlin/_events.kt b/.../kmdc-dialog/src/jsMain/kotlin/_events.kt → kmdc/kmdc-dialog/src/main/kotlin/_events.kt
diff --git a/.../kmdc-dialog/src/jsMain/kotlin/_module.kt → kmdc/kmdc-dialog/src/main/kotlin/_module.kt b/.../kmdc-dialog/src/jsMain/kotlin/_module.kt → kmdc/kmdc-dialog/src/main/kotlin/_module.kt
diff --git a/.../kmdc-drawer/src/jsMain/kotlin/Content.kt → kmdc/kmdc-drawer/src/main/kotlin/Content.kt b/.../kmdc-drawer/src/jsMain/kotlin/Content.kt → kmdc/kmdc-drawer/src/main/kotlin/Content.kt
diff --git a/kmdc/kmdc-drawer/src/jsMain/kotlin/Header.kt → kmdc/kmdc-drawer/src/main/kotlin/Header.kt b/kmdc/kmdc-drawer/src/jsMain/kotlin/Header.kt → kmdc/kmdc-drawer/src/main/kotlin/Header.kt
diff --git a/...mdc-drawer/src/jsMain/kotlin/MDCDrawer.kt → .../kmdc-drawer/src/main/kotlin/MDCDrawer.kt b/...mdc-drawer/src/jsMain/kotlin/MDCDrawer.kt → .../kmdc-drawer/src/main/kotlin/MDCDrawer.kt
diff --git a/.../kmdc-drawer/src/jsMain/kotlin/_events.kt → kmdc/kmdc-drawer/src/main/kotlin/_events.kt b/.../kmdc-drawer/src/jsMain/kotlin/_events.kt → kmdc/kmdc-drawer/src/main/kotlin/_events.kt
diff --git a/.../kmdc-drawer/src/jsMain/kotlin/_module.kt → kmdc/kmdc-drawer/src/main/kotlin/_module.kt b/.../kmdc-drawer/src/jsMain/kotlin/_module.kt → kmdc/kmdc-drawer/src/main/kotlin/_module.kt
diff --git a/...evation/src/jsMain/kotlin/MDCElevation.kt → ...elevation/src/main/kotlin/MDCElevation.kt b/...evation/src/jsMain/kotlin/MDCElevation.kt → ...elevation/src/main/kotlin/MDCElevation.kt
diff --git a/kmdc/kmdc-fab/build.gradle.kts b/kmdc/kmdc-fab/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
         api(kmdc("touch-target"))

diff --git a/kmdc/kmdc-fab/src/jsMain/kotlin/MDCFab.kt → kmdc/kmdc-fab/src/main/kotlin/MDCFab.kt b/kmdc/kmdc-fab/src/jsMain/kotlin/MDCFab.kt → kmdc/kmdc-fab/src/main/kotlin/MDCFab.kt
diff --git a/...bel/src/jsMain/kotlin/MDCFloatingLabel.kt → ...label/src/main/kotlin/MDCFloatingLabel.kt b/...bel/src/jsMain/kotlin/MDCFloatingLabel.kt → ...label/src/main/kotlin/MDCFloatingLabel.kt
diff --git a/...oating-label/src/jsMain/kotlin/_module.kt → ...floating-label/src/main/kotlin/_module.kt b/...oating-label/src/jsMain/kotlin/_module.kt → ...floating-label/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-form-field/build.gradle.kts b/kmdc/kmdc-form-field/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
       }

diff --git a/...m-field/src/jsMain/kotlin/MDCFormField.kt → ...orm-field/src/main/kotlin/MDCFormField.kt b/...m-field/src/jsMain/kotlin/MDCFormField.kt → ...orm-field/src/main/kotlin/MDCFormField.kt
diff --git a/...c-form-field/src/jsMain/kotlin/_module.kt → ...mdc-form-field/src/main/kotlin/_module.kt b/...c-form-field/src/jsMain/kotlin/_module.kt → ...mdc-form-field/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-icon-button/build.gradle.kts b/kmdc/kmdc-icon-button/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
         api(kmdc("ripple"))
       }
     }

diff --git a/...mdc-icon-button/src/jsMain/kotlin/Icon.kt → .../kmdc-icon-button/src/main/kotlin/Icon.kt b/...mdc-icon-button/src/jsMain/kotlin/Icon.kt → .../kmdc-icon-button/src/main/kotlin/Icon.kt
diff --git a/...button/src/jsMain/kotlin/MDCIconButton.kt → ...n-button/src/main/kotlin/MDCIconButton.kt b/...button/src/jsMain/kotlin/MDCIconButton.kt → ...n-button/src/main/kotlin/MDCIconButton.kt
diff --git a/...-icon-button/src/jsMain/kotlin/_events.kt → ...dc-icon-button/src/main/kotlin/_events.kt b/...-icon-button/src/jsMain/kotlin/_events.kt → ...dc-icon-button/src/main/kotlin/_events.kt
diff --git a/...-icon-button/src/jsMain/kotlin/_module.kt → ...dc-icon-button/src/main/kotlin/_module.kt b/...-icon-button/src/jsMain/kotlin/_module.kt → ...dc-icon-button/src/main/kotlin/_module.kt
diff --git a/...ge-list/src/jsMain/kotlin/MDCImageList.kt → ...mage-list/src/main/kotlin/MDCImageList.kt b/...ge-list/src/jsMain/kotlin/MDCImageList.kt → ...mage-list/src/main/kotlin/MDCImageList.kt
diff --git a/...mdc-layout-grid/src/jsMain/kotlin/Cell.kt → .../kmdc-layout-grid/src/main/kotlin/Cell.kt b/...mdc-layout-grid/src/jsMain/kotlin/Cell.kt → .../kmdc-layout-grid/src/main/kotlin/Cell.kt
diff --git a/...t-grid/src/jsMain/kotlin/MDCLayoutGrid.kt → ...out-grid/src/main/kotlin/MDCLayoutGrid.kt b/...t-grid/src/jsMain/kotlin/MDCLayoutGrid.kt → ...out-grid/src/main/kotlin/MDCLayoutGrid.kt
diff --git a/...ripple/src/jsMain/kotlin/MDCLineRipple.kt → ...e-ripple/src/main/kotlin/MDCLineRipple.kt b/...ripple/src/jsMain/kotlin/MDCLineRipple.kt → ...e-ripple/src/main/kotlin/MDCLineRipple.kt
diff --git a/...-line-ripple/src/jsMain/kotlin/_module.kt → ...dc-line-ripple/src/main/kotlin/_module.kt b/...-line-ripple/src/jsMain/kotlin/_module.kt → ...dc-line-ripple/src/main/kotlin/_module.kt
diff --git a/...ss/src/jsMain/kotlin/MDCLinearProgress.kt → ...ress/src/main/kotlin/MDCLinearProgress.kt b/...ss/src/jsMain/kotlin/MDCLinearProgress.kt → ...ress/src/main/kotlin/MDCLinearProgress.kt
diff --git a/...ear-progress/src/jsMain/kotlin/_module.kt → ...inear-progress/src/main/kotlin/_module.kt b/...ear-progress/src/jsMain/kotlin/_module.kt → ...inear-progress/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-list/build.gradle.kts b/kmdc/kmdc-list/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
         api(kmdc("radio"))

diff --git a/kmdc/kmdc-list/src/jsMain/kotlin/Divider.kt → kmdc/kmdc-list/src/main/kotlin/Divider.kt b/kmdc/kmdc-list/src/jsMain/kotlin/Divider.kt → kmdc/kmdc-list/src/main/kotlin/Divider.kt
diff --git a/kmdc/kmdc-list/src/jsMain/kotlin/MDCList.kt → kmdc/kmdc-list/src/main/kotlin/MDCList.kt b/kmdc/kmdc-list/src/jsMain/kotlin/MDCList.kt → kmdc/kmdc-list/src/main/kotlin/MDCList.kt
diff --git a/...dc-list/src/jsMain/kotlin/MDCListGroup.kt → ...kmdc-list/src/main/kotlin/MDCListGroup.kt b/...dc-list/src/jsMain/kotlin/MDCListGroup.kt → ...kmdc-list/src/main/kotlin/MDCListGroup.kt
diff --git a/kmdc/kmdc-list/src/jsMain/kotlin/_events.kt → kmdc/kmdc-list/src/main/kotlin/_events.kt b/kmdc/kmdc-list/src/jsMain/kotlin/_events.kt → kmdc/kmdc-list/src/main/kotlin/_events.kt
diff --git a/kmdc/kmdc-list/src/jsMain/kotlin/_module.kt → kmdc/kmdc-list/src/main/kotlin/_module.kt b/kmdc/kmdc-list/src/jsMain/kotlin/_module.kt → kmdc/kmdc-list/src/main/kotlin/_module.kt
diff --git a/...dc-list/src/jsMain/kotlin/item/Graphic.kt → ...kmdc-list/src/main/kotlin/item/Graphic.kt b/...dc-list/src/jsMain/kotlin/item/Graphic.kt → ...kmdc-list/src/main/kotlin/item/Graphic.kt
diff --git a/...kmdc-list/src/jsMain/kotlin/item/Label.kt → kmdc/kmdc-list/src/main/kotlin/item/Label.kt b/...kmdc-list/src/jsMain/kotlin/item/Label.kt → kmdc/kmdc-list/src/main/kotlin/item/Label.kt
diff --git a/...c-list/src/jsMain/kotlin/item/ListItem.kt → ...mdc-list/src/main/kotlin/item/ListItem.kt b/...c-list/src/jsMain/kotlin/item/ListItem.kt → ...mdc-list/src/main/kotlin/item/ListItem.kt
diff --git a/.../kmdc-list/src/jsMain/kotlin/item/Text.kt → kmdc/kmdc-list/src/main/kotlin/item/Text.kt b/.../kmdc-list/src/jsMain/kotlin/item/Text.kt → kmdc/kmdc-list/src/main/kotlin/item/Text.kt
diff --git a/...rface/src/jsMain/kotlin/MDCMenuSurface.kt → ...surface/src/main/kotlin/MDCMenuSurface.kt b/...rface/src/jsMain/kotlin/MDCMenuSurface.kt → ...surface/src/main/kotlin/MDCMenuSurface.kt
diff --git a/...src/jsMain/kotlin/MDCMenuSurfaceAnchor.kt → ...e/src/main/kotlin/MDCMenuSurfaceAnchor.kt b/...src/jsMain/kotlin/MDCMenuSurfaceAnchor.kt → ...e/src/main/kotlin/MDCMenuSurfaceAnchor.kt
diff --git a/...menu-surface/src/jsMain/kotlin/_events.kt → ...c-menu-surface/src/main/kotlin/_events.kt b/...menu-surface/src/jsMain/kotlin/_events.kt → ...c-menu-surface/src/main/kotlin/_events.kt
diff --git a/...menu-surface/src/jsMain/kotlin/_module.kt → ...c-menu-surface/src/main/kotlin/_module.kt b/...menu-surface/src/jsMain/kotlin/_module.kt → ...c-menu-surface/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-menu/build.gradle.kts b/kmdc/kmdc-menu/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("list"))
         api(kmdc("menu-surface"))

diff --git a/kmdc/kmdc-menu/src/jsMain/kotlin/MDCMenu.kt → kmdc/kmdc-menu/src/main/kotlin/MDCMenu.kt b/kmdc/kmdc-menu/src/jsMain/kotlin/MDCMenu.kt → kmdc/kmdc-menu/src/main/kotlin/MDCMenu.kt
diff --git a/kmdc/kmdc-menu/src/jsMain/kotlin/MenuItem.kt → kmdc/kmdc-menu/src/main/kotlin/MenuItem.kt b/kmdc/kmdc-menu/src/jsMain/kotlin/MenuItem.kt → kmdc/kmdc-menu/src/main/kotlin/MenuItem.kt
diff --git a/...-menu/src/jsMain/kotlin/SelectionGroup.kt → ...dc-menu/src/main/kotlin/SelectionGroup.kt b/...-menu/src/jsMain/kotlin/SelectionGroup.kt → ...dc-menu/src/main/kotlin/SelectionGroup.kt
diff --git a/kmdc/kmdc-menu/src/jsMain/kotlin/_events.kt → kmdc/kmdc-menu/src/main/kotlin/_events.kt b/kmdc/kmdc-menu/src/jsMain/kotlin/_events.kt → kmdc/kmdc-menu/src/main/kotlin/_events.kt
diff --git a/kmdc/kmdc-menu/src/jsMain/kotlin/_module.kt → kmdc/kmdc-menu/src/main/kotlin/_module.kt b/kmdc/kmdc-menu/src/jsMain/kotlin/_module.kt → kmdc/kmdc-menu/src/main/kotlin/_module.kt
diff --git a/...ne/src/jsMain/kotlin/MDCNotchedOutline.kt → ...line/src/main/kotlin/MDCNotchedOutline.kt b/...ne/src/jsMain/kotlin/MDCNotchedOutline.kt → ...line/src/main/kotlin/MDCNotchedOutline.kt
diff --git a/...ched-outline/src/jsMain/kotlin/_module.kt → ...otched-outline/src/main/kotlin/_module.kt b/...ched-outline/src/jsMain/kotlin/_module.kt → ...otched-outline/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-radio/build.gradle.kts b/kmdc/kmdc-radio/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("form-field"))
         api(kmdc("touch-target"))

diff --git a/.../kmdc-radio/src/jsMain/kotlin/MDCRadio.kt → kmdc/kmdc-radio/src/main/kotlin/MDCRadio.kt b/.../kmdc-radio/src/jsMain/kotlin/MDCRadio.kt → kmdc/kmdc-radio/src/main/kotlin/MDCRadio.kt
diff --git a/kmdc/kmdc-radio/src/jsMain/kotlin/_module.kt → kmdc/kmdc-radio/src/main/kotlin/_module.kt b/kmdc/kmdc-radio/src/jsMain/kotlin/_module.kt → kmdc/kmdc-radio/src/main/kotlin/_module.kt
diff --git a/...mdc-ripple/src/jsMain/kotlin/MDCRipple.kt → .../kmdc-ripple/src/main/kotlin/MDCRipple.kt b/...mdc-ripple/src/jsMain/kotlin/MDCRipple.kt → .../kmdc-ripple/src/main/kotlin/MDCRipple.kt
diff --git a/.../kmdc-ripple/src/jsMain/kotlin/_module.kt → kmdc/kmdc-ripple/src/main/kotlin/_module.kt b/.../kmdc-ripple/src/jsMain/kotlin/_module.kt → kmdc/kmdc-ripple/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-segmented-button/build.gradle.kts b/kmdc/kmdc-segmented-button/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
       }

diff --git a/...egmented-button/src/jsMain/kotlin/Icon.kt → ...-segmented-button/src/main/kotlin/Icon.kt b/...egmented-button/src/jsMain/kotlin/Icon.kt → ...-segmented-button/src/main/kotlin/Icon.kt
diff --git a/...gmented-button/src/jsMain/kotlin/Label.kt → ...segmented-button/src/main/kotlin/Label.kt b/...gmented-button/src/jsMain/kotlin/Label.kt → ...segmented-button/src/main/kotlin/Label.kt
diff --git a/...n/src/jsMain/kotlin/MDCSegmentedButton.kt → ...ton/src/main/kotlin/MDCSegmentedButton.kt b/...n/src/jsMain/kotlin/MDCSegmentedButton.kt → ...ton/src/main/kotlin/MDCSegmentedButton.kt
diff --git a/...ented-button/src/jsMain/kotlin/Segment.kt → ...gmented-button/src/main/kotlin/Segment.kt b/...ented-button/src/jsMain/kotlin/Segment.kt → ...gmented-button/src/main/kotlin/Segment.kt
diff --git a/...ented-button/src/jsMain/kotlin/_events.kt → ...gmented-button/src/main/kotlin/_events.kt b/...ented-button/src/jsMain/kotlin/_events.kt → ...gmented-button/src/main/kotlin/_events.kt
diff --git a/...ented-button/src/jsMain/kotlin/_module.kt → ...gmented-button/src/main/kotlin/_module.kt b/...ented-button/src/jsMain/kotlin/_module.kt → ...gmented-button/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-select/build.gradle.kts b/kmdc/kmdc-select/build.gradle.kts
@@ -8,9 +8,9 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
         api(kmdc("list"))
         api(kmdc("menu"))
         api(kmdc("line-ripple"))

diff --git a/...mdc-select/src/jsMain/kotlin/MDCSelect.kt → .../kmdc-select/src/main/kotlin/MDCSelect.kt b/...mdc-select/src/jsMain/kotlin/MDCSelect.kt → .../kmdc-select/src/main/kotlin/MDCSelect.kt
diff --git a/.../kmdc-select/src/jsMain/kotlin/_events.kt → kmdc/kmdc-select/src/main/kotlin/_events.kt b/.../kmdc-select/src/jsMain/kotlin/_events.kt → kmdc/kmdc-select/src/main/kotlin/_events.kt
diff --git a/.../kmdc-select/src/jsMain/kotlin/_module.kt → kmdc/kmdc-select/src/main/kotlin/_module.kt b/.../kmdc-select/src/jsMain/kotlin/_module.kt → kmdc/kmdc-select/src/main/kotlin/_module.kt
diff --git a/...select/src/jsMain/kotlin/anchor/Anchor.kt → ...c-select/src/main/kotlin/anchor/Anchor.kt b/...select/src/jsMain/kotlin/anchor/Anchor.kt → ...c-select/src/main/kotlin/anchor/Anchor.kt
diff --git a/.../src/jsMain/kotlin/anchor/DropDownIcon.kt → ...ct/src/main/kotlin/anchor/DropDownIcon.kt b/.../src/jsMain/kotlin/anchor/DropDownIcon.kt → ...ct/src/main/kotlin/anchor/DropDownIcon.kt
diff --git a/...mdc-select/src/jsMain/kotlin/menu/Menu.kt → .../kmdc-select/src/main/kotlin/menu/Menu.kt b/...mdc-select/src/jsMain/kotlin/menu/Menu.kt → .../kmdc-select/src/main/kotlin/menu/Menu.kt
diff --git a/...lect/src/jsMain/kotlin/menu/SelectItem.kt → ...select/src/main/kotlin/menu/SelectItem.kt b/...lect/src/jsMain/kotlin/menu/SelectItem.kt → ...select/src/main/kotlin/menu/SelectItem.kt
diff --git a/...mdc-slider/src/jsMain/kotlin/MDCSlider.kt → .../kmdc-slider/src/main/kotlin/MDCSlider.kt b/...mdc-slider/src/jsMain/kotlin/MDCSlider.kt → .../kmdc-slider/src/main/kotlin/MDCSlider.kt
diff --git a/...lider/src/jsMain/kotlin/MDCSliderInput.kt → ...-slider/src/main/kotlin/MDCSliderInput.kt b/...lider/src/jsMain/kotlin/MDCSliderInput.kt → ...-slider/src/main/kotlin/MDCSliderInput.kt
diff --git a/...lider/src/jsMain/kotlin/MDCSliderThumb.kt → ...-slider/src/main/kotlin/MDCSliderThumb.kt b/...lider/src/jsMain/kotlin/MDCSliderThumb.kt → ...-slider/src/main/kotlin/MDCSliderThumb.kt
diff --git a/...lider/src/jsMain/kotlin/MDCSliderTrack.kt → ...-slider/src/main/kotlin/MDCSliderTrack.kt b/...lider/src/jsMain/kotlin/MDCSliderTrack.kt → ...-slider/src/main/kotlin/MDCSliderTrack.kt
diff --git a/.../kmdc-slider/src/jsMain/kotlin/_events.kt → kmdc/kmdc-slider/src/main/kotlin/_events.kt b/.../kmdc-slider/src/jsMain/kotlin/_events.kt → kmdc/kmdc-slider/src/main/kotlin/_events.kt
diff --git a/.../kmdc-slider/src/jsMain/kotlin/_module.kt → kmdc/kmdc-slider/src/main/kotlin/_module.kt b/.../kmdc-slider/src/jsMain/kotlin/_module.kt → kmdc/kmdc-slider/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-snackbar/build.gradle.kts b/kmdc/kmdc-snackbar/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("button"))
         api(kmdc("icon-button"))

diff --git a/...mdc-snackbar/src/jsMain/kotlin/Actions.kt → .../kmdc-snackbar/src/main/kotlin/Actions.kt b/...mdc-snackbar/src/jsMain/kotlin/Actions.kt → .../kmdc-snackbar/src/main/kotlin/Actions.kt
diff --git a/.../kmdc-snackbar/src/jsMain/kotlin/Label.kt → kmdc/kmdc-snackbar/src/main/kotlin/Label.kt b/.../kmdc-snackbar/src/jsMain/kotlin/Label.kt → kmdc/kmdc-snackbar/src/main/kotlin/Label.kt
diff --git a/...snackbar/src/jsMain/kotlin/MDCSnackbar.kt → ...c-snackbar/src/main/kotlin/MDCSnackbar.kt b/...snackbar/src/jsMain/kotlin/MDCSnackbar.kt → ...c-snackbar/src/main/kotlin/MDCSnackbar.kt
diff --git a/...mdc-snackbar/src/jsMain/kotlin/_events.kt → .../kmdc-snackbar/src/main/kotlin/_events.kt b/...mdc-snackbar/src/jsMain/kotlin/_events.kt → .../kmdc-snackbar/src/main/kotlin/_events.kt
diff --git a/...mdc-snackbar/src/jsMain/kotlin/_module.kt → .../kmdc-snackbar/src/main/kotlin/_module.kt b/...mdc-snackbar/src/jsMain/kotlin/_module.kt → .../kmdc-snackbar/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-switch/build.gradle.kts b/kmdc/kmdc-switch/build.gradle.kts
@@ -8,10 +8,10 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
-        api(compose.html.svg)
+        api(libs.compose.html.svg)
       }
     }
   }

diff --git a/...mdc-switch/src/jsMain/kotlin/MDCSwitch.kt → .../kmdc-switch/src/main/kotlin/MDCSwitch.kt b/...mdc-switch/src/jsMain/kotlin/MDCSwitch.kt → .../kmdc-switch/src/main/kotlin/MDCSwitch.kt
diff --git a/.../kmdc-switch/src/jsMain/kotlin/_module.kt → kmdc/kmdc-switch/src/main/kotlin/_module.kt b/.../kmdc-switch/src/jsMain/kotlin/_module.kt → kmdc/kmdc-switch/src/main/kotlin/_module.kt
diff --git a/...kmdc-tab-bar/src/jsMain/kotlin/Content.kt → kmdc/kmdc-tab-bar/src/main/kotlin/Content.kt b/...kmdc-tab-bar/src/jsMain/kotlin/Content.kt → kmdc/kmdc-tab-bar/src/main/kotlin/Content.kt
diff --git a/kmdc/kmdc-tab-bar/src/jsMain/kotlin/Tab.kt → kmdc/kmdc-tab-bar/src/main/kotlin/Tab.kt b/kmdc/kmdc-tab-bar/src/jsMain/kotlin/Tab.kt → kmdc/kmdc-tab-bar/src/main/kotlin/Tab.kt
diff --git a/...kmdc-tab-bar/src/jsMain/kotlin/_events.kt → kmdc/kmdc-tab-bar/src/main/kotlin/_events.kt b/...kmdc-tab-bar/src/jsMain/kotlin/_events.kt → kmdc/kmdc-tab-bar/src/main/kotlin/_events.kt
diff --git a/...kmdc-tab-bar/src/jsMain/kotlin/_module.kt → kmdc/kmdc-tab-bar/src/main/kotlin/_module.kt b/...kmdc-tab-bar/src/jsMain/kotlin/_module.kt → kmdc/kmdc-tab-bar/src/main/kotlin/_module.kt
diff --git a/...ab-bar/src/jsMain/kotlin/bar/MDCTabBar.kt → ...-tab-bar/src/main/kotlin/bar/MDCTabBar.kt b/...ab-bar/src/jsMain/kotlin/bar/MDCTabBar.kt → ...-tab-bar/src/main/kotlin/bar/MDCTabBar.kt
diff --git a/...-tab-bar/src/jsMain/kotlin/bar/_events.kt → ...dc-tab-bar/src/main/kotlin/bar/_events.kt b/...-tab-bar/src/jsMain/kotlin/bar/_events.kt → ...dc-tab-bar/src/main/kotlin/bar/_events.kt
diff --git a/...-tab-bar/src/jsMain/kotlin/bar/_module.kt → ...dc-tab-bar/src/main/kotlin/bar/_module.kt b/...-tab-bar/src/jsMain/kotlin/bar/_module.kt → ...dc-tab-bar/src/main/kotlin/bar/_module.kt
diff --git a/...ar/src/jsMain/kotlin/indicator/Content.kt → ...-bar/src/main/kotlin/indicator/Content.kt b/...ar/src/jsMain/kotlin/indicator/Content.kt → ...-bar/src/main/kotlin/indicator/Content.kt
diff --git a/.../src/jsMain/kotlin/indicator/Indicator.kt → ...ar/src/main/kotlin/indicator/Indicator.kt b/.../src/jsMain/kotlin/indicator/Indicator.kt → ...ar/src/main/kotlin/indicator/Indicator.kt
diff --git a/...ar/src/jsMain/kotlin/indicator/_module.kt → ...-bar/src/main/kotlin/indicator/_module.kt b/...ar/src/jsMain/kotlin/indicator/_module.kt → ...-bar/src/main/kotlin/indicator/_module.kt
diff --git a/...ar/src/jsMain/kotlin/scroller/Scroller.kt → ...-bar/src/main/kotlin/scroller/Scroller.kt b/...ar/src/jsMain/kotlin/scroller/Scroller.kt → ...-bar/src/main/kotlin/scroller/Scroller.kt
diff --git a/...bar/src/jsMain/kotlin/scroller/_module.kt → ...b-bar/src/main/kotlin/scroller/_module.kt b/...bar/src/jsMain/kotlin/scroller/_module.kt → ...b-bar/src/main/kotlin/scroller/_module.kt
diff --git a/kmdc/kmdc-textfield/build.gradle.kts b/kmdc/kmdc-textfield/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
         api(kmdc("line-ripple"))

diff --git a/...extfield/src/jsMain/kotlin/MDCTextArea.kt → ...-textfield/src/main/kotlin/MDCTextArea.kt b/...extfield/src/jsMain/kotlin/MDCTextArea.kt → ...-textfield/src/main/kotlin/MDCTextArea.kt
diff --git a/...xtfield/src/jsMain/kotlin/MDCTextField.kt → ...textfield/src/main/kotlin/MDCTextField.kt b/...xtfield/src/jsMain/kotlin/MDCTextField.kt → ...textfield/src/main/kotlin/MDCTextField.kt
diff --git a/...dc-textfield/src/jsMain/kotlin/_module.kt → ...kmdc-textfield/src/main/kotlin/_module.kt b/...dc-textfield/src/jsMain/kotlin/_module.kt → ...kmdc-textfield/src/main/kotlin/_module.kt
diff --git a/...rc/jsMain/kotlin/icon/MDCTextFieldIcon.kt → .../src/main/kotlin/icon/MDCTextFieldIcon.kt b/...rc/jsMain/kotlin/icon/MDCTextFieldIcon.kt → .../src/main/kotlin/icon/MDCTextFieldIcon.kt
diff --git a/...xtfield/src/jsMain/kotlin/icon/_module.kt → ...textfield/src/main/kotlin/icon/_module.kt b/...xtfield/src/jsMain/kotlin/icon/_module.kt → ...textfield/src/main/kotlin/icon/_module.kt
diff --git a/kmdc/kmdc-tooltip/build.gradle.kts b/kmdc/kmdc-tooltip/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("ripple"))
         api(kmdc("button"))

diff --git a/...kmdc-tooltip/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-tooltip/src/main/kotlin/Actions.kt b/...kmdc-tooltip/src/jsMain/kotlin/Actions.kt → kmdc/kmdc-tooltip/src/main/kotlin/Actions.kt
diff --git a/...kmdc-tooltip/src/jsMain/kotlin/Content.kt → kmdc/kmdc-tooltip/src/main/kotlin/Content.kt b/...kmdc-tooltip/src/jsMain/kotlin/Content.kt → kmdc/kmdc-tooltip/src/main/kotlin/Content.kt
diff --git a/kmdc/kmdc-tooltip/src/jsMain/kotlin/Link.kt → kmdc/kmdc-tooltip/src/main/kotlin/Link.kt b/kmdc/kmdc-tooltip/src/jsMain/kotlin/Link.kt → kmdc/kmdc-tooltip/src/main/kotlin/Link.kt
diff --git a/...oltip/src/jsMain/kotlin/MDCRichTooltip.kt → ...tooltip/src/main/kotlin/MDCRichTooltip.kt b/...oltip/src/jsMain/kotlin/MDCRichTooltip.kt → ...tooltip/src/main/kotlin/MDCRichTooltip.kt
diff --git a/...c-tooltip/src/jsMain/kotlin/MDCTooltip.kt → ...mdc-tooltip/src/main/kotlin/MDCTooltip.kt b/...c-tooltip/src/jsMain/kotlin/MDCTooltip.kt → ...mdc-tooltip/src/main/kotlin/MDCTooltip.kt
diff --git a/kmdc/kmdc-tooltip/src/jsMain/kotlin/Title.kt → kmdc/kmdc-tooltip/src/main/kotlin/Title.kt b/kmdc/kmdc-tooltip/src/jsMain/kotlin/Title.kt → kmdc/kmdc-tooltip/src/main/kotlin/Title.kt
diff --git a/...kmdc-tooltip/src/jsMain/kotlin/_module.kt → kmdc/kmdc-tooltip/src/main/kotlin/_module.kt b/...kmdc-tooltip/src/jsMain/kotlin/_module.kt → kmdc/kmdc-tooltip/src/main/kotlin/_module.kt
diff --git a/kmdc/kmdc-top-app-bar/build.gradle.kts b/kmdc/kmdc-top-app-bar/build.gradle.kts
@@ -8,7 +8,7 @@ kmdc {
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         api(kmdc("icon-button"))
       }

diff --git a/...c-top-app-bar/src/jsMain/kotlin/Action.kt → ...mdc-top-app-bar/src/main/kotlin/Action.kt b/...c-top-app-bar/src/jsMain/kotlin/Action.kt → ...mdc-top-app-bar/src/main/kotlin/Action.kt
diff --git a/...app-bar/src/jsMain/kotlin/MDCTopAppBar.kt → ...p-app-bar/src/main/kotlin/MDCTopAppBar.kt b/...app-bar/src/jsMain/kotlin/MDCTopAppBar.kt → ...p-app-bar/src/main/kotlin/MDCTopAppBar.kt
diff --git a/...p-app-bar/src/jsMain/kotlin/Navigation.kt → ...top-app-bar/src/main/kotlin/Navigation.kt b/...p-app-bar/src/jsMain/kotlin/Navigation.kt → ...top-app-bar/src/main/kotlin/Navigation.kt
diff --git a/...kmdc-top-app-bar/src/jsMain/kotlin/Row.kt → kmdc/kmdc-top-app-bar/src/main/kotlin/Row.kt b/...kmdc-top-app-bar/src/jsMain/kotlin/Row.kt → kmdc/kmdc-top-app-bar/src/main/kotlin/Row.kt
diff --git a/...-top-app-bar/src/jsMain/kotlin/Section.kt → ...dc-top-app-bar/src/main/kotlin/Section.kt b/...-top-app-bar/src/jsMain/kotlin/Section.kt → ...dc-top-app-bar/src/main/kotlin/Section.kt
diff --git a/...dc-top-app-bar/src/jsMain/kotlin/Title.kt → ...kmdc-top-app-bar/src/main/kotlin/Title.kt b/...dc-top-app-bar/src/jsMain/kotlin/Title.kt → ...kmdc-top-app-bar/src/main/kotlin/Title.kt
diff --git a/...-top-app-bar/src/jsMain/kotlin/_events.kt → ...dc-top-app-bar/src/main/kotlin/_events.kt b/...-top-app-bar/src/jsMain/kotlin/_events.kt → ...dc-top-app-bar/src/main/kotlin/_events.kt
diff --git a/...-top-app-bar/src/jsMain/kotlin/_module.kt → ...dc-top-app-bar/src/main/kotlin/_module.kt b/...-top-app-bar/src/jsMain/kotlin/_module.kt → ...dc-top-app-bar/src/main/kotlin/_module.kt
diff --git a/...arget/src/jsMain/kotlin/MDCTouchTarget.kt → ...-target/src/main/kotlin/MDCTouchTarget.kt b/...arget/src/jsMain/kotlin/MDCTouchTarget.kt → ...-target/src/main/kotlin/MDCTouchTarget.kt
diff --git a/...c-typography/src/jsMain/kotlin/Heading.kt → ...mdc-typography/src/main/kotlin/Heading.kt b/...c-typography/src/jsMain/kotlin/Heading.kt → ...mdc-typography/src/main/kotlin/Heading.kt
diff --git a/...graphy/src/jsMain/kotlin/MDCTypography.kt → ...pography/src/main/kotlin/MDCTypography.kt b/...graphy/src/jsMain/kotlin/MDCTypography.kt → ...pography/src/main/kotlin/MDCTypography.kt
diff --git a/...y/src/jsMain/kotlin/MDCTypographyStyle.kt → ...phy/src/main/kotlin/MDCTypographyStyle.kt b/...y/src/jsMain/kotlin/MDCTypographyStyle.kt → ...phy/src/main/kotlin/MDCTypographyStyle.kt
diff --git a/kmdcx/build.gradle.kts b/kmdcx/build.gradle.kts
@@ -7,7 +7,7 @@ description = "All KMDC extensions"
 
 kotlin {
   sourceSets {
-    jsMain {
+    main {
       dependencies {
         subprojects.forEach(::api)
       }

diff --git a/.../kmdcx-icons/src/jsMain/kotlin/MDCIcon.kt → kmdcx/kmdcx-icons/src/main/kotlin/MDCIcon.kt b/.../kmdcx-icons/src/jsMain/kotlin/MDCIcon.kt → kmdcx/kmdcx-icons/src/main/kotlin/MDCIcon.kt
diff --git a/...x/kmdcx-icons/src/jsMain/kotlin/_icons.kt → kmdcx/kmdcx-icons/src/main/kotlin/_icons.kt b/...x/kmdcx-icons/src/jsMain/kotlin/_icons.kt → kmdcx/kmdcx-icons/src/main/kotlin/_icons.kt