diff --git a/.eleventyignore b/.eleventyignore index 8f47361..bf1f3af 100644 --- a/.eleventyignore +++ b/.eleventyignore @@ -1,5 +1,3 @@ -stefankoelle/ -timecapsule/ scripts/ .tmp/ diff --git a/eleventy.config.js b/eleventy.config.js index 068a476..e09e20a 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -10,6 +10,10 @@ module.exports = function (eleventyConfig) { eleventyConfig.addGlobalData("site", { url: "https://www.moonweb.org" }); eleventyConfig.addFilter("date", (d) => d.toISOString()); + // Exclude the standalone sites from the root (moonweb) build + eleventyConfig.ignores.add("stefankoelle/**"); + eleventyConfig.ignores.add("timecapsule/**"); + // Computed pathPrefix based on page's section front matter eleventyConfig.addGlobalData("eleventyComputed", { pathPrefix: (data) => SITES[data.section]?.pathPrefix ?? "", diff --git a/start-dev.sh b/start-dev.sh index bf84e25..9e25138 100755 --- a/start-dev.sh +++ b/start-dev.sh @@ -1,10 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -cleanup() { - kill $(jobs -p) 2>/dev/null - [ -f .eleventyignore.bak ] && mv .eleventyignore.bak .eleventyignore 2>/dev/null -} +cleanup() { kill $(jobs -p) 2>/dev/null; } trap cleanup EXIT echo "==> Starting moonweb dev servers..." @@ -13,18 +10,8 @@ echo " http://localhost:8086 (stefankoelle.de)" echo " http://localhost:8087 (timecapsule)" echo "" -# Start root server first (stefankoelle blocked by .eleventyignore) npx @11ty/eleventy --serve --port=8081 & -sleep 2 - -# Now remove stefankoelle from ignore so the next server can find templates -cp .eleventyignore .eleventyignore.bak -grep -v '^stefankoelle/' .eleventyignore > .eleventyignore.tmp && mv .eleventyignore.tmp .eleventyignore - -# Start stefankoelle server (templates now visible) npx @11ty/eleventy --config=stefankoelle/eleventy.config.js --serve --port=8086 & - -# Start timecapsule cd timecapsule && npx @11ty/eleventy --serve --port=8087 & wait