eleventy-plugin-vento 4.5.0 → 4.6.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # eleventy-plugin-vento
 
+## 4.6.0-beta.0
+
+### Minor Changes
+
+- 5ed2cca: Update `ventojs` to v2
+
+## 4.5.1
+
+### Patch Changes
+
+- 1fbab3a: Update `ventojs` to 1.15.2
+
 ## 4.5.0
 
 ### Minor Changes
@@ -211,7 +223,7 @@
 
   While more verbose, this change ensures that there isn't any ambiguity between a tag that needs ignoring and JS negation expressions:
 
-  ```hbs
+  ```vto
   <!-- These are functionally equivalent and can lead to collisions in rendering functionality -->
 
   {{! conditionStatementToIgnore }}
@@ -333,7 +345,7 @@
 
   Of course, the big news is that **paired** shortcodes are now officially supported by this plugin!! Prior to this release, paired shortcodes were exposed just like regular shortcodes, but were plain JS functions. With this release you can now use paired shortcodes just like any other tag.
 
-  ```hbs
+  ```vto
   <!-- Before: everything is jammed into the function call :( -->
   {{ blockquote("<p>Call me Ishmael. Some years ago—never mind how long precisely—having little or no money in my purse, and nothing particular to interest me on shore, I thought I would sail about a little and see the watery part of the world.</p>\n<p>It is a way I have of driving off the spleen and regulating the circulation.</p>", "Herman Melville", "1851") }}
 
@@ -390,7 +402,7 @@
 
   Prior to this release this feature was referred to as the "SSR" or "hybrid-rendering" syntax. It's purpose was to skip over processing a tag like Vento's built-in `{{ echo }}` tag, but with a much shorter syntax: `{{! ... }}`. Any code following a `!` in your markup is wrapped in `{{ }}` and output as-is.
 
-  ```hbs
+  ```vto
   {{!> console.log('Hello world'); }} <!-- tag remains in output -->
   ```
 

package/dist/plugin.d.ts

@@ -1,7 +1,7 @@
 import UserConfig from '@11ty/eleventy/UserConfig';
 import { LiteralUnion } from 'type-fest';
 import * as ventojs from 'ventojs';
-import { Plugin } from 'ventojs/src/environment.js';
+import { Plugin } from 'ventojs/core/environment.js';
 
 interface PluginOptions {
     /**

package/dist/plugin.js

@@ -9,7 +9,8 @@ import createVentoEnv from "ventojs";
 function createVentoTag(tagInfo) {
   let LEVEL = 1;
   const IS_PAIRED = tagInfo.group === "pairedShortcodes";
-  const tag = (env, code, output, tokens) => {
+  const tag = (env, token, output, tokens) => {
+    const code = token[1];
     const match = code === tagInfo.name || code.startsWith(`${tagInfo.name} `);
     if (!match) {
       return;
@@ -28,12 +29,8 @@ function createVentoTag(tagInfo) {
       compiled.push(
         "{",
         `let ${nestedVarname} = "";`,
-        ...env.compileTokens(tokens, nestedVarname, [`/${tagInfo.name}`])
+        ...env.compileTokens(tokens, nestedVarname, `/${tagInfo.name}`)
       );
-      if (tokens.length > 0 && (tokens[0][0] !== "tag" || tokens[0][1] !== `/${tagInfo.name}`)) {
-        throw new Error(`Vento: Missing closing tag for ${tagInfo.name} tag: ${code}`);
-      }
-      tokens.shift();
     }
     args.unshift(thisArg);
     compiled.push(
@@ -90,8 +87,8 @@ function createVentoEngine(options) {
       env.tags.push(shortcodeTag);
     }
   }
-  function getTemplateFunction(source, file, useVentoCache = true) {
-    let template = env.cache.get(file);
+  async function getTemplateFunction(source, file, useVentoCache = true) {
+    let template = await env.cache.get(file);
     if ((template == null ? void 0 : template.source) === source) {
       debugCache("Cache HIT for `%s`, used precompiled template", file);
     } else {
@@ -218,21 +215,21 @@ function VentoPlugin(eleventyConfig, userOptions) {
   eleventyConfig.addExtension("vto", {
     outputFileExtension: "html",
     read: true,
-    compile(inputContent, inputPath) {
+    async compile(inputContent, inputPath) {
       inputPath = path.normalize(inputPath);
       debugMain("Getting template function for `%s`", inputPath);
-      const template = engine.getTemplateFunction(inputContent, inputPath, false);
+      const template = await engine.getTemplateFunction(inputContent, inputPath, false);
       return async (data) => await renderVentoTemplate(template, data, inputPath);
     },
     compileOptions: {
       // Custom permalink compilation
-      permalink(permalinkContent, inputPath) {
+      async permalink(permalinkContent, inputPath) {
         if (typeof permalinkContent !== "string" || !/\{\{\s+.+\s+\}\}/.test(permalinkContent)) {
           return permalinkContent;
         }
         inputPath = "Permalink::" + path.normalize(inputPath);
         debugMain("Getting template function for `%s`", inputPath);
-        const template = engine.getTemplateFunction(permalinkContent, inputPath);
+        const template = await engine.getTemplateFunction(permalinkContent, inputPath);
         return async (data) => await renderVentoTemplate(template, data, inputPath);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eleventy-plugin-vento",
-  "version": "4.5.0",
+  "version": "4.6.0-beta.0",
   "description": "Adds support for the Vento templating language to Eleventy.",
   "type": "module",
   "engines": {
@@ -37,26 +37,26 @@
   "license": "MIT",
   "dependencies": {
     "debug": "4.4.1",
-    "ventojs": "1.14.0"
+    "ventojs": "2.0.0-canary.3"
   },
   "devDependencies": {
-    "11ty.ts": "0.0.5",
-    "@11ty/eleventy": "3.1.1",
-    "@changesets/cli": "2.29.4",
-    "@eslint/js": "9.28.0",
+    "11ty.ts": "0.0.6",
+    "@11ty/eleventy": "3.1.2",
+    "@changesets/cli": "2.29.6",
+    "@eslint/js": "9.34.0",
     "@types/debug": "4.1.12",
-    "@types/node": "22.15.30",
-    "eslint": "9.28.0",
-    "eslint-config-prettier": "10.1.5",
-    "eslint-plugin-unicorn": "59.0.1",
-    "globals": "16.2.0",
-    "knip": "5.60.2",
+    "@types/node": "22.18.0",
+    "eslint": "9.34.0",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-unicorn": "60.0.0",
+    "globals": "16.3.0",
+    "knip": "5.63.0",
     "tsup": "8.5.0",
-    "tsx": "4.19.4",
+    "tsx": "4.20.5",
     "type-fest": "4.41.0",
-    "typescript": "5.8.3",
-    "typescript-eslint": "8.33.1",
-    "vitest": "3.2.2"
+    "typescript": "5.9.2",
+    "typescript-eslint": "8.40.0",
+    "vitest": "3.2.4"
   },
   "prettier": {
     "bracketSameLine": true,
@@ -66,10 +66,10 @@
   },
   "scripts": {
     "test": "vitest --run",
-    "check": "pnpm --color run '/^check:/'",
-    "check:lint": "eslint '.'",
-    "check:types": "tsc --noEmit",
-    "check:project": "knip",
+    "lint": "pnpm --color run '/^lint:/'",
+    "lint:syntax": "eslint '.'",
+    "lint:types": "tsc --noEmit",
+    "lint:project": "knip",
     "build": "tsup",
     "dev": "tsup --watch ./src",
     "ci:version": "changeset version && pnpm install --no-frozen-lockfile",

package/readme.md

@@ -77,7 +77,7 @@ View the [full list of options](https://vento.js.org/configuration/#options/) to
 > [!NOTE]
 > Remember, Vento can pipe any JS data type to any built-in global as the first-argument or any `.prototype` method in addition to declared filters. For instance to print the `eleventy` variable as JSON you could use the following snippet:
 >
-> ```nunjucks
+> ```vto
 > {{ eleventy |> JSON.stringify }}
 > ```
 >
@@ -120,13 +120,13 @@ Single and Paired Shortcodes added via Eleventy's `.addShortcode()`, `.addAsyncS
 
 When using shortcodes in your templates, write them like any other Vento tag:
 
-```nunjucks
+```vto
 {{ myShortcode }}
 ```
 
 To pass arguments, add a space and your arguments, comma-separated. Arguments are interpreted as JavaScript so type-safety should be considered (quote strings, use booleans if your shortcode expects them, etc.)
 
-```nunjucks
+```vto
 {{ myShortcode 'arg1', 'arg2' }}
 {{ myBooleanShortcode false, false, true }}
 {{ myNumberShortcode 10, 20, 0 }}
@@ -135,7 +135,7 @@ To pass arguments, add a space and your arguments, comma-separated. Arguments ar
 
 For paired shortcodes, the syntax is the same, just add a closing tag. Paired shortcodes also accept arguments and can re-process nested Vento tags (including other shortcodes).
 
-```nunjucks
+```vto
 {{ codeBlock 'css' }} <!-- takes arguments too -->
   a {
     color: red;