Fix some broken likns for static site and configure CI for nightly pushes to docs.scala-lang

Author: BarkingBad

.github/workflows/ci.yaml

@@ -470,9 +470,12 @@ jobs:
     if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
     env:
       NIGHTLYBUILD: yes
-      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
-                                           # Generate one at https://github.com/settings/tokens
-                                           # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
+      DOTTY_WEBSITE_BOT_TOKEN: ${{ secrets.BOT_TOKEN }}  # If you need to change this:
+                                          # Generate one at https://github.com/settings/tokens
+                                          # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website
+      DOCS_SCALALANG_BOT_TOKEN: ${{ secrets.DOCS_SCALALANG_BOT_TOKEN }}  # If you need to change this:
+                                          # Generate one at https://github.com/settings/tokens
+                                          # Make sure you have the write permissions to the repo: https://github.com/scala/docs.scala-lang
 
     steps:
       - name: Reset existing repo
@@ -494,14 +497,26 @@ jobs:
         run: |
           ./project/scripts/genDocs -doc-snapshot
 
-      - name: Deploy Website
+      - name: Deploy Website to dotty-website
         uses: peaceiris/actions-gh-pages@v3
         with:
-          personal_token: ${{ secrets.BOT_TOKEN }}
+          personal_token: ${{ DOTTY_WEBSITE_BOT_TOKEN }}
           publish_dir: docs/_site
           external_repository: lampepfl/dotty-website
           publish_branch: gh-pages
 
+      - name: Generate docs.scala-lang preprocessed files
+        run: |
+          ./project/scripts/genDocsScalaLang
+
+      - name: Deploy Website to docs.scala-lang
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          personal_token: ${{ DOCS_SCALALANG_BOT_TOKEN }}
+          publish_dir: docsScalaLang
+          external_repository: scala/docs.scala-lang
+          publish_branch: dev
+
   publish_release:
     runs-on: [self-hosted, Linux]
     container:

docs/docs/usage/getting-started.md

@@ -50,7 +50,7 @@ For more information, read the [coursier-cli documentation](https://get-coursier
 You only need two tools to compile, run, test, and package a Scala project: Java 8 or 11, and sbt.
 To install these manually:
 
-1. Download Java from [Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html), [Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html), or [AdoptOpenJDK 8/11](https://adoptopenjdk.net/). Refer to [JDK Compatibility](/overviews/jdk-compatibility/overview.html) for Scala/Java compatibility detail.
+1. Download Java from [Oracle Java 8](https://www.oracle.com/java/technologies/javase-jdk8-downloads.html), [Oracle Java 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html), or [AdoptOpenJDK 8/11](https://adoptopenjdk.net/). Refer to [JDK Compatibility](https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html) for Scala/Java compatibility detail.
 2. Install [sbt](https://www.scala-sbt.org/download.html)
 
 
@@ -87,7 +87,7 @@ hello-world/
 ```
 The scala file `Main.scala` in `src/main/scala` is all we need for now.
 
-More documentation about sbt can be found in the [Scala Book](/scala3/book/scala-tools.html) and in the official sbt [documentation](https://www.scala-sbt.org/1.x/docs/index.html)
+More documentation about sbt can be found in the [Scala Book](https://docs.scala-lang.org/scala3/book/scala-tools.html) and in the official sbt [documentation](https://www.scala-sbt.org/1.x/docs/index.html)
 
 
 {% comment %}
@@ -156,8 +156,8 @@ Then type `exit` or press `[Ctrl][d]` to exit sbt and return to your command lin
 Now that you’ve created a first “Hello, world” example with Scala 3, you’re ready for some next steps.
 Consider checking out:
 
-- [The Scala 3 Book](/scala3/book/introduction.html), which provides a set of short lessons introducing Scala’s main features
-- [The migration guide](/scala3/guides/migration/compatibility-intro.html) helps you to migrate your existing Scala 2 code base to Scala 3.
+- [The Scala 3 Book](https://docs.scala-lang.org/scala3/book/introduction.html), which provides a set of short lessons introducing Scala’s main features
+- [The migration guide](https://docs.scala-lang.org/scala3/guides/migration/compatibility-intro.html) helps you to migrate your existing Scala 2 code base to Scala 3.
 
 When you want to connect with other Scala users, there are several mailing lists and real-time chat rooms available.
 Check out our [Scala community page](https://scala-lang.org/community/) for a list of these resources, and for where to reach out for help.

docs/docs/usage/scaladoc/search-engine.md

@@ -83,4 +83,4 @@ Inkuire works as a JavaScript worker in the browser thanks to the power of [Scal
 
 To enable Inkuire when running scaladoc, add the flag `-Ygenerate-inkuire`. By adding this flag two files are generated:
 - `inkuire-db.json` - this is the file containing all the searchable declarations from the currently documented project in a format readable to the Inkuire search engine.
-- `inkuire-config.json` - this file contains the locations of the database files that should be searchable from the documentation of the current project. By default, it will be generated with the location of the local db file as well as the default implied locations of database files in [External mappings](/scala3/guides/scaladoc/settings.html#-external-mappings).
+- `inkuire-config.json` - this file contains the locations of the database files that should be searchable from the documentation of the current project. By default, it will be generated with the location of the local db file as well as the default implied locations of database files in [External mappings](https://docs.scala-lang.org/scala3/guides/scaladoc/settings.html#-external-mappings).

project/CopyDocs.scala

@@ -22,11 +22,11 @@ object CopyDocs {
   implicit def stringToFun(s: String): MyParams => String = _ => s
 
   // Patterns, for convenience
-  val titlePattern = "(?s)^---\n.*title: ([^\n]*).*---"
-  val jekyllLinkPattern = """\{\% link _overviews/scala3-scaladoc(.*) %\}"""
+  val titlePattern = "(?s)^---\n.*?title: ([^\n]*).*?---"
+  val jekyllLinkPattern = """\{\% link _overviews/scala3-reference(.*) %\}"""
   val jekyllLinkSubstitution = "..$1"
-  val jekyllLinkPattern2 = """\{\% link |_overviews/scala3-scaladoc/(.*) %\}"""
-  val jekyllLinkSubstitution2 = "$1"
+  val jekyllLinkPattern2 = """\{\% link _overviews/scala3-scaladoc(.*) %\}"""
+  val jekyllLinkSubstitution2 = ".$1"
   val localLinkPattern = """\((?!http|www)(.*).html\)"""
   val localLinkSubstitution = "($1.md)"
 
@@ -44,6 +44,22 @@ object CopyDocs {
    * The inner set is a collection of pairs `regex pattern` -> `substitution value`.
    */
   val transformationMap: Map[String, Set[(String, MyParams => String)]] = Map(
+    "docs/docs/usage/scaladoc/index.md" -> Set(
+      ("""\{\{ site\.baseurl \}\}/resources/images/scala3/scaladoc/logo\.svg""" -> "images/scaladoc-logo.png"),
+    ),
+
+    "docs/docs/usage/scaladoc/site-versioning.md" -> Set(
+      ("""/resources/images/scala3/scaladoc/nightly\.gif""" -> "images/scaladoc/nightly.gif"),
+    ),
+
+    "docs/docs/usage/scaladoc/search-engine.md" -> Set(
+      ("""/resources/images/scala3/scaladoc/inkuire-1\.0\.0-M2_js_flatMap\.gif""" -> "images/scaladoc/inkuire-1.0.0-M2_js_flatMap.gif"),
+    ),
+
+    "docs/docs/reference/other-new-features/explicit-nulls.md" -> Set(
+      ("""/resources/images/scala3/explicit-nulls/explicit-nulls-type-hierarchy\.png""" -> "images/explicit-nulls/explicit-nulls-type-hierarchy.png"),
+    ),
+
     "docs/docs/reference/" -> (commonTransformations +
       (titlePattern -> ((p) => s"---\nlayout: doc-page\ntitle: $$1\nmovedTo: https://docs.scala-lang.org/scala3/reference/${p.newPath}.html\n---")),
     ),
@@ -57,7 +73,9 @@ object CopyDocs {
     ),
 
     "docs/docs/usage/tools-worksheets" -> (commonTransformations +
-      (titlePattern -> "---\nlayout: doc-page\ntitle: \"Worksheet mode with Dotty IDE\"\nmovedTo: https://docs.scala-lang.org/scala3/book/tools-worksheets.html\n---")
+      (titlePattern -> "---\nlayout: doc-page\ntitle: \"Worksheet mode with Dotty IDE\"\nmovedTo: https://docs.scala-lang.org/scala3/book/tools-worksheets.html\n---") +
+      ("""/resources/images/scala3-book/intellij-worksheet\.png""" -> "images/worksheets/intellij-worksheet.png") +
+      ("""/resources/images/scala3-book/metals-worksheet\.png""" -> "images/worksheets/metals-worksheet.png")
     ),
 
     "docs/docs/resources/talks" -> (commonTransformations +
@@ -76,7 +94,7 @@ object CopyDocs {
           val fileContent = inputStream.getLines().mkString("\n")
 
           new PrintStream(newPath.toFile) {
-            val patterns = transformationMap.find { case (k, v) => path.toString.startsWith(k) }.map(_._2).getOrElse(Set.empty)
+            val patterns = transformationMap.filter { case (k, v) => path.toString.startsWith(k) }.flatMap(_._2)
             val params = MyParams(newPath = s.stripPrefix("docs/docs/reference/").stripSuffix(".md"))
             val transformed = patterns.foldLeft(fileContent) { case (res, (pattern, substitution)) => res.replaceAll(pattern, substitution(params)) }
             write(transformed.getBytes("UTF8"))

project/scripts/genDocsScalaLang

@@ -41,10 +41,3 @@ cp -f "$PWD/docs/docsScalaLangResources/scaladoc-assets.html" "$DOCS_SCALA_LANG_
 
 # Hack inclusion of these assests by the docs.scala-lang jekyll builder
 echo "{% include scaladoc-assets.html %}" >> "$DOCS_SCALA_LANG_DIR/_layouts/inner-page-parent-dropdown.html"
-
-# Push changes to fork branch
-cd $DOCS_SCALA_LANG_DIR
-git remote add barkingbad [email protected]:BarkingBad/docs.scala-lang.git
-git add .
-git commit -m "Update docs from dotty repo"
-git push -f barkingbad main:pregenerated-page