eleventy-plugin-vento 1.1.1 → 1.1.3

package/.github/actions/setup/action.yml

@@ -1,5 +1,5 @@
-name: Handle pnpm dependencies
-description: Cache and restore the dependencies with pnpm
+name: Setup
+description: Setup project with pnpm
 
 outputs:
   cache-hit:
@@ -17,7 +17,6 @@ runs:
       uses: actions/setup-node@v4
       with:
         node-version-file: .node-version
-        registry-url: 'https://registry.npmjs.org'
         cache: pnpm
         cache-dependency-path: pnpm-lock.yaml
 

package/.github/workflows/{ci.yaml → ci.yml}

@@ -2,8 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [renovate/**, dev]
+    branches: [renovate/**]
   workflow_dispatch:
+  workflow_call:
 
 jobs:
   ci:

package/.github/workflows/release.yml

@@ -2,35 +2,40 @@ name: Release
 
 on:
   push:
-    tags:
-      - 'v*.*.*'
+    branches:
+      - main
+      - alpha
+      - beta
+      - next
+      - next-major
+      - v[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.[0-9]+-[a-z]+.[0-9]+
 
 jobs:
+  test:
+    uses: ./.github/workflows/ci.yml
+
   release:
     runs-on: ubuntu-latest
     permissions:
-      id-token: write
-      contents: write
+      contents: write # to be able to publish a GitHub release
+      id-token: write # to enable use of OIDC for npm provenance
+      issues: write # to be able to comment on released issues
+      pull-requests: write # to be able to comment on released pull requests
+    needs: test
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Test
-        run: pnpm test
-
-      - name: Publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_CONFIG_PROVENANCE: true
-        run: |
-          pnpm publish --no-git-checks --access public
-
-      - name: Write changelog
-        run: pnpm dlx changelogithub@latest --output CHANGELOG.md
+      - name: Verify provenance attestations and registry signatures
+        run: npm audit signatures
 
       - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          body_path: CHANGELOG.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: pnpm exec semantic-release

package/VentoPlugin.js

@@ -49,15 +49,13 @@ export function VentoPlugin(eleventyConfig, options = {}) {
 	// Load user-defined plugins into vento
 	for (const plugin of options.plugins) env.use(plugin);
 
-	eleventyConfig.on('eleventy.before', () => {
-		env.cache.clear();
-	});
-
 	// Add vto as a template format and create a custom template for it
 	eleventyConfig.addTemplateFormats('vto');
 	eleventyConfig.addExtension('vto', {
 		outputFileExtension: 'html',
+
 		async compile(inputContent, inputPath) {
+			env.cache.clear();
 			return async (data) => {
 				if (options.addHelpers) {
 					// Extract a possible namespace from the addHelpers option
@@ -73,7 +71,9 @@ export function VentoPlugin(eleventyConfig, options = {}) {
 					else data = { ...data, ...helpers };
 				}
 
-				return await env.runString(inputContent, data, inputPath).then((result) => result.content);
+				const result = await env.runString(inputContent, data, inputPath);
+
+				return result.content;
 			};
 		},
 	});

package/package.json

@@ -1,46 +1,49 @@
 {
-  "name": "eleventy-plugin-vento",
-  "version": "1.1.1",
-  "description": "Adds support for the Vento templating language to Eleventy.",
-  "type": "module",
-  "engines": {
-    "node": ">=16"
-  },
-  "main": "./VentoPlugin.js",
-  "repository": "git@github.com:noelforte/eleventy-plugin-vento.git",
-  "bugs": {
-    "url": "https://github.com/noelforte/eleventy-plugin-vento/issues"
-  },
-  "keywords": [
-    "eleventy",
-    "eleventy-plugin",
-    "ventojs",
-    "templating"
-  ],
-  "author": {
-    "name": "Noel Forte",
-    "email": "noel@forte.is",
-    "url": "https://forte.is/"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "ventojs": "0.12.6"
-  },
-  "devDependencies": {
-    "eslint": "9.4.0",
-    "eslint-config-flat-gitignore": "0.1.5",
-    "eslint-config-prettier": "9.1.0",
-    "globals": "15.3.0",
-    "@11ty/eleventy": "3.0.0-alpha.10"
-  },
-  "prettier": {
-    "bracketSameLine": true,
-    "singleQuote": true,
-    "semi": true,
-    "trailingComma": "es5"
-  },
-  "scripts": {
-    "test": "rm -rf test/output; cd test/input; eleventy",
-    "test-serve": "rm -rf test/output; cd test/input; eleventy --serve"
-  }
-}
+	"name": "eleventy-plugin-vento",
+	"version": "1.1.3",
+	"description": "Adds support for the Vento templating language to Eleventy.",
+	"type": "module",
+	"packageManager": "pnpm@9.1.4",
+	"engines": {
+		"node": ">=16"
+	},
+	"scripts": {
+		"test": "rm -rf test/output; cd test/input; eleventy",
+		"test-serve": "rm -rf test/output; cd test/input; eleventy --serve"
+	},
+	"main": "./VentoPlugin.js",
+	"repository": "git@github.com:noelforte/eleventy-plugin-vento.git",
+	"bugs": {
+		"url": "https://github.com/noelforte/eleventy-plugin-vento/issues"
+	},
+	"keywords": [
+		"eleventy",
+		"eleventy-plugin",
+		"ventojs",
+		"templating"
+	],
+	"author": {
+		"name": "Noel Forte",
+		"email": "noel@forte.is",
+		"url": "https://forte.is/"
+	},
+	"license": "MIT",
+	"dependencies": {
+		"ventojs": "0.12.6"
+	},
+	"devDependencies": {
+		"@11ty/eleventy": "3.0.0-alpha.10",
+		"conventional-changelog-conventionalcommits": "^8.0.0",
+		"eslint": "9.4.0",
+		"eslint-config-flat-gitignore": "0.1.5",
+		"eslint-config-prettier": "9.1.0",
+		"globals": "15.3.0",
+		"semantic-release": "24.0.0"
+	},
+	"prettier": {
+		"bracketSameLine": true,
+		"singleQuote": true,
+		"semi": true,
+		"trailingComma": "es5"
+	}
+}

package/readme.md

@@ -6,6 +6,7 @@ An [Eleventy](https://11ty.dev/) plugin that adds support for [Vento](https://ve
 [Usage](#usage)<br>
 [Plugin Options](#plugin-options)<br>
 [Vento Filters](#vento-filters)<br>
+[Vento Plugins](#vento-plugins)<br>
 [JavaScript Helpers](#javascript-helpers)<br>
 
 ## Installing

package/release.config.js

@@ -0,0 +1,24 @@
+const presetConfig = {
+	types: [
+		{ type: 'feat', section: 'New Features' },
+		{ type: 'fix', section: 'Bug Fixes' },
+		{ type: 'refactor', section: 'Refactorings' },
+		{ type: 'docs', hidden: 'Documentation' },
+		{ type: 'chore', hidden: true },
+		{ type: 'perf', hidden: true },
+		{ type: 'style', hidden: true },
+		{ type: 'test', hidden: true },
+	],
+};
+
+/** @type {import('semantic-release').Options} */
+export default {
+	preset: 'conventionalcommits',
+	presetConfig,
+	plugins: [
+		['@semantic-release/commit-analyzer'],
+		'@semantic-release/release-notes-generator',
+		'@semantic-release/npm',
+		'@semantic-release/github',
+	],
+};

package/test/input/permalinks.vto

@@ -0,0 +1,7 @@
+---
+permalink: /test/page/permalink/
+title: Test page
+layout: page-layout.vto
+---
+
+This content lives at `/test/page/permalink/`

package/test/input/root.vto

@@ -0,0 +1,6 @@
+---
+permalink: /
+layout: page-layout.vto
+---
+
+This should render on the homepage.