@apleasantview/eleventy-plugin-baseline 0.1.0-next.20 → 0.1.0-next.22

package/eleventy.config.js

@@ -7,8 +7,9 @@ import shortcodes from "./core/shortcodes.js";
 import { eleventyImageOnRequestDuringServePlugin } from "@11ty/eleventy-img";
 
 import { createRequire } from "node:module";
-const require = createRequire(import.meta.url);
-const { version } = require("./package.json");
+const __require = createRequire(import.meta.url);
+
+const { name, version } = __require("./package.json");
 
 /**
  * Eleventy Plugin Baseline.
@@ -23,11 +24,11 @@ const { version } = require("./package.json");
  * @property {Object} [assetsESBuild] Options forwarded to assets-esbuild (minify/target).
  *
  * @param {BaselineOptions} [options={}] Custom options for the plugin.
- * @returns {(eleventyConfig: UserConfig) => void}
+ * @returns {(eleventyConfig: import("@11ty/eleventy").UserConfig) => Promise<void>}
  */
 export default function baseline(options = {}) {
 	/** @param {import("@11ty/eleventy").UserConfig} eleventyConfig */
-	return async function (eleventyConfig) {
+	const plugin = async function (eleventyConfig) {
 		try {
 			// Emit a warning message if the application is not using Eleventy 3.0 or newer (including prereleases).
 			eleventyConfig.versionCheck(">=3.0");
@@ -38,13 +39,16 @@ export default function baseline(options = {}) {
 		const hasImageTransformPlugin = eleventyConfig.hasPlugin("eleventyImageTransformPlugin");
 
 		const userOptions = {
-			version: version,
+			version,
+			name,
 			verbose: options.verbose ?? false,
+			hasImageTransformPlugin,
 			enableNavigatorTemplate: options.enableNavigatorTemplate ?? false,
 			enableSitemapTemplate: options.enableSitemapTemplate ?? true,
+			assets: {
+				esbuild: options.assetsESBuild ?? { minify: true, target: "es2020" }
+			},
 			multilingual: options.multilingual ?? false,
-			assetsESBuild: options.assetsESBuild ?? { minify: true, target: "es2020" },
-			hasImageTransformPlugin,
 			...options
 		};
 
@@ -79,7 +83,7 @@ export default function baseline(options = {}) {
 		eleventyConfig.addPlugin(modules.EleventyHtmlBasePlugin, { baseHref: process.env.URL || eleventyConfig.pathPrefix });
 		eleventyConfig.addPlugin(modules.assetsCore);
 		eleventyConfig.addPlugin(modules.assetsPostCSS);
-		eleventyConfig.addPlugin(modules.assetsESBuild, userOptions.assetsESBuild);
+		eleventyConfig.addPlugin(modules.assetsESBuild, userOptions.assets.esbuild);
 		eleventyConfig.addPlugin(modules.headCore);
 		eleventyConfig.addPlugin(modules.sitemapCore, { enableSitemapTemplate: userOptions.enableSitemapTemplate, multilingual: isMultilingual, languages });
 
@@ -100,6 +104,10 @@ export default function baseline(options = {}) {
 		eleventyConfig.addFilter("_keys", debug.keys);
 		eleventyConfig.addPlugin(modules.navigatorCore, { enableNavigatorTemplate: userOptions.enableNavigatorTemplate });
 	};
+
+	// Set plugin name so `eleventyConfig.hasPlugin()` can detect it.
+	Object.defineProperty(plugin, "name", { value: `${name}` });
+	return plugin;
 }
 
 export const config = {

package/modules/assets-core/plugins/assets-core.js

@@ -68,9 +68,12 @@ export default function assetsCore(eleventyConfig, options = {}) {
 
 	eleventyConfig.addGlobalData("_baseline.assets", () => {
 		ensureCache(cache, eleventyConfig, rawDir, verbose);
+		// Merge with existing _baseline.assets (e.g., esbuild config)
+		const existing = eleventyConfig.globalData?._baseline?.assets || {};
 		return {
 			input: cache.assetsInput,
-			output: cache.assetsOutput
+			output: cache.assetsOutput,
+			...existing
 		};
 	});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apleasantview/eleventy-plugin-baseline",
-  "version": "0.1.0-next.20",
+  "version": "0.1.0-next.22",
   "description": "An experimental Swiss army knife toolkit for Eleventy",
   "type": "module",
   "main": "eleventy.config.js",