@11ty/eleventy-plugin-webc 0.8.0 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@11ty/eleventy-plugin-webc",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"description": "WebC support for Eleventy adds for Single File Web Components",
 	"main": "eleventyWebcPlugin.js",
 	"scripts": {
@@ -14,7 +14,7 @@
 		"node": ">=14.18"
 	},
 	"11ty": {
-		"compatibility": ">=2.0.0-canary.17"
+		"compatibility": ">=2.0.0-canary.19"
 	},
 	"funding": {
 		"type": "opencollective",
@@ -38,10 +38,10 @@
 		]
 	},
 	"dependencies": {
-		"@11ty/eleventy": "^2.0.0-canary.18",
+		"@11ty/eleventy": "^2.0.0-canary.19",
 		"@11ty/webc": "^0.8.0"
 	},
 	"devDependencies": {
-		"ava": "^5.0.1"
+		"ava": "^5.1.0"
 	}
 }

package/src/eleventyWebcTemplate.js

@@ -4,7 +4,6 @@ const { EleventyRenderPlugin } = require("@11ty/eleventy");
 const CompileString = EleventyRenderPlugin.String;
 
 const CodeManager = require("./codeManager.js");
-const WebCIncremental = require("./incremental.js");
 const BundleAssetsToContent = require("./bundleAssets.js");
 
 function relativePath(inputPath, newGlob) {
@@ -25,9 +24,9 @@ module.exports = function(eleventyConfig, options = {}) {
 
 	let cssManager = new CodeManager();
 	let jsManager = new CodeManager();
-	let incremental = new WebCIncremental();
+
+	let _WebC;
 	let componentsMap = false; // cache the glob search
-	let componentsMapKey;
 	let moduleScript;
 
 	eleventyConfig.on("eleventy.before", async () => {
@@ -37,11 +36,10 @@ module.exports = function(eleventyConfig, options = {}) {
 		// For ESM in CJS
 		let { WebC, ModuleScript } = await import("@11ty/webc");
 		moduleScript = ModuleScript;
-		incremental.setWebC(WebC);
+		_WebC = WebC;
 
 		if(options.components) {
 			componentsMap = WebC.getComponentsMap(options.components);
-			componentsMapKey = JSON.stringify(componentsMap);
 		}
 	});
 
@@ -63,37 +61,10 @@ module.exports = function(eleventyConfig, options = {}) {
 		eleventyConfig.addFilter(options.filters.js, (url, bucket) => getJs(url, bucket));
 	}
 
-	eleventyConfig.on("eleventy.layouts", layouts => {
-		incremental.setLayouts(layouts);
-	});
-
 	eleventyConfig.addExtension("webc", {
 		outputFileExtension: "html",
 
-		isIncrementalMatch: function (incrementalFilePath) {
-			// Eleventy layouts don’t appear directly in the WebC component graph, so we use the `eleventy.layouts` map here
-			if(incremental.isFileUsingLayout(this.inputPath, incrementalFilePath)) {
-				return true;
-			}
-
-			let {page, setup} = incremental.get(this.inputPath);
-
-			if(page && setup) {
-				let components = page.getComponents(setup);
-				if(components.includes(incrementalFilePath)) {
-					return true;
-				}
-			}
-
-			return false;
-		},
-
 		compileOptions: {
-			cache: true,
-			getCacheKey: function(contents, inputPath) {
-				// if global components change, recompile!
-				return contents + inputPath + componentsMapKey;
-			},
 			permalink: function(contents, inputPath) {
 				return (data) => {
 					return moduleScript.evaluateScript("permalink", contents, {
@@ -105,7 +76,10 @@ module.exports = function(eleventyConfig, options = {}) {
 		},
 
 		compile: async function(inputContent, inputPath) {
-			let page = incremental.add(inputContent, inputPath);
+			let page = new _WebC();
+
+			page.setBundlerMode(true);
+			page.setContent(inputContent, inputPath);
 
 			if(componentsMap) {
 				page.defineComponents(componentsMap);
@@ -138,20 +112,19 @@ module.exports = function(eleventyConfig, options = {}) {
 				let setupObject = {
 					data,
 				};
+
 				if(data.webc?.components) {
-					let WebC = incremental.webc;
-					setupObject.components = WebC.getComponentsMap(relativePath(data.page.inputPath, data.webc.components));
+					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);
+				let { html, css, js, buckets, components } = await page.compile(setupObject);
 
-				let { ast, serializer } = setup;
-				let { html, css, js, buckets } = await serializer.compile(ast);
+				// 2.0.0-canary.19+
+				this.addDependencies(inputPath, components);
 
 				cssManager.addToPage(data.page.url, css, "default");
 

package/src/incremental.js

@@ -1,54 +0,0 @@
-class WebCIncremental {
-	constructor() {
-		this.pages = {};
-		this.setups = {};
-	}
-
-	setWebC(cls) {
-		this.webc = cls;
-	}
-
-	setLayouts(layouts) {
-		this.layouts = layouts;
-	}
-
-	isFileUsingLayout(templateFilePath, layoutFilePath) {
-		if(this.layouts && this.layouts[layoutFilePath] && this.layouts[layoutFilePath].includes(templateFilePath)) {
-			return true;
-		}
-		return false;
-	}
-
-	add(inputContent, inputPath) {
-		let WebC = this.webc;
-		let page = new WebC();
-
-		page.setBundlerMode(true);
-		page.setContent(inputContent, inputPath);
-
-		this.pages[inputPath] = page;
-
-		return page;
-	}
-
-	addSetup(inputPath, setup) {
-		this.setups[inputPath] = setup;
-	}
-
-	get(inputPath) {
-		let setup = this.setups[inputPath];
-		let components = setup.serializer.components;
-
-		if(setup && components) {
-			setup.serializer.restorePreparsedComponents(components);
-		}
-
-		return {
-			page: this.pages[inputPath],
-			setup,
-			components,
-		}
-	}
-}
-
-module.exports = WebCIncremental;