Support for Eleventy v2 beta

.eleventy.js

@@ -44,11 +44,11 @@ module.exports = function (eleventyConfig, defaultOptions) {
 	eleventyConfig.addLiquidTag('ccInfo', function (liquidEngine) {
 		return {
 			parse: function () {},
-			render: function (ctx) {
+			render: async function (ctx) {
 				log(`⭐️ Starting ${blue('eleventy-plugin-cloudcannon')}`);
 				const context = ctx.getAll();
 				const config = readConfig(context, options);
-				const info = getInfo(context, config);
+				const info = await getInfo(context, config);
 				const json = stringifyJson(info);
 				log(`🏁 Generated ${bold('_cloudcannon/info.json')} ${green('successfully')}`);
 				return json;

integration-tests/2.0.0-beta.3/expected.json

@@ -0,0 +1,189 @@
+{
+	"timezone": "Etc/UTC",
+	"_inputs": {
+		"layout": {
+			"hidden": "true"
+		}
+	},
+	"collections_config": {
+		"authors": {
+			"path": "authors",
+			"output": false,
+			"auto_discovered": false,
+			"name": "The Authors"
+		},
+		"posts": {
+			"path": "posts",
+			"output": true,
+			"auto_discovered": true
+		},
+		"pages": {
+			"path": "pages",
+			"output": true,
+			"filter": "strict",
+			"auto_discovered": true
+		},
+		"data": {
+			"path": "_data",
+			"output": false,
+			"auto_discovered": false
+		}
+	},
+	"base_url": "",
+	"source": "",
+	"paths": {
+		"static": "",
+		"uploads": "uploads",
+		"data": "_data",
+		"collections": "",
+		"pages": "pages",
+		"layouts": "_includes"
+	},
+	"cloudcannon": {
+		"name": "eleventy-plugin-cloudcannon",
+		"version": "0.0.21"
+	},
+	"collections": {
+		"authors": [
+			{
+				"filePathStem": "/authors/jane-doe",
+				"fileSlug": "jane-doe",
+				"tags": [
+					"authors"
+				],
+				"permalink": false,
+				"name": "Jane Doe",
+				"description": "Tall",
+				"path": "authors/jane-doe.md",
+				"url": "",
+				"output": false,
+				"collection": "authors"
+			},
+			{
+				"filePathStem": "/authors/john-doe",
+				"fileSlug": "john-doe",
+				"tags": [
+					"authors"
+				],
+				"permalink": false,
+				"name": "John Doe",
+				"description": "Very tall",
+				"path": "authors/john-doe.md",
+				"url": "",
+				"output": false,
+				"collection": "authors"
+			}
+		],
+		"posts": [
+			{
+				"filePathStem": "/posts/totally-awesome",
+				"fileSlug": "totally-awesome",
+				"layout": "default.njk",
+				"tags": [
+					"posts",
+					"News"
+				],
+				"permalink": "/posts/{{ page.fileSlug }}/",
+				"title": "Totally awesome",
+				"date": "2021-08-10T00:00:00.000Z",
+				"author": "/authors/jane-doe.md",
+				"authorItem": "[FILTERED]",
+				"path": "posts/totally-awesome.md",
+				"url": "/posts/totally-awesome/",
+				"output": true,
+				"collection": "posts"
+			},
+			{
+				"filePathStem": "/posts/wicked-cool",
+				"fileSlug": "wicked-cool",
+				"layout": "default.njk",
+				"tags": [
+					"posts"
+				],
+				"permalink": "/posts/{{ page.fileSlug }}/",
+				"title": "Wicked cool",
+				"date": "2021-12-11T00:00:00.000Z",
+				"author": "/authors/john-doe.md",
+				"authorItem": "[FILTERED]",
+				"path": "posts/wicked-cool.md",
+				"url": "/posts/wicked-cool/",
+				"output": true,
+				"collection": "posts"
+			}
+		],
+		"pages": [
+			{
+				"filePathStem": "/pages/about",
+				"fileSlug": "about",
+				"layout": "default.njk",
+				"permalink": "/{{ page.fileSlug }}/",
+				"title": "About",
+				"description": "All about us!",
+				"path": "pages/about.njk",
+				"url": "/about/",
+				"output": true,
+				"collection": "pages"
+			},
+			{
+				"filePathStem": "/pages/blog",
+				"fileSlug": "blog",
+				"layout": "default.njk",
+				"permalink": "/blog/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber + 1 }}/{% endif %}",
+				"title": "Blog",
+				"path": "pages/blog.njk",
+				"url": "/blog/",
+				"output": true,
+				"collection": "pages"
+			},
+			{
+				"filePathStem": "/pages/index",
+				"fileSlug": "pages",
+				"layout": "default.njk",
+				"permalink": "/",
+				"title": null,
+				"quotes": [
+					{
+						"message": "So awesome!",
+						"name": "Happy Chappy"
+					},
+					{
+						"message": "Totally rad!",
+						"name": "Skatey One Eighty"
+					},
+					{
+						"message": "Gnarly!",
+						"name": "Surfer Dude"
+					}
+				],
+				"path": "pages/index.njk",
+				"url": "/",
+				"output": true,
+				"collection": "pages"
+			},
+			{
+				"filePathStem": "/pages/notes",
+				"fileSlug": "notes",
+				"layout": "default.njk",
+				"permalink": "/{{ page.fileSlug }}/",
+				"title": "The notes!",
+				"path": "pages/notes.md",
+				"url": "/notes/",
+				"output": true,
+				"collection": "pages"
+			}
+		]
+	},
+	"data": {},
+	"generator": {
+		"name": "eleventy",
+		"version": "1.0.0",
+		"environment": "",
+		"metadata": {
+			"markdown": "markdown-it",
+			"markdown-it": {
+				"html": true
+			}
+		}
+	},
+	"version": "0.0.3"
+}

integration-tests/2.0.0-beta.3/site/.eleventy.js

@@ -0,0 +1,23 @@
+const pluginCloudCannon = require('eleventy-plugin-cloudcannon');
+
+module.exports = function (eleventyConfig) {
+	eleventyConfig.setUseGitIgnore(false);
+	eleventyConfig.setDataDeepMerge(true);
+
+	eleventyConfig.addCollection('postsWithAuthor', (collectionApi) => {
+		const authors = collectionApi.getFilteredByTag('authors');
+
+		return collectionApi.getFilteredByTag('posts').map((post) => {
+			post.data.authorItem = authors.find((author) => author.inputPath === `.${post.data.author}`);
+			return post;
+		});
+	});
+
+	eleventyConfig.cloudcannonOptions = {
+		dir: {
+			pages: 'pages'
+		}
+	};
+
+	eleventyConfig.addPlugin(pluginCloudCannon);
+};

integration-tests/2.0.0-beta.3/site/.eleventyignore

@@ -0,0 +1,2 @@
+node_modules/
+_site/

integration-tests/2.0.0-beta.3/site/_data/settings.json

@@ -0,0 +1,4 @@
+{
+	"site_title": "Test site",
+	"description": "Testing example content."
+}

integration-tests/2.0.0-beta.3/site/_includes/default.njk

@@ -0,0 +1,24 @@
+---
+---
+<!DOCTYPE html>
+
+<html>
+	<head>
+		<title>Test</title>
+	</head>
+
+	<body>
+		<nav>
+			<ul>
+				<li><a href="/">Home</a></li>
+				<li><a href="/about/">About</a></li>
+				<li><a href="/notes/">Notes</a></li>
+				<li><a href="/blog/">Blog</a></li>
+			</ul>
+		</nav>
+
+		<main>
+			{{ content | safe }}
+		</main>
+	</body>
+</html>

integration-tests/2.0.0-beta.3/site/authors/authors.json

@@ -0,0 +1,4 @@
+{
+	"tags": "authors",
+	"permalink": false
+}

integration-tests/2.0.0-beta.3/site/authors/jane-doe.md

@@ -0,0 +1,4 @@
+---
+name: Jane Doe
+description: Tall
+---

integration-tests/2.0.0-beta.3/site/authors/john-doe.md

@@ -0,0 +1,4 @@
+---
+name: John Doe
+description: Very tall
+---

integration-tests/2.0.0-beta.3/site/cloudcannon.config.js

@@ -0,0 +1,15 @@
+module.exports = {
+	timezone: 'Etc/UTC',
+	_inputs: {
+		layout: {
+			hidden: 'true'
+		}
+	},
+	collections_config: {
+		authors: {
+			name: 'The Authors',
+			path: 'authors',
+			output: false
+		}
+	}
+};