@11ty/eleventy-plugin-webc 0.6.0 → 0.7.0

package/eleventyWebcPlugin.js

@@ -15,7 +15,7 @@ module.exports = function(eleventyConfig, options = {}) {
 	}, options.filters);
 
 	options = Object.assign({
-		components: false, // glob for no-import global components
+		components: "_components/**/*.webc", // glob for no-import global components
 		useTransform: false, // global transform
 		transformData: {}, // extra global data for transforms specifically
 	}, options);
@@ -25,7 +25,9 @@ module.exports = function(eleventyConfig, options = {}) {
 	if(options.components) {
 		eleventyConfig.addWatchTarget(options.components);
 
-		// TODO add to eleventy ignores (if not in _includes folder)
+		// Opt-out of Eleventy to process components
+		// Note that Eleventy’s default ignores already have _includes/**
+		eleventyConfig.ignores.add(options.components);
 	}
 
 	templatePlugin(eleventyConfig, options);

package/package.json

@@ -1,10 +1,10 @@
 {
 	"name": "@11ty/eleventy-plugin-webc",
-	"version": "0.6.0",
+	"version": "0.7.0",
 	"description": "WebC support for Eleventy adds for Single File Web Components",
 	"main": "eleventyWebcPlugin.js",
 	"scripts": {
-		"test": "npx ava"
+		"test": "npx ava --no-worker-threads"
 	},
 	"publishConfig": {
 		"access": "public"
@@ -14,7 +14,7 @@
 		"node": ">=14.18"
 	},
 	"11ty": {
-		"compatibility": ">=2.0.0-canary.16"
+		"compatibility": ">=2.0.0-canary.17"
 	},
 	"funding": {
 		"type": "opencollective",
@@ -38,8 +38,8 @@
 		]
 	},
 	"dependencies": {
-		"@11ty/eleventy": "^2.0.0-canary.16",
-		"@11ty/webc": "^0.6.0"
+		"@11ty/eleventy": "^2.0.0-canary.17",
+		"@11ty/webc": "^0.7.1"
 	},
 	"devDependencies": {
 		"ava": "^5.0.1"

package/src/eleventyWebcTemplate.js

@@ -1,7 +1,7 @@
 const path = require("path");
 
 const { EleventyRenderPlugin } = require("@11ty/eleventy");
-const EleventyRenderManager = EleventyRenderPlugin.RenderManager;
+const CompileString = EleventyRenderPlugin.String;
 
 const CodeManager = require("./codeManager.js");
 const WebCIncremental = require("./incremental.js");
@@ -22,19 +22,20 @@ function relativePath(inputPath, newGlob) {
 module.exports = function(eleventyConfig, options = {}) {
 	eleventyConfig.addTemplateFormats("webc");
 
-	let renderManager = new EleventyRenderManager();
 	let cssManager = new CodeManager();
 	let jsManager = new CodeManager();
 	let incremental = new WebCIncremental();
 	let componentsMap = false; // cache the glob search
 	let componentsMapKey;
+	let moduleScript;
 
 	eleventyConfig.on("eleventy.before", async () => {
 		cssManager.reset();
 		jsManager.reset();
 
 		// For ESM in CJS
-		let { WebC } = await import("@11ty/webc");
+		let { WebC, ModuleScript } = await import("@11ty/webc");
+		moduleScript = ModuleScript;
 		incremental.setWebC(WebC);
 
 		if(options.components) {
@@ -72,6 +73,7 @@ module.exports = function(eleventyConfig, options = {}) {
 			}
 
 			let {page, setup} = incremental.get(this.inputPath);
+
 			if(page && setup) {
 				let components = page.getComponents(setup);
 				if(components.includes(incrementalFilePath)) {
@@ -87,6 +89,14 @@ module.exports = function(eleventyConfig, options = {}) {
 			getCacheKey: function(contents, inputPath) {
 				// if global components change, recompile!
 				return contents + inputPath + componentsMapKey;
+			},
+			permalink: function(contents, inputPath) {
+				return (data) => {
+					return moduleScript.evaluateScript("permalink", contents, {
+						...this,
+						...data,
+					});
+				}
 			}
 		},
 
@@ -112,8 +122,10 @@ module.exports = function(eleventyConfig, options = {}) {
 			page.setTransform("11ty", async function(content) {
 				let syntax = this["11ty:type"];
 				if(syntax) {
-					let fn = await renderManager.compile(content, syntax);
-					return renderManager.render(fn, this, {});
+					let fn = await CompileString(content, syntax, {
+						templateConfig: eleventyConfig
+					});
+					return fn(this);
 				}
 				return content;
 			});
@@ -125,6 +137,10 @@ module.exports = function(eleventyConfig, options = {}) {
 					setupObject.components = WebC.getComponentsMap(relativePath(data.page.inputPath, data.webc.components));
 				}
 
+				if(options.before && typeof options.before === "function") {
+					await options.before(page);
+				}
+
 				let setup = await page.setup(setupObject);
 				incremental.addSetup(inputPath, setup);
 

package/src/incremental.js

@@ -26,10 +26,8 @@ class WebCIncremental {
 		// Explicitly disable bundler mode for layouts
 		if(this.layouts && this.layouts[inputPath]) {
 			page.setBundlerMode(false);
-			page.setReprocessingMode(false);
 		} else {
 			page.setBundlerMode(true);
-			page.setReprocessingMode(true);
 		}
 
 		page.setContent(inputContent, inputPath);