Merge branch 'perf-v3'

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@11ty/eleventy",
-	"version": "3.0.0",
+	"version": "3.0.1-alpha.1",
 	"description": "A simpler static site generator.",
 	"publishConfig": {
 		"access": "public",
@@ -117,7 +117,7 @@
 		"@11ty/dependency-tree-esm": "^1.0.0",
 		"@11ty/eleventy-dev-server": "^2.0.4",
 		"@11ty/eleventy-plugin-bundle": "^3.0.0",
-		"@11ty/eleventy-utils": "^1.0.3",
+		"@11ty/eleventy-utils": "2.0.0-alpha.2",
 		"@11ty/lodash-custom": "^4.17.21",
 		"@11ty/posthtml-urls": "^1.0.0",
 		"@11ty/recursive-copy": "^3.0.0",
@@ -144,7 +144,6 @@
 		"minimist": "^1.2.8",
 		"moo": "^0.5.2",
 		"node-retrieve-globals": "^6.0.0",
-		"normalize-path": "^3.0.0",
 		"nunjucks": "^3.2.4",
 		"please-upgrade-node": "^3.2.0",
 		"posthtml": "^0.16.6",

src/Data/TemplateData.js

@@ -66,10 +66,10 @@ class TemplateData {
 		return this.dataDir;
 	}
 
-	get _fsExistsCache() {
+	exists(pathname) {
 		// It's common for data files not to exist, so we avoid going to the FS to
 		// re-check if they do via a quick-and-dirty cache.
-		return this.eleventyConfig.existsCache;
+		return this.eleventyConfig.existsCache.exists(pathname);
 	}
 
 	setFileSystemSearch(fileSystemSearch) {
@@ -385,7 +385,7 @@ class TemplateData {
 		// Filter out files we know don't exist to avoid overhead for checking
 		const dataPaths = await Promise.all(
 			localDataPaths.map((path) => {
-				if (this._fsExistsCache.exists(path)) {
+				if (this.exists(path)) {
 					return path;
 				}
 				return false;
@@ -495,12 +495,7 @@ class TemplateData {
 
 		if (extension === "js" || extension === "cjs" || extension === "mjs") {
 			// JS data file or require’d JSON (no preprocessing needed)
-			let localPath = TemplatePath.absolutePath(path);
-			let exists = this._fsExistsCache.exists(localPath);
-			// Make sure that relative lookups benefit from cache
-			this._fsExistsCache.markExists(path, exists);
-
-			if (!exists) {
+			if (!this.exists(path)) {
 				return {};
 			}
 
@@ -515,7 +510,7 @@ class TemplateData {
 			}
 
 			// We always need to use `import()`, as `require` isn’t available in ESM.
-			let returnValue = await EleventyImport(localPath, type);
+			let returnValue = await EleventyImport(path, type);
 
 			// TODO special exception for Global data `permalink.js`
 			// module.exports = (data) => `${data.page.filePathStem}/`; // Does not work

src/Engines/JavaScript.js

@@ -208,7 +208,7 @@ class JavaScript extends TemplateEngine {
 		}
 
 		if (inst?.render) {
-			return function (data = {}) {
+			return (data = {}) => {
 				// TODO does this do anything meaningful for non-classes?
 				// `inst` should have a normalized `render` function from _getInstance
 
@@ -225,7 +225,7 @@ class JavaScript extends TemplateEngine {
 				Object.assign(inst, this.getJavaScriptFunctions(inst));
 
 				return this.normalize(inst.render.call(inst, data));
-			}.bind(this);
+			};
 		}
 	}
 

src/Plugins/RenderPlugin.js

@@ -58,12 +58,6 @@ async function compileFile(inputPath, options = {}, templateLang) {
 		throw new Error("Missing file path argument passed to the `renderFile` shortcode.");
 	}
 
-	if (!fs.existsSync(TemplatePath.normalizeOperatingSystemFilePath(inputPath))) {
-		throw new Error(
-			"Could not find render plugin file for the `renderFile` shortcode, looking for: " + inputPath,
-		);
-	}
-
 	let wasTemplateConfigMissing = false;
 	if (!templateConfig) {
 		templateConfig = new TemplateConfig(null, false);
@@ -77,6 +71,14 @@ async function compileFile(inputPath, options = {}, templateLang) {
 		await templateConfig.init();
 	}
 
+	let normalizedPath = TemplatePath.normalizeOperatingSystemFilePath(inputPath);
+	// Prefer the exists cache, if it’s available
+	if (!templateConfig.existsCache.exists(normalizedPath)) {
+		throw new Error(
+			"Could not find render plugin file for the `renderFile` shortcode, looking for: " + inputPath,
+		);
+	}
+
 	let tr = new TemplateRender(inputPath, templateConfig);
 	tr.extensionMap = extensionMap;
 

src/Template.js

@@ -1,8 +1,8 @@
 import util from "node:util";
 import os from "node:os";
 import path from "node:path";
+import fs from "node:fs";
 
-import fs from "graceful-fs";
 import lodash from "@11ty/lodash-custom";
 import { DateTime } from "luxon";
 import { TemplatePath, isPlainObject } from "@11ty/eleventy-utils";
@@ -25,6 +25,7 @@ import TemplateContentUnrenderedTemplateError from "./Errors/TemplateContentUnre
 import EleventyBaseError from "./Errors/EleventyBaseError.js";
 import ReservedData from "./Util/ReservedData.js";
 import TransformsUtil from "./Util/TransformsUtil.js";
+import { FileSystemManager } from "./Util/FileSystemManager.js";
 
 const { set: lodashSet, get: lodashGet } = lodash;
 const fsStat = util.promisify(fs.stat);
@@ -33,6 +34,8 @@ const debug = debugUtil("Eleventy:Template");
 const debugDev = debugUtil("Dev:Eleventy:Template");
 
 class Template extends TemplateContent {
+	#fsManager;
+
 	constructor(templatePath, templateData, extensionMap, config) {
 		debugDev("new Template(%o)", templatePath);
 		super(templatePath, config);
@@ -67,8 +70,11 @@ class Template extends TemplateContent {
 		this.templateData = templateData;
 	}
 
-	get existsCache() {
-		return this.eleventyConfig.existsCache;
+	get fsManager() {
+		if (!this.#fsManager) {
+			this.#fsManager = new FileSystemManager(this.eleventyConfig);
+		}
+		return this.#fsManager;
 	}
 
 	get logger() {
@@ -808,12 +814,12 @@ class Template extends TemplateContent {
 		let templateBenchmarkDir = this.bench.get("Template make parent directory");
 		templateBenchmarkDir.before();
 
-		let templateOutputDir = path.parse(outputPath).dir;
-		if (templateOutputDir) {
-			if (!this.existsCache.exists(templateOutputDir)) {
-				fs.mkdirSync(templateOutputDir, { recursive: true });
-			}
+		if (this.eleventyConfig.templateHandling?.writeMode === "async") {
+			await this.fsManager.createDirectoryForFile(outputPath);
+		} else {
+			this.fsManager.createDirectoryForFileSync(outputPath);
 		}
+
 		templateBenchmarkDir.after();
 
 		if (!Buffer.isBuffer(finalContent) && typeof finalContent !== "string") {
@@ -825,9 +831,11 @@ class Template extends TemplateContent {
 		let templateBenchmark = this.bench.get("Template Write");
 		templateBenchmark.before();
 
-		// Note: This deliberately uses the synchronous version to avoid
-		// unbounded concurrency: https://github.com/11ty/eleventy/issues/3271
-		fs.writeFileSync(outputPath, finalContent);
+		if (this.eleventyConfig.templateHandling?.writeMode === "async") {
+			await this.fsManager.writeFile(outputPath, finalContent);
+		} else {
+			this.fsManager.writeFileSync(outputPath, finalContent);
+		}
 
 		templateBenchmark.after();
 		this.writeCount++;

src/TemplateConfig.js

@@ -542,7 +542,6 @@ class TemplateConfig {
 	get existsCache() {
 		if (!this._existsCache) {
 			this._existsCache = new ExistsCache();
-			this._existsCache.setDirectoryCheck(true);
 		}
 		return this._existsCache;
 	}

src/TemplateLayoutPathResolver.js

@@ -71,7 +71,7 @@ class TemplateLayoutPathResolver {
 			return true;
 		}
 		let fullPath = this.eleventyConfig.directories.getLayoutPath(layoutPath);
-		if (fs.existsSync(fullPath)) {
+		if (this.eleventyConfig.existsCache.exists(fullPath)) {
 			return true;
 		}
 		return false;

src/TemplatePassthrough.js

@@ -18,7 +18,6 @@ const debug = debugUtil("Eleventy:TemplatePassthrough");
 class TemplatePassthroughError extends EleventyBaseError {}
 
 class TemplatePassthrough {
-	#isExistsCache = {};
 	#isDirectoryCache = {};
 
 	constructor(path, eleventyConfig) {
@@ -156,10 +155,7 @@ class TemplatePassthrough {
 	}
 
 	isExists(dir) {
-		if (this.#isExistsCache[dir] === undefined) {
-			this.#isExistsCache[dir] = fs.existsSync(dir);
-		}
-		return this.#isExistsCache[dir];
+		return this.eleventyConfig.existsCache.exists(dir);
 	}
 
 	isDirectory(dir) {