Last second rename for #84

11ty · Jan 9, 2024 · 85fef01 · 85fef01
1 parent 292f4b7
commit 85fef01
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/src/Eleventy.js b/src/Eleventy.js
@@ -23,7 +23,7 @@ import { getEleventyPackageJson, getWorkingProjectPackageJson } from "./Util/Imp
 import RenderPlugin, * as RenderPluginExtras from "./Plugins/RenderPlugin.js";
 import I18nPlugin, * as I18nPluginExtras from "./Plugins/I18nPlugin.js";
 import HtmlBasePlugin, * as HtmlBasePluginExtras from "./Plugins/HtmlBasePlugin.js";
-import { TransformPlugin as PathToUrlTransformPlugin } from "./Plugins/PathToUrl.js";
+import { TransformPlugin as PathToUrlTransformPlugin } from "./Plugins/InputPathToUrl.js";
 
 const pkg = getEleventyPackageJson();
 const debug = debugUtil("Eleventy");

diff --git a/src/Plugins/PathToUrl.js → src/Plugins/InputPathToUrl.js b/src/Plugins/PathToUrl.js → src/Plugins/InputPathToUrl.js
@@ -33,16 +33,16 @@ function FilterPlugin(eleventyConfig) {
 		inputDir = input;
 	});
 
-	eleventyConfig.addFilter("pathToUrl", function (filepath) {
+	eleventyConfig.addFilter("inputPathToUrl", function (filepath) {
 		if (!contentMap) {
-			throw new Error("Internal error: contentMap not available for `pathToUrl` filter.");
+			throw new Error("Internal error: contentMap not available for `inputPathToUrl` filter.");
 		}
 
 		filepath = normalizeInputPath(filepath, inputDir, contentMap);
 
 		let urls = contentMap[filepath];
 		if (!urls || urls.length === 0) {
-			throw new Error("`pathToUrl` filter could not find a matching target for " + filepath);
+			throw new Error("`inputPathToUrl` filter could not find a matching target for " + filepath);
 		}
 
 		return urls[0];
@@ -69,7 +69,7 @@ function TransformPlugin(eleventyConfig, defaultOptions = {}) {
 
 	eleventyConfig.urlTransformer.add(opts.extensions, function (filepathOrUrl) {
 		if (!contentMap) {
-			throw new Error("Internal error: contentMap not available for `pathToUrl` Transform.");
+			throw new Error("Internal error: contentMap not available for the `pathToUrl` Transform.");
 		}
 		filepathOrUrl = normalizeInputPath(filepathOrUrl, inputDir, contentMap);
 

diff --git a/src/defaultConfig.js b/src/defaultConfig.js
@@ -3,7 +3,7 @@ import slugFilter from "./Filters/Slug.js";
 import slugifyFilter from "./Filters/Slugify.js";
 import getLocaleCollectionItem from "./Filters/GetLocaleCollectionItem.js";
 import getCollectionItemIndex from "./Filters/GetCollectionItemIndex.js";
-import { FilterPlugin as PathToUrlFilterPlugin } from "./Plugins/PathToUrl.js";
+import { FilterPlugin as InputPathToUrlFilterPlugin } from "./Plugins/InputPathToUrl.js";
 import { UrlTransformer } from "./Util/UrlTransformer.js";
 
 /**
@@ -90,14 +90,15 @@ export default function (config) {
 		return getLocaleCollectionItem.call(this, config, collection, pageOverride, langCode, 1);
 	});
 
+	// Used for the HTML <base> and InputPathToUrl plugins
 	let ut = new UrlTransformer();
 	config.urlTransformer = ut;
 	config.addTransform("eleventy.urlTransformer", async function (content) {
 		return ut.transformContent(this.outputPath, content, this);
 	});
 
 	// Maps an input path to output URL
-	config.addPlugin(PathToUrlFilterPlugin, {
+	config.addPlugin(InputPathToUrlFilterPlugin, {
 		immediate: true,
 	});
 

diff --git a/test/PathToUrlPluginTest.js → test/InputPathToUrlPluginTest.js b/test/PathToUrlPluginTest.js → test/InputPathToUrlPluginTest.js
@@ -1,6 +1,6 @@
 import test from "ava";
 
-import { TransformPlugin } from "../src/Plugins/PathToUrl.js";
+import { TransformPlugin } from "../src/Plugins/InputPathToUrl.js";
 import { default as HtmlBasePlugin } from "../src/Plugins/HtmlBasePlugin.js";
 import Eleventy from "../src/Eleventy.js";
 import { normalizeNewLines } from "./Util/normalizeNewLines.js";

diff --git a/test/stubs-pathtourl/filter.njk b/test/stubs-pathtourl/filter.njk
@@ -5,11 +5,11 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <title></title>
-<link rel="stylesheet" href="{{ 'css.njk' | pathToUrl }}">
-<script src="{{ 'css.njk' | pathToUrl }}"></script>
+<link rel="stylesheet" href="{{ 'css.njk' | inputPathToUrl }}">
+<script src="{{ 'css.njk' | inputPathToUrl }}"></script>
 </head>
 <body>
 <a href="/">Home</a>
-<a href="{{ 'tmpl.njk' | pathToUrl }}">Test</a>
+<a href="{{ 'tmpl.njk' | inputPathToUrl }}">Test</a>
 </body>
 </html>