Add pages path and return original config

CloudCannon · Jul 1, 2021 · 393ac1f · 393ac1f
1 parent 6dae47d
commit 393ac1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -9,6 +9,7 @@ module.exports = function (eleventyConfig, defaultConfig = {}) {
 		dir: {
 			input: defaultConfig.dir?.input ?? '.',
 			data: defaultConfig.dir?.data ?? '_data', // relative to input
+			pages: defaultConfig.dir?.pages ?? '', // relative to input
 			includes: defaultConfig.dir?.includes ?? '_includes', // relative to input
 			layouts: defaultConfig.dir?.layouts ?? '_includes', // relative to input
 		}

diff --git a/cloudcannon/info.njk b/cloudcannon/info.njk
@@ -3,6 +3,7 @@ eleventyExcludeFromCollections: true
 permalink: /_cloudcannon/info.json
 ---
 {%- set inputPath %}{% ccPath 'input' %}{% endset -%}
+{%- set pagesPath %}{% ccPath 'pages' %}{% endset -%}
 {%- set dataPath %}{% ccPath 'data' %}{% endset -%}
 {%- set includesPath %}{% ccPath 'includes' %}{% endset -%}
 {%- set layoutsPath %}{% ccPath 'layouts' %}{% endset -%}
@@ -75,6 +76,7 @@ permalink: /_cloudcannon/info.json
 		{% if cloudcannon.uploads_dir %}
 			"uploads": "{{ cloudcannon.uploads_dir }}",
 		{% endif %}
+		"pages": {{ pagesPath | ccJsonify | safe }},
 		"data": {{ dataPath | ccJsonify | safe }},
 		"collections": "",
 		"includes": {{ includesPath | ccJsonify | safe }},

diff --git a/cloudcannon/inject-cloudcannon.config.js b/cloudcannon/inject-cloudcannon.config.js
@@ -13,4 +13,5 @@ module.exports = function (eleventyConfig) {
 
 	const config = defaultConfig?.apply(this, arguments);
 	eleventyConfig.addPlugin(pluginCloudCannon, eleventyConfig.cloudcannonOptions ?? config);
+	return config;
 };