Rename Bundle HtmlPage->Page for easier import

sake92 · Oct 26, 2023 · 3aeb2ce · 3aeb2ce
1 parent 327f680
commit 3aeb2ce
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 28 deletions.
diff --git a/build.sbt b/build.sbt
@@ -20,9 +20,8 @@ inThisBuild(
     publish / skip := true,
     scalacOptions ++= Seq(
       "-deprecation",
-      "-Xmax-inlines",
-      "64",
-      "-Yretain-trees"
+      "-Yretain-trees",
+      "-Wunused:all"
     ),
     resolvers +=
       "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"

diff --git a/hepek-components/jvm/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapBundle.scala b/hepek-components/jvm/src/main/scala/ba/sake/hepek/bootstrap3/BootstrapBundle.scala
@@ -11,16 +11,16 @@ case class BootstrapBundle(
     Navbar: BootstrapNavbarComponents = BootstrapNavbarComponents(),
     Panel: BootstrapPanelComponents = BootstrapPanelComponents(),
     Classes: BootstrapClassesBundle = BootstrapClassesBundle
-) extends Bundle with BootstrapUtilComponents {
+) extends Bundle
+    with BootstrapUtilComponents {
 
-  override type HtmlPage = BootstrapPage
+  override type Page = BootstrapPage
 
   def withForm(Form: BootstrapFormComponents): BootstrapBundle =
-    copy(      Form = Form
-    )
+    copy(Form = Form)
 
   def withGrid(Grid: BootstrapGridComponents): BootstrapBundle =
-    new BootstrapBundle(   Grid = Grid)
+    new BootstrapBundle(Grid = Grid)
 
   def withImage(Image: BootstrapImageComponents): BootstrapBundle =
     new BootstrapBundle(

diff --git a/...nents/jvm/src/main/scala/ba/sake/hepek/bootstrap3/component/BootstrapUtilComponents.scala b/...nents/jvm/src/main/scala/ba/sake/hepek/bootstrap3/component/BootstrapUtilComponents.scala
@@ -1,6 +1,5 @@
 package ba.sake.hepek.bootstrap3.component
 
-import ba.sake.hepek.html.component.UtilComponents
 import ba.sake.hepek.plain.component.PlainUtilComponents
 
-trait BootstrapUtilComponents extends PlainUtilComponents
+trait BootstrapUtilComponents extends PlainUtilComponents
diff --git a/hepek-components/jvm/src/main/scala/ba/sake/hepek/bulma/BulmaBundle.scala b/hepek-components/jvm/src/main/scala/ba/sake/hepek/bulma/BulmaBundle.scala
@@ -12,9 +12,10 @@ case class BulmaBundle(
     Navbar: BulmaNavbarComponent = BulmaNavbarComponent(),
     Panel: BulmaPanelComponents = BulmaPanelComponents(),
     Classes: BulmaClassesBundle = BulmaClassesBundle
-) extends Bundle with BulmaUtilComponents {
+) extends Bundle
+    with BulmaUtilComponents {
 
-  override type HtmlPage = BulmaPage
+  override type Page = BulmaPage
 
   def withForm(Form: BulmaFormComponents): BulmaBundle =
     new BulmaBundle(

diff --git a/hepek-components/jvm/src/main/scala/ba/sake/hepek/bulma/component/BulmaUtilComponents.scala b/hepek-components/jvm/src/main/scala/ba/sake/hepek/bulma/component/BulmaUtilComponents.scala
@@ -63,4 +63,4 @@ private class BulmaAttributeProvider(context: LinkResolverContext)
         attributes.addValue("class", s"title is-${h.getLevel()}")
       case _ =>
     }
-}
+}
diff --git a/hepek-components/jvm/src/main/scala/ba/sake/hepek/plain/PlainBundle.scala b/hepek-components/jvm/src/main/scala/ba/sake/hepek/plain/PlainBundle.scala
@@ -11,8 +11,9 @@ case class PlainBundle(
     Navbar: PlainNavbarComponents = PlainNavbarComponents(),
     Panel: PlainPanelComponents = PlainPanelComponents(),
     Classes: PlainClassesBundle = PlainClassesBundle
-) extends Bundle with PlainUtilComponents {
-  override type HtmlPage = PlainPage
+) extends Bundle
+    with PlainUtilComponents {
+  override type Page = PlainPage
 
   def withForm(Form: PlainFormComponents): PlainBundle =
     new PlainBundle(

diff --git a/hepek-components/jvm/src/main/scala/ba/sake/hepek/plain/component/PlainUtilComponents.scala b/hepek-components/jvm/src/main/scala/ba/sake/hepek/plain/component/PlainUtilComponents.scala
@@ -5,7 +5,6 @@ import scala.jdk.CollectionConverters.*
 
 import com.vladsch.flexmark.html.HtmlRenderer
 import com.vladsch.flexmark.parser.Parser
-import com.vladsch.flexmark.util.ast.Node
 import com.vladsch.flexmark.util.data.MutableDataSet
 import com.vladsch.flexmark.util.misc.Extension
 import com.vladsch.flexmark.ext.tables.TablesExtension

diff --git a/...-components/shared/src/main/scala/ba/sake/hepek/bulma/component/BulmaFormComponents.scala b/...-components/shared/src/main/scala/ba/sake/hepek/bulma/component/BulmaFormComponents.scala
@@ -159,7 +159,6 @@ final case class BulmaFormComponents(
       inputHelp: Option[String],
       isInline: Boolean
   ): Frag = {
-    val inputHelpFrag = inputHelp.map(h => span(cls := "help")(h))
 
     def renderCheckBox(cbLabel: String, attrs: Seq[AttrPair]) =
       label(cls := "checkbox")(
@@ -195,7 +194,6 @@ final case class BulmaFormComponents(
       inputHelp: Option[String],
       isInline: Boolean
   ): Frag = {
-    val inputHelpFrag = inputHelp.map(h => span(cls := "help")(h))
 
     def renderRadio(radioLabel: String, attrs: Seq[AttrPair]) =
       label(cls := "radio")(

diff --git a/...omponents/shared/src/main/scala/ba/sake/hepek/bulma/component/BulmaNavbarComponents.scala b/...omponents/shared/src/main/scala/ba/sake/hepek/bulma/component/BulmaNavbarComponents.scala
@@ -32,8 +32,6 @@ final case class BulmaNavbarComponent(
 
   val Companion = BulmaNavbarComponent
 
-  private val bsBtn = tag("button")(tpe := "button", btnClass)
-
   def toggle =
     a(
       cls := "navbar-burger burger",

diff --git a/hepek-components/shared/src/main/scala/ba/sake/hepek/html/Bundle.scala b/hepek-components/shared/src/main/scala/ba/sake/hepek/html/Bundle.scala
@@ -13,5 +13,5 @@ trait Bundle extends HepekAliases {
   def Panel: PanelComponents
   def Classes: ClassesBundle
 
-  type HtmlPage <: ba.sake.hepek.html.HtmlPage
+  type Page <: HtmlPage
 }
diff --git a/hepek-docs/src/main/scala/docs/hepek-components/Grid.scala b/hepek-docs/src/main/scala/docs/hepek-components/Grid.scala
@@ -6,7 +6,6 @@ import utils.Imports._
 
 object GridSupport extends HepekComponentsDocsPage {
 
-
   override def pageSettings =
     super.pageSettings.withTitle("Grid")
 

diff --git a/hepek-tests/src/main/scala/fixtures/static/StaticBundles.scala b/hepek-tests/src/main/scala/fixtures/static/StaticBundles.scala
@@ -1,8 +1,5 @@
 package fixtures.static
 
-import ba.sake.hepek.bootstrap3.statik.BootstrapStaticBundle
-import ba.sake.hepek.bulma.statik.BulmaStaticBundle
-import ba.sake.hepek.html.StaticBundle
 import ba.sake.hepek.html.statik.StaticPage
 import ba.sake.hepek.plain.statik.PlainStaticBundle
 import ba.sake.hepek.scalatags.all._

diff --git a/hepek/src/main/scala/ba/sake/hepek/bootstrap3/statik/BootstrapStaticBundle.scala b/hepek/src/main/scala/ba/sake/hepek/bootstrap3/statik/BootstrapStaticBundle.scala
@@ -14,7 +14,7 @@ case class BootstrapStaticBundle(
     Classes: BootstrapClassesBundle = BootstrapClassesBundle
 ) extends StaticBundle
     with BootstrapUtilComponents {
-  override type HtmlPage   = BootstrapPage
+  override type Page       = BootstrapPage
   override type StaticPage = BootstrapStaticPage
 
   def withForm(Form: BootstrapFormComponents): BootstrapStaticBundle =

diff --git a/hepek/src/main/scala/ba/sake/hepek/bulma/statik/BulmaStaticBundle.scala b/hepek/src/main/scala/ba/sake/hepek/bulma/statik/BulmaStaticBundle.scala
@@ -15,7 +15,7 @@ case class BulmaStaticBundle(
     Classes: BulmaClassesBundle = BulmaClassesBundle
 ) extends StaticBundle
     with BulmaUtilComponents {
-  override type HtmlPage   = BulmaPage
+  override type Page       = BulmaPage
   override type StaticPage = BulmaStaticPage
 
   def withForm(Form: BulmaFormComponents): BulmaStaticBundle =

diff --git a/hepek/src/main/scala/ba/sake/hepek/plain/statik/PlainStaticBundle.scala b/hepek/src/main/scala/ba/sake/hepek/plain/statik/PlainStaticBundle.scala
@@ -15,7 +15,7 @@ case class PlainStaticBundle(
 ) extends StaticBundle
     with PlainUtilComponents {
 
-  override type HtmlPage   = PlainPage
+  override type Page       = PlainPage
   override type StaticPage = PlainStaticPage
 
   def withForm(Form: PlainFormComponents): PlainStaticBundle =
-Original file line number
+Diff line change
@@ Expand Up @@
             attributes.addValue("class", s"title is-${h.getLevel()}")
           case _ =>
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@ import utils.Imports._

		object GridSupport extends HepekComponentsDocsPage {


		override def pageSettings =
		super.pageSettings.withTitle("Grid")

Expand Down