Skip to content

Commit 8f0a124

Browse files
committed
Bundle CSSes
1 parent 07c1e8d commit 8f0a124

File tree

2 files changed

+23
-38
lines changed

2 files changed

+23
-38
lines changed

project/Build.scala

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,21 @@ object Build {
13131313
)
13141314
}
13151315

1316+
def bundleCSS = Def.task {
1317+
val unmanagedResources = (Compile / resourceDirectory).value
1318+
def createBundle(dir: File): Seq[File] = {
1319+
val (dirs, files) = IO.listFiles(dir).toList.partition(_.isDirectory)
1320+
val targetDir = (Compile / resourceManaged).value.toPath.resolve(unmanagedResources.toPath.relativize(dir.toPath)).toFile
1321+
val bundleFile = targetDir / "bundle.css"
1322+
files.foreach(file => IO.append(bundleFile, IO.readBytes(file)))
1323+
bundleFile :: dirs.flatMap(createBundle)
1324+
}
1325+
1326+
val cssThemePath = unmanagedResources / "dotty_res" / "styles" / "theme"
1327+
1328+
createBundle(cssThemePath)
1329+
}
1330+
13161331
val SourceLinksIntegrationTest = config("sourceLinksIntegrationTest") extend Test
13171332

13181333
lazy val scaladoc = project.in(file("scaladoc")).
@@ -1326,7 +1341,10 @@ object Build {
13261341
SourceLinksIntegrationTest / test:= ((SourceLinksIntegrationTest / test) dependsOn generateScalaDocumentation.toTask("")).value,
13271342
).
13281343
settings(
1329-
Compile / resourceGenerators += generateStaticAssetsTask.taskValue,
1344+
Compile / resourceGenerators ++= Seq(
1345+
generateStaticAssetsTask.taskValue,
1346+
bundleCSS.taskValue
1347+
),
13301348
libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq(
13311349
"nl.big-o" % "liqp" % "0.8.2",
13321350
"org.jsoup" % "jsoup" % "1.14.3", // Needed to process .html files for static site

scaladoc/src/dotty/tools/scaladoc/renderers/Resources.scala

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -97,49 +97,16 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
9797

9898
val commonResources: Seq[Resource] = {
9999
val fromResources = List(
100-
"styles/theme/colors.css",
101-
"styles/theme/color-tokens.css",
102-
"styles/theme/spacing.css",
103-
"styles/theme/typography.css",
104-
105-
// layout
106-
"styles/theme/layout/container.css",
107-
"styles/theme/layout/header.css",
108-
"styles/theme/layout/leftMenu.css",
109-
"styles/theme/layout/sideMenu.css",
110-
"styles/theme/layout/searchBar.css",
111-
"styles/theme/layout/floatingButton.css",
112-
"styles/theme/layout/mobileMenu.css",
113-
"styles/theme/layout/footer.css",
114-
"styles/theme/layout/content.css",
115-
"styles/theme/layout/arrowNavigation.css",
116-
117-
// components
118-
"styles/theme/components/switcher.css",
119-
"styles/theme/components/navigation-item.css",
120-
"styles/theme/components/button/icon-button.css",
121-
"styles/theme/components/button/text-button.css",
122-
"styles/theme/components/button/label-only-button.css",
123-
"styles/theme/components/dropdown-menu.css",
124-
"styles/theme/components/divider.css",
125-
"styles/theme/components/table-of-content.css",
126-
"styles/theme/components/contributors.css",
127-
"styles/theme/components/code-snippet.css",
128-
"styles/theme/components/api-member.css",
129-
"styles/theme/components/pill.css",
130-
"styles/theme/components/api-filters.css",
131-
"styles/theme/components/attributes.css",
132-
"styles/theme/components/supertypes.css",
133-
"styles/theme/components/subtypes.css",
134-
"styles/theme/components/diagram.css",
135-
100+
"styles/theme/bundle.css",
101+
"styles/theme/components/bundle.css",
102+
"styles/theme/components/button/bundle.css",
103+
"styles/theme/layout/bundle.css",
136104
"styles/nord-light.css",
137105
"styles/dotty-icons.css",
138106
"styles/filter-bar.css",
139107
"styles/code-snippets.css",
140108
"styles/searchbar.css",
141109
"styles/social-links.css",
142-
"styles/ux.css",
143110
"styles/versions-dropdown.css",
144111
"styles/fontawesome.css",
145112
"hljs/highlight.pack.js",

0 commit comments

Comments
 (0)