Remove support for Handlebars, Thymeleaf and JSX

Based on this, restore compatability with the current versions of
faucet-pipeline-*

Use the opportunity to update the other dependencies as well

CHANGELOG.md

@@ -1,6 +1,15 @@
 aiur version history
 ====================
 
+v0.10.0
+-------
+
+
+significant changes for end users:
+
+* fix compatability with current versions of faucet-pipeline
+* remove support for JSX, Handlebars and Thymeleaf
+
 v0.9.0
 ------
 

bin/aiur

@@ -12,6 +12,6 @@ let liveserve = options.liveserve;
 delete options.liveserve;
 faucet(referenceDir, config, options);
 
-if (liveserve) {
-    server.live(liveserve, config.manifest.webRoot);
+if(liveserve) {
+	server.live(liveserve, config.manifest.webRoot);
 }

example/aiur.config.js

@@ -3,18 +3,6 @@
 exports.title = "Example Styleguide";
 exports.language = "en";
 
-exports.snippetAssets = {
-	sass: [{
-		source: "./index.scss",
-		target: "./snippet.css"
-	}],
-
-	js: [{
-		source: "./index.js",
-		target: "./snippet.js"
-	}]
-};
-
 exports.vendor = {
 	styles: [{
 		crossorigin: "anonymous",
@@ -28,23 +16,16 @@ exports.pages = {
 	"": {
 		file: "./components/welcome.md",
 		children: {
-			languages: {
-				file: "./languages/languages.md",
-				data: "./languages/languages.data.js"
-			}
+			languages: "./languages/languages.md"
 		}
 	},
 	atoms: {
 		file: "./components/atoms.md",
 		children: {
 			button: "./components/button/doc.md",
-			strong: "./components/strong/doc.md",
-			thing: {
-				file: "./components/thing/thing.md",
-				data: "./components/thing/thing.json"
-			}
+			strong: "./components/strong/doc.md"
 		}
 	}
 };
 
-exports.watchDirs = ["./components", "./languages"]
+exports.watchDirs = ["./components", "./languages"];

example/components/button/doc.md

@@ -3,9 +3,6 @@ status: ready
 
 My favorite button:
 
-```jsx
-import { Button } from "./components/button";
-import { createElement } from "complate-stream";
-
-<Button label="ok" />
+```html
+<button class="btn">ok</button>
 ```

example/languages/languages.md

@@ -1,21 +1,14 @@
 title: Languages in Aiur
 
-In Aiur it is quite simple to mix several templating languages in one document. Aiur uses slightly enhanced markdown code blocks to transform your component code into an interactive preview of it.
-
-Here, a handlebars template wants to say “Hello!”:
-
-```handlebars
-<button>{{handlebars.message}}</button>
-```
-
-Plain HTML is with us, too, of course:
+Aiur uses slightly enhanced markdown code blocks to transform your component code into an interactive preview of it.
+Use the language `html` for the snippet:
 
 ```html
 <button>Hi, HTML here 👋</button>
 ```
 
-Simply provide an annotated code block as you are used to:
+This is how it looks like in Markdown:
 
-    ```handlebars
-    <button>{{message}}</button>
+    ```html
+    <button>Hi, HTML here 👋</button>
     ```

lib/cli.js

@@ -17,7 +17,7 @@ Options:
   -t, --target
     put the generated files here (default: ./dist)
   --baseuri
-    base uri path the files are served from (default: /) 
+    base uri path the files are served from (default: /)
   --fingerprint
     add unique hash to file names
   --sourcemaps
@@ -85,12 +85,13 @@ module.exports = function parseCLI(argv = process.argv.slice(2), help = HELP) {
 			webRoot: target
 		},
 
-		plugins: {
-			aiur: {
-				plugin: aiur,
-				bucket: "markup"
+		plugins: [
+			{
+				bucket: "markup",
+				key: "aiur",
+				plugin: aiur
 			}
-		}
+		]
 	};
 
 	Object.entries(rawConfig.snippetAssets || {}).forEach(([pipeline, entries]) => {

lib/site.js

@@ -1,27 +1,14 @@
 let generatePageTree = require("./tree");
 let resolvePath = require("faucet-pipeline-core/lib/util/resolve");
 let { abort, reportFileStatus } = require("faucet-pipeline-core/lib/util");
-let mkdirp = require("mkdirp");
-let fs = require("fs");
+let { mkdirp } = require("mkdirp");
+let { writeFile } = require("node:fs/promises");
 let path = require("path");
-let { promisify } = require("util");
 let PageRenderer = require("./page_renderer");
 let SnippetWrapper = require("./snippet_wrapper");
 let generateLayout = require("./generate_layout");
 let Navigation = require("./navigation");
 
-let writeFile = promisify(fs.writeFile);
-
-let DEFAULTS = {
-	renderers: {
-		handlebars: require("./handlebars"),
-		html: require("./html"),
-		jsx: require("./complate"),
-		thymeleaf: require("./thymeleaf")
-	},
-	generateLayout
-};
-
 module.exports = class Site {
 	constructor({ source, target, baseURI }, assetManager) {
 		let { referenceDir } = assetManager;
@@ -30,9 +17,11 @@ module.exports = class Site {
 			target: resolvePath(target, referenceDir, { enforceRelative: true }),
 			baseURI,
 			// TODO: either make this configurable or autoload renderers on use
-			renderers: DEFAULTS.renderers,
+			renderers: {
+				html: require("./html")
+			},
 			// TODO: make this configurable, but first find a simpler contract
-			generateLayout: DEFAULTS.generateLayout,
+			generateLayout,
 			assetManager
 		});
 		this.dirs = new Set();

package.json

@@ -19,27 +19,23 @@
 	},
 	"dependencies": {
 		"commonmark": "^0.30.0",
-		"complate-stream": "^0.16.10",
 		"donny": "^0.3.0",
 		"faucet-pipeline-core": "^2.0.0",
-		"faucet-pipeline-esnext": "^2.1.7",
-		"faucet-pipeline-jsx": "^2.1.7",
+		"faucet-pipeline-esnext": "^3.0.0",
+		"faucet-pipeline-jsx": "^3.0.0",
 		"faucet-pipeline-sass": "^1.7.0",
 		"faucet-pipeline-static": "^2.0.0",
-		"five-server": "^0.1.2",
-		"handlebars": "^4.7.7",
+		"five-server": "^0.3.1",
 		"metacolon": "^1.1.1",
 		"minimist": "^1.2.5",
-		"mkdirp": "^1.0.4",
+		"mkdirp": "^3.0.1",
 		"parse5": "^7.1.2",
-		"prismjs": "^1.26.0",
-		"require-from-string": "^2.0.2",
-		"thymeleaf": "^0.21.0"
+		"prismjs": "^1.26.0"
 	},
 	"devDependencies": {
 		"eslint-config-fnd": "^1.12.0",
 		"mocha": "^10.2.0",
 		"release-util-fnd": "^3.0.0",
-		"rimraf": "^3.0.2"
+		"rimraf": "^5.0.1"
 	}
 }

test/test_site.js

@@ -1,11 +1,8 @@
 /* global describe, it, beforeEach, afterEach */
 let Site = require("../lib/site");
 let { assertSame, fixturesPath, fixturesDir, expectationsPath, MockAssetManager } = require("./util");
-let fs = require("fs");
-let { promisify } = require("util");
-let rimraf = promisify(require("rimraf"));
-
-let readFile = promisify(fs.readFile);
+let { readFile } = require("node:fs/promises");
+let { rimraf } = require("rimraf");
 
 let assetManager = new MockAssetManager(fixturesDir);