Merge pull request #895 from eikek/declutter-root

Move webapp related build files into the webapp directory

.github/workflows/ci.yml

@@ -16,6 +16,8 @@ jobs:
         with:
           elm-version: 0.19.1
       - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: modules/webapp
       - name: Fetch tags
         run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
       - uses: olafurpg/setup-scala@v12

.github/workflows/release-nightly.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           elm-version: 0.19.1
       - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: modules/webapp
       - name: Coursier cache
         uses: coursier/cache-action@v6
       - name: Set current version

.github/workflows/release.yml

@@ -21,6 +21,8 @@ jobs:
         with:
           elm-version: 0.19.1
       - uses: bahmutov/npm-install@v1
+        with:
+          working-directory: modules/webapp
       - name: Coursier cache
         uses: coursier/cache-action@v6
       - name: Set current version

modules/webapp/elm.json

@@ -1,8 +1,8 @@
 {
     "type": "application",
     "source-directories": [
-        "modules/webapp/src/main/elm",
+        "src/main/elm",
-        "modules/webapp/target/elm-src"
+        "target/elm-src"
     ],
     "elm-version": "0.19.1",
     "dependencies": {

modules/webapp/postcss.config.js

@@ -15,9 +15,9 @@ const prodPlugins =
           require("autoprefixer"),
           require("@fullhuman/postcss-purgecss")({
               content: [
-                  "./modules/webapp/src/main/elm/**/*.elm",
+                  "./src/main/elm/**/*.elm",
-                  "./modules/webapp/src/main/styles/keep.txt",
+                  "./src/main/styles/keep.txt",
-                  "./modules/restserver/src/main/templates/*.html"
+                  "../restserver/src/main/templates/*.html"
               ],
               defaultExtractor: content => content.match(/[A-Za-z0-9-_:/\.]+/g) || []
           }),

project/StylesPlugin.scala

@@ -50,7 +50,7 @@ object StylesPlugin extends AutoPlugin {
         val npm    = stylesNpmCommand.value
         val inDir  = stylesDirectory.value
         val outDir = stylesOutputDir.value
-        val wd     = (LocalRootProject / baseDirectory).value
+        val wd     = (Compile / baseDirectory).value
         val mode   = stylesMode.value
         npmInstall(npm, wd, logger)
         val files = postCss(npx, inDir, outDir, wd, mode, logger) ++