diff --git a/mod.ts b/mod.ts index e830cbba..b7a43e1a 100644 --- a/mod.ts +++ b/mod.ts @@ -4,7 +4,7 @@ import url, { Options as UrlOptions } from "./plugins/url.ts"; import json, { Options as JsonOptions } from "./plugins/json.ts"; import markdown, { Options as MarkdownOptions } from "./plugins/markdown.ts"; import modules, { Options as ModulesOptions } from "./plugins/modules.ts"; -import nunjucks, { Options as NunjucksOptions } from "./plugins/nunjucks.ts"; +import vento, { Options as VentoOptions } from "./plugins/vento.ts"; import search, { Options as SearchOptions } from "./plugins/search.ts"; import paginate, { Options as PaginateOptions } from "./plugins/paginate.ts"; import toml, { Options as TomlOptions } from "./plugins/toml.ts"; @@ -19,7 +19,7 @@ export interface PluginOptions { json?: Partial; markdown?: Partial; modules?: Partial; - nunjucks?: Partial; + vento?: Partial; search?: Partial; paginate?: Partial; toml?: Partial; @@ -53,7 +53,7 @@ export default function lume( .use(json(pluginOptions.json)) .use(markdown(pluginOptions.markdown)) .use(modules(pluginOptions.modules)) - .use(nunjucks(pluginOptions.nunjucks)) + .use(vento(pluginOptions.vento)) .use(paginate(pluginOptions.paginate)) .use(search(pluginOptions.search)) .use(toml(pluginOptions.toml)) diff --git a/tests/__snapshots__/base_path.test.ts.snap b/tests/__snapshots__/base_path.test.ts.snap index 4dda5ebe..42e8b5c4 100644 --- a/tests/__snapshots__/base_path.test.ts.snap +++ b/tests/__snapshots__/base_path.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`base_path plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -93,7 +99,7 @@ snapshot[`base_path plugin 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", ], } `; @@ -193,7 +199,7 @@ snapshot[`base_path plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/build.test.ts.snap b/tests/__snapshots__/build.test.ts.snap index 54357d00..cca4ef42 100644 --- a/tests/__snapshots__/build.test.ts.snap +++ b/tests/__snapshots__/build.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a simple site 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -122,7 +128,7 @@ Content of Page 1", paginate: "paginate", search: [], tags: "Array(0)", - templateEngine: "njk", + templateEngine: "vto", title: "Page 1", url: "/dynamic.html", }, diff --git a/tests/__snapshots__/code_highlight.test.ts.snap b/tests/__snapshots__/code_highlight.test.ts.snap index ce79283f..89ccc981 100644 --- a/tests/__snapshots__/code_highlight.test.ts.snap +++ b/tests/__snapshots__/code_highlight.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`code_hightlight plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -94,7 +100,7 @@ snapshot[`code_hightlight plugin 1`] = ` src: [ "/", "/index.md", - "/other.njk", + "/other.vto", ], } `; @@ -204,7 +210,7 @@ p { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/other", remote: undefined, slug: "other", diff --git a/tests/__snapshots__/decap_cms.test.ts.snap b/tests/__snapshots__/decap_cms.test.ts.snap index af690452..68a02d49 100644 --- a/tests/__snapshots__/decap_cms.test.ts.snap +++ b/tests/__snapshots__/decap_cms.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Decap CMS plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/esbuild.test.ts.snap b/tests/__snapshots__/esbuild.test.ts.snap index 0a02d255..5eca1dab 100644 --- a/tests/__snapshots__/esbuild.test.ts.snap +++ b/tests/__snapshots__/esbuild.test.ts.snap @@ -69,7 +69,13 @@ snapshot[`esbuild plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -100,8 +106,8 @@ snapshot[`esbuild plugin 1`] = ` "/_includes", "/_includes/layout.js", "/data.json", - "/main.njk", "/main.ts", + "/main.vto", "/modules", "/modules/to_uppercase.ts", "/other.ts", @@ -188,7 +194,7 @@ document.querySelectorAll("h1")?.forEach((h1) => { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/main", remote: undefined, slug: "main", @@ -298,7 +304,13 @@ snapshot[`esbuild plugin with splitting as true 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -329,8 +341,8 @@ snapshot[`esbuild plugin with splitting as true 1`] = ` "/_includes", "/_includes/layout.js", "/data.json", - "/main.njk", "/main.ts", + "/main.vto", "/modules", "/modules/to_uppercase.ts", "/other.ts", @@ -436,7 +448,7 @@ document.querySelectorAll("h1")?.forEach((h1) => { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/main", remote: undefined, slug: "main", diff --git a/tests/__snapshots__/eta.test.ts.snap b/tests/__snapshots__/eta.test.ts.snap index 84e5faa5..8fdb845d 100644 --- a/tests/__snapshots__/eta.test.ts.snap +++ b/tests/__snapshots__/eta.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with eta 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/favicon.test.ts.snap b/tests/__snapshots__/favicon.test.ts.snap index 48c6887a..a57157c8 100644 --- a/tests/__snapshots__/favicon.test.ts.snap +++ b/tests/__snapshots__/favicon.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`favicon plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -100,7 +106,7 @@ snapshot[`favicon plugin 1`] = ` src: [ "/", "/favicon.svg", - "/index.njk", + "/index.vto", ], } `; @@ -223,7 +229,7 @@ snapshot[`favicon plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/feed.test.ts.snap b/tests/__snapshots__/feed.test.ts.snap index 8d4dcf64..9f7fb4ae 100644 --- a/tests/__snapshots__/feed.test.ts.snap +++ b/tests/__snapshots__/feed.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`RSS plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/filter_pages.test.ts.snap b/tests/__snapshots__/filter_pages.test.ts.snap index 6f524799..635c7f68 100644 --- a/tests/__snapshots__/filter_pages.test.ts.snap +++ b/tests/__snapshots__/filter_pages.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Filter pages (allow all) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -432,7 +438,13 @@ snapshot[`Filter pages (allow only /multiple/*) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/imagick.test.ts.snap b/tests/__snapshots__/imagick.test.ts.snap index 1c9dab42..2e6e45b3 100644 --- a/tests/__snapshots__/imagick.test.ts.snap +++ b/tests/__snapshots__/imagick.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`imagick plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/inline.test.ts.snap b/tests/__snapshots__/inline.test.ts.snap index 4bc0f2e2..b3f6af93 100644 --- a/tests/__snapshots__/inline.test.ts.snap +++ b/tests/__snapshots__/inline.test.ts.snap @@ -67,7 +67,13 @@ snapshot[`inline plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -108,10 +114,10 @@ snapshot[`inline plugin 1`] = ` src: [ "/", "/favicon.svg", - "/index.njk", + "/index.vto", "/other favicon.png", "/script.js", - "/styles.njk", + "/styles.vto", ], } `; @@ -292,7 +298,7 @@ const a = 1, _b = 1 < a, _c = a > 4; }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", @@ -377,7 +383,7 @@ const a = 1, _b = 1 < a, _c = a > 4; }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/styles", remote: undefined, slug: "styles", diff --git a/tests/__snapshots__/json.test.ts.snap b/tests/__snapshots__/json.test.ts.snap index 79ac4e1b..41066338 100644 --- a/tests/__snapshots__/json.test.ts.snap +++ b/tests/__snapshots__/json.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`JSON plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -95,7 +101,7 @@ snapshot[`JSON plugin 1`] = ` "/", "/_data.jsonc", "/_includes", - "/_includes/layout.njk", + "/_includes/layout.vto", "/index.page.json", "/page1.md", ], @@ -124,7 +130,7 @@ snapshot[`JSON plugin 3`] = ` children: "Content of the index", content: "Content of the index", date: [], - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", ], diff --git a/tests/__snapshots__/jsx.test.ts.snap b/tests/__snapshots__/jsx.test.ts.snap index 593c5d22..8f49d73f 100644 --- a/tests/__snapshots__/jsx.test.ts.snap +++ b/tests/__snapshots__/jsx.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with jsx/tsx modules 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/jsx_preact.test.ts.snap b/tests/__snapshots__/jsx_preact.test.ts.snap index 2d23f88d..d80ab666 100644 --- a/tests/__snapshots__/jsx_preact.test.ts.snap +++ b/tests/__snapshots__/jsx_preact.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with jsx/tsx modules using Preact 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -322,40 +328,6 @@ snapshot[`build a site with jsx/tsx modules using Preact 3`] = ` slug: "multiple", }, }, - { - content: " - -", - data: { - children: " -", - comp: [ - "_components", - "_proxies", - ], - content: "{{ comp.button('primary') | safe }} -", - date: [], - mergedKeys: [ - "tags", - ], - page: [ - "src", - "data", - ], - paginate: "paginate", - search: [], - tags: "Array(0)", - url: "/with-comp/", - }, - src: { - asset: false, - ext: ".njk", - path: "/with-comp", - remote: undefined, - slug: "with-comp", - }, - }, { content: ' This is the title

This is the title

This is a JSX page Go to home

', diff --git a/tests/__snapshots__/katex.test.ts.snap b/tests/__snapshots__/katex.test.ts.snap index 9450541f..c9259af0 100644 --- a/tests/__snapshots__/katex.test.ts.snap +++ b/tests/__snapshots__/katex.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Katex plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/layout.test.ts.snap b/tests/__snapshots__/layout.test.ts.snap index 951cec6a..7e4146cb 100644 --- a/tests/__snapshots__/layout.test.ts.snap +++ b/tests/__snapshots__/layout.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Layouts 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -100,8 +106,8 @@ snapshot[`Layouts 1`] = ` src: [ "/", "/_includes", - "/_includes/page.njk", - "/_includes/style.njk", + "/_includes/page.vto", + "/_includes/style.vto", "/index.md", "/styles.2.css", "/styles.css", @@ -127,7 +133,7 @@ snapshot[`Layouts 3`] = ` content: "# Hello world ", date: [], - layout: "page.njk", + layout: "page.vto", mergedKeys: [ "tags", ], @@ -191,7 +197,7 @@ snapshot[`Layouts 3`] = ` color: red; }", date: [], - layout: "style.njk", + layout: "style.vto", mergedKeys: [ "tags", ], diff --git a/tests/__snapshots__/lightningcss.test.ts.snap b/tests/__snapshots__/lightningcss.test.ts.snap index 9d196e07..69303258 100644 --- a/tests/__snapshots__/lightningcss.test.ts.snap +++ b/tests/__snapshots__/lightningcss.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`lightningcss plugin (only transform) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -240,7 +246,13 @@ snapshot[`lightningcss plugin (bundle mode) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/liquid.test.ts.snap b/tests/__snapshots__/liquid.test.ts.snap index 01d6e79b..f8b681f9 100644 --- a/tests/__snapshots__/liquid.test.ts.snap +++ b/tests/__snapshots__/liquid.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with liquid 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/loaders.test.ts.snap b/tests/__snapshots__/loaders.test.ts.snap index 64fabda4..c5321628 100644 --- a/tests/__snapshots__/loaders.test.ts.snap +++ b/tests/__snapshots__/loaders.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Load the pages of a site 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/markdown.test.ts.snap b/tests/__snapshots__/markdown.test.ts.snap index ee02b5fc..8c31024a 100644 --- a/tests/__snapshots__/markdown.test.ts.snap +++ b/tests/__snapshots__/markdown.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Build a markdown site 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -99,9 +105,9 @@ snapshot[`Build a markdown site 1`] = ` "/with-attributes.md", "/with-code.md", "/with-deflist.md", - "/with-filter.njk", + "/with-filter.vto", "/with-module.page.js", - "/with-nunjucks.md", + "/with-vento.md", ], } `; @@ -352,9 +358,9 @@ Other title

Welcome to this page

', - content: "

{{ title | md(true) | safe }}

+ content: "

{{ title |> md(true) }}

-
{{ description | md | safe }}
+
{{ description |> md }}
", date: [], description: "Welcome to this [page](/) @@ -374,7 +380,7 @@ Other title }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/with-filter", remote: undefined, slug: "with-filter", @@ -416,7 +422,7 @@ Other title { content: ' -

+

Module example

Foo

  • one: un
    • @@ -426,7 +432,7 @@ Other title ', data: { children: ' -

    +

    Module example

    Foo

    • one: un
      • @@ -439,9 +445,9 @@ Other title Foo -{% for title, no in myData %} +{{ for title, no of myData }} - {{ title }}: [{{ no }}](/items/{{ no }}.html) -{%- endfor %} +{{- /for }} ", date: [], mergedKeys: [ @@ -459,15 +465,16 @@ Foo paginate: "paginate", search: [], tags: "Array(0)", - templateEngine: "njk,md", - url: "/with-nunjucks/", + templateEngine: "vto,md", + title: "Module **example**", + url: "/with-vento/", }, src: { asset: false, ext: ".md", - path: "/with-nunjucks", + path: "/with-vento", remote: undefined, - slug: "with-nunjucks", + slug: "with-vento", }, }, ] @@ -538,7 +545,13 @@ snapshot[`Build a markdown with hooks 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -572,9 +585,9 @@ snapshot[`Build a markdown with hooks 1`] = ` "/with-attributes.md", "/with-code.md", "/with-deflist.md", - "/with-filter.njk", + "/with-filter.vto", "/with-module.page.js", - "/with-nunjucks.md", + "/with-vento.md", ], } `; @@ -825,9 +838,9 @@ Other title

      Welcome to this page

      ', - content: "

      {{ title | md(true) | safe }}

      + content: "

      {{ title |> md(true) }}

      -
      {{ description | md | safe }}
      +
      {{ description |> md }}
      ", date: [], description: "Welcome to this [page](/) @@ -847,7 +860,7 @@ Other title }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/with-filter", remote: undefined, slug: "with-filter", @@ -889,7 +902,7 @@ Other title { content: ' -

      +

      Module example

      Foo

      • one: un
        • @@ -899,7 +912,7 @@ Other title ', data: { children: ' -

        +

        Module example

        Foo

        • one: un
          • @@ -912,9 +925,9 @@ Other title Foo -{% for title, no in myData %} +{{ for title, no of myData }} - {{ title }}: [{{ no }}](/items/{{ no }}.html) -{%- endfor %} +{{- /for }} ", date: [], mergedKeys: [ @@ -932,15 +945,16 @@ Foo paginate: "paginate", search: [], tags: "Array(0)", - templateEngine: "njk,md", - url: "/with-nunjucks/", + templateEngine: "vto,md", + title: "Module **example**", + url: "/with-vento/", }, src: { asset: false, ext: ".md", - path: "/with-nunjucks", + path: "/with-vento", remote: undefined, - slug: "with-nunjucks", + slug: "with-vento", }, }, ] diff --git a/tests/__snapshots__/mdx.test.ts.snap b/tests/__snapshots__/mdx.test.ts.snap index d03a960e..92440ad6 100644 --- a/tests/__snapshots__/mdx.test.ts.snap +++ b/tests/__snapshots__/mdx.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Build a mdx site 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/metas.test.ts.snap b/tests/__snapshots__/metas.test.ts.snap index ecd8e68a..a14c73f3 100644 --- a/tests/__snapshots__/metas.test.ts.snap +++ b/tests/__snapshots__/metas.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`metas plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -94,8 +100,8 @@ snapshot[`metas plugin 1`] = ` src: [ "/", "/_data.yml", - "/page-1.njk", - "/page-2.njk", + "/page-1.vto", + "/page-2.vto", "/page-3.md", ], } @@ -174,7 +180,7 @@ snapshot[`metas plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/page-1", remote: undefined, slug: "page-1", @@ -249,7 +255,7 @@ snapshot[`metas plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/page-2", remote: undefined, slug: "page-2", diff --git a/tests/__snapshots__/minify_html.test.ts.snap b/tests/__snapshots__/minify_html.test.ts.snap index 7eeb9717..f95d0591 100644 --- a/tests/__snapshots__/minify_html.test.ts.snap +++ b/tests/__snapshots__/minify_html.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`minify_html plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -93,7 +99,7 @@ snapshot[`minify_html plugin 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", ], } `; @@ -184,7 +190,7 @@ snapshot[`minify_html plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/module.test.ts.snap b/tests/__snapshots__/module.test.ts.snap index c7f332fc..66d5f3f3 100644 --- a/tests/__snapshots__/module.test.ts.snap +++ b/tests/__snapshots__/module.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Build a site with js/ts modules 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/multilanguage.test.ts.snap b/tests/__snapshots__/multilanguage.test.ts.snap index 088810bf..ec1d82aa 100644 --- a/tests/__snapshots__/multilanguage.test.ts.snap +++ b/tests/__snapshots__/multilanguage.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`multilanguage plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -94,9 +100,9 @@ snapshot[`multilanguage plugin 1`] = ` src: [ "/", "/_includes", - "/_includes/layout.njk", + "/_includes/layout.vto", "/index.md", - "/other.njk", + "/other.vto", "/pages", "/pages/page1.md", "/pages/page1_en.md", @@ -193,10 +199,10 @@ snapshot[`multilanguage plugin 3`] = ` content: ' -

          Other page Link to index in Galego

          ', +

          Other page Link to index in Galego

          ', data: { alternates: "Array(2)", - children: '

          Other page Link to index in Galego

          ', + children: '

          Other page Link to index in Galego

          ', content: \`

          Other page Link to index in Galego

          \`, date: [], id: "other", @@ -220,7 +226,7 @@ snapshot[`multilanguage plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/other", remote: undefined, slug: "other", @@ -230,10 +236,10 @@ snapshot[`multilanguage plugin 3`] = ` content: ' -

          Other page Link to index in Galego

          ', +

          Other page Link to index in Galego

          ', data: { alternates: "Array(2)", - children: '

          Other page Link to index in Galego

          ', + children: '

          Other page Link to index in Galego

          ', content: \`

          Other page Link to index in Galego

          \`, date: [], id: "other", @@ -257,7 +263,7 @@ snapshot[`multilanguage plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/other", remote: undefined, slug: "other", @@ -410,7 +416,7 @@ snapshot[`multilanguage plugin 3`] = ` date: [], id: "page-1", lang: "gl", - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", "en", @@ -469,7 +475,7 @@ snapshot[`multilanguage plugin 3`] = ` date: [], id: "page-1", lang: "en", - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", "en", diff --git a/tests/__snapshots__/nav.test.ts.snap b/tests/__snapshots__/nav.test.ts.snap index 563fff1e..1de9578e 100644 --- a/tests/__snapshots__/nav.test.ts.snap +++ b/tests/__snapshots__/nav.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`nav plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -95,8 +101,8 @@ snapshot[`nav plugin 1`] = ` "/", "/_data.yml", "/_includes", - "/_includes/main.njk", - "/_includes/step.njk", + "/_includes/main.vto", + "/_includes/step.vto", "/docs", "/docs.md", "/docs/about-docs.md", @@ -104,7 +110,7 @@ snapshot[`nav plugin 1`] = ` "/docs/pages.md", "/docs/pages/first.md", "/docs/pages/second.md", - "/index.njk", + "/index.vto", ], } `; @@ -247,7 +253,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -406,7 +412,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", menu: true, mergedKeys: [ "tags", @@ -566,7 +572,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -727,7 +733,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -888,7 +894,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", menu: true, mergedKeys: [ "tags", @@ -1044,7 +1050,7 @@ snapshot[`nav plugin 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -1061,7 +1067,7 @@ snapshot[`nav plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", @@ -1135,7 +1141,13 @@ snapshot[`nav plugin with pretty urls disabled 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -1165,8 +1177,8 @@ snapshot[`nav plugin with pretty urls disabled 1`] = ` "/", "/_data.yml", "/_includes", - "/_includes/main.njk", - "/_includes/step.njk", + "/_includes/main.vto", + "/_includes/step.vto", "/docs", "/docs.md", "/docs/about-docs.md", @@ -1174,7 +1186,7 @@ snapshot[`nav plugin with pretty urls disabled 1`] = ` "/docs/pages.md", "/docs/pages/first.md", "/docs/pages/second.md", - "/index.njk", + "/index.vto", ], } `; @@ -1335,7 +1347,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -1512,7 +1524,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", menu: true, mergedKeys: [ "tags", @@ -1690,7 +1702,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -1869,7 +1881,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -2048,7 +2060,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", menu: true, mergedKeys: [ "tags", @@ -2220,7 +2232,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` children: "", content: "", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -2237,7 +2249,7 @@ snapshot[`nav plugin with pretty urls disabled 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/nunjucks.test.ts.snap b/tests/__snapshots__/nunjucks.test.ts.snap index ab87ed82..2c04aa7c 100644 --- a/tests/__snapshots__/nunjucks.test.ts.snap +++ b/tests/__snapshots__/nunjucks.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with nunjucks 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -90,6 +96,12 @@ snapshot[`build a site with nunjucks 1`] = ` loader: [AsyncFunction: yaml], pageType: "page", }, + { + engines: 1, + ext: ".njk", + loader: [AsyncFunction: text], + pageType: "page", + }, ], src: [ "/", diff --git a/tests/__snapshots__/pagefind.test.ts.snap b/tests/__snapshots__/pagefind.test.ts.snap index f2dd108f..abd0e616 100644 --- a/tests/__snapshots__/pagefind.test.ts.snap +++ b/tests/__snapshots__/pagefind.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Pagefind plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -94,7 +100,7 @@ snapshot[`Pagefind plugin 1`] = ` src: [ "/", "/_includes", - "/_includes/main.njk", + "/_includes/main.vto", "/index.md", "/page2.md", ], @@ -810,7 +816,7 @@ snapshot[`Pagefind plugin 3`] = ` This is the first page ", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], @@ -857,7 +863,7 @@ This is the first page This is the second page ", date: [], - layout: "main.njk", + layout: "main.vto", mergedKeys: [ "tags", ], diff --git a/tests/__snapshots__/picture.test.ts.snap b/tests/__snapshots__/picture.test.ts.snap index 887eb173..e8eb935a 100644 --- a/tests/__snapshots__/picture.test.ts.snap +++ b/tests/__snapshots__/picture.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`picture plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -111,7 +117,7 @@ snapshot[`picture plugin 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", "/kevin schmid unsplash.jpg", ], } @@ -254,7 +260,7 @@ snapshot[`picture plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/postcss.test.ts.snap b/tests/__snapshots__/postcss.test.ts.snap index 6b5e57b0..95712df3 100644 --- a/tests/__snapshots__/postcss.test.ts.snap +++ b/tests/__snapshots__/postcss.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`postcss plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -271,7 +277,13 @@ snapshot[`postcss plugin without includes 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -459,7 +471,13 @@ snapshot[`postcss plugin with hooks 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/pretty_urls.test.ts.snap b/tests/__snapshots__/pretty_urls.test.ts.snap index 903e63c7..6236fcc4 100644 --- a/tests/__snapshots__/pretty_urls.test.ts.snap +++ b/tests/__snapshots__/pretty_urls.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Disabled pretty URLs 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/prism.test.ts.snap b/tests/__snapshots__/prism.test.ts.snap index 8f482706..86178b76 100644 --- a/tests/__snapshots__/prism.test.ts.snap +++ b/tests/__snapshots__/prism.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Prism plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/pug.test.ts.snap b/tests/__snapshots__/pug.test.ts.snap index 3698b132..e8bd564a 100644 --- a/tests/__snapshots__/pug.test.ts.snap +++ b/tests/__snapshots__/pug.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with pug 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/relations.test.ts.snap b/tests/__snapshots__/relations.test.ts.snap index 8d98494e..add4580a 100644 --- a/tests/__snapshots__/relations.test.ts.snap +++ b/tests/__snapshots__/relations.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`relations plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -94,9 +100,9 @@ snapshot[`relations plugin 1`] = ` src: [ "/", "/_includes", - "/_includes/categories.njk", - "/_includes/comment.njk", - "/_includes/posts.njk", + "/_includes/categories.vto", + "/_includes/comment.vto", + "/_includes/posts.vto", "/categories", "/categories/_data.yml", "/categories/category-1.md", @@ -136,7 +142,7 @@ snapshot[`relations plugin 3`] = ` content: "This is the first category ", date: [], - layout: "categories.njk", + layout: "categories.vto", mergedKeys: [ "tags", ], @@ -180,7 +186,7 @@ snapshot[`relations plugin 3`] = ` content: "This is the second category ", date: [], - layout: "categories.njk", + layout: "categories.vto", mergedKeys: [ "tags", ], @@ -310,7 +316,7 @@ snapshot[`relations plugin 3`] = `

          First post with category 2 and comments 1 and 3

          - +

          Category:

          Category 2

          This is the second category

          @@ -318,7 +324,8 @@ snapshot[`relations plugin 3`] = `
            -
          ', +
        +', data: { category: [ "mergedKeys", @@ -345,7 +352,7 @@ snapshot[`relations plugin 3`] = ` ", date: [], id: "first-post", - layout: "posts.njk", + layout: "posts.vto", mergedKeys: [ "tags", ], @@ -373,7 +380,7 @@ snapshot[`relations plugin 3`] = `

        Second post with category 1 and comment 2

        - +

        Category:

        Category 1

        This is the first category

        @@ -381,7 +388,8 @@ snapshot[`relations plugin 3`] = `
          -
        ', +
      +', data: { category: [ "mergedKeys", @@ -409,7 +417,7 @@ snapshot[`relations plugin 3`] = ` ", date: [], id: "second-post", - layout: "posts.njk", + layout: "posts.vto", mergedKeys: [ "tags", ], diff --git a/tests/__snapshots__/relative_urls.test.ts.snap b/tests/__snapshots__/relative_urls.test.ts.snap index cad0ef12..144d7b4f 100644 --- a/tests/__snapshots__/relative_urls.test.ts.snap +++ b/tests/__snapshots__/relative_urls.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`relative_url plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -374,7 +380,13 @@ snapshot[`relative_url plugin when pretty urls disabled 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/remark.test.ts.snap b/tests/__snapshots__/remark.test.ts.snap index 7a034094..35194f63 100644 --- a/tests/__snapshots__/remark.test.ts.snap +++ b/tests/__snapshots__/remark.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Build a markdown site 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -98,9 +104,9 @@ snapshot[`Build a markdown site 1`] = ` "/with-attributes.md", "/with-code.md", "/with-deflist.md", - "/with-filter.njk", + "/with-filter.vto", "/with-module.page.js", - "/with-nunjucks.md", + "/with-vto.md", ], } `; @@ -275,9 +281,9 @@ Other title

      Welcome to this page

      ', - content: "

      {{ title | md(true) | safe }}

      + content: "

      {{ title |> md(true) }}

      -
      {{ description | md | safe }}
      +
      {{ description |> md }}
      ", date: [], description: "Welcome to this [page](/) @@ -297,7 +303,7 @@ Other title }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/with-filter", remote: undefined, slug: "with-filter", @@ -337,7 +343,7 @@ Other title { content: ' -

      +

      Module example

      Foo

      • one: un
        • @@ -346,7 +352,7 @@ Other title
      ', data: { children: ' -

      +

      Module example

      Foo

      • one: un
        • @@ -358,9 +364,9 @@ Other title Foo -{% for title, no in myData %} +{{ for title, no of myData }} - {{ title }}: [{{ no }}](/items/{{ no }}.html) -{%- endfor %} +{{- /for }} ", date: [], mergedKeys: [ @@ -378,15 +384,16 @@ Foo paginate: "paginate", search: [], tags: "Array(0)", - templateEngine: "njk,md", - url: "/with-nunjucks/", + templateEngine: "vto,md", + title: "Module **example**", + url: "/with-vto/", }, src: { asset: false, ext: ".md", - path: "/with-nunjucks", + path: "/with-vto", remote: undefined, - slug: "with-nunjucks", + slug: "with-vto", }, }, ] diff --git a/tests/__snapshots__/remote_files.test.ts.snap b/tests/__snapshots__/remote_files.test.ts.snap index 778862c2..b275d69f 100644 --- a/tests/__snapshots__/remote_files.test.ts.snap +++ b/tests/__snapshots__/remote_files.test.ts.snap @@ -69,7 +69,13 @@ snapshot[`render remote files 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -112,6 +118,12 @@ snapshot[`render remote files 1`] = ` ext: ".sass", pageType: "asset", }, + { + engines: 1, + ext: ".njk", + loader: [AsyncFunction: text], + pageType: "page", + }, ], src: [ "/", diff --git a/tests/__snapshots__/render_order.test.ts.snap b/tests/__snapshots__/render_order.test.ts.snap index 5854ee55..f41680ca 100644 --- a/tests/__snapshots__/render_order.test.ts.snap +++ b/tests/__snapshots__/render_order.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`render order property 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/resolve_urls.test.ts.snap b/tests/__snapshots__/resolve_urls.test.ts.snap index 822e9474..ab6f993e 100644 --- a/tests/__snapshots__/resolve_urls.test.ts.snap +++ b/tests/__snapshots__/resolve_urls.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`relative_url plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -451,7 +457,13 @@ snapshot[`relative_url plugin (without slugify) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/sass.test.ts.snap b/tests/__snapshots__/sass.test.ts.snap index 5352bf32..3757fad3 100644 --- a/tests/__snapshots__/sass.test.ts.snap +++ b/tests/__snapshots__/sass.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`sass plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/sheets.test.ts.snap b/tests/__snapshots__/sheets.test.ts.snap index a90b3a53..679f3241 100644 --- a/tests/__snapshots__/sheets.test.ts.snap +++ b/tests/__snapshots__/sheets.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Sheets plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -110,7 +116,7 @@ snapshot[`Sheets plugin 1`] = ` "/", "/_data", "/_data/attendance_numbers.numbers", - "/index.njk", + "/index.vto", ], } `; @@ -1245,18 +1251,18 @@ Daniels - {% for key, column in attendance_numbers[0] %} + {{ for key, column of attendance_numbers[0] }} - {% endfor %} + {{ /for }} - {% for row in attendance_numbers %} + {{ for row of attendance_numbers }} - {% for key, column in row %} + {{ for key, column of row }} - {% endfor %} + {{ /for }} - {% endfor %} + {{ /for }}
        {{ key }}
        {{ column }}
        ", @@ -1275,7 +1281,7 @@ Daniels }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/sitemap.test.ts.snap b/tests/__snapshots__/sitemap.test.ts.snap index f3ee4f99..20a603b3 100644 --- a/tests/__snapshots__/sitemap.test.ts.snap +++ b/tests/__snapshots__/sitemap.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Sitemap plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -567,7 +573,13 @@ snapshot[`Sitemap plugin with a multilanguage plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -596,9 +608,9 @@ snapshot[`Sitemap plugin with a multilanguage plugin 1`] = ` src: [ "/", "/_includes", - "/_includes/layout.njk", + "/_includes/layout.vto", "/index.md", - "/other.njk", + "/other.vto", "/pages", "/pages/page1.md", "/pages/page1_en.md", @@ -837,10 +849,10 @@ Sitemap: https://example.com/sitemap.xml", content: ' -

        Other page Link to index in Galego

        ', +

        Other page Link to index in Galego

        ', data: { alternates: "Array(2)", - children: '

        Other page Link to index in Galego

        ', + children: '

        Other page Link to index in Galego

        ', content: \`

        Other page Link to index in Galego

        \`, date: [], id: "other", @@ -864,7 +876,7 @@ Sitemap: https://example.com/sitemap.xml", }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/other", remote: undefined, slug: "other", @@ -874,10 +886,10 @@ Sitemap: https://example.com/sitemap.xml", content: ' -

        Other page Link to index in Galego

        ', +

        Other page Link to index in Galego

        ', data: { alternates: "Array(2)", - children: '

        Other page Link to index in Galego

        ', + children: '

        Other page Link to index in Galego

        ', content: \`

        Other page Link to index in Galego

        \`, date: [], id: "other", @@ -901,7 +913,7 @@ Sitemap: https://example.com/sitemap.xml", }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/other", remote: undefined, slug: "other", @@ -1054,7 +1066,7 @@ Sitemap: https://example.com/sitemap.xml", date: [], id: "page-1", lang: "gl", - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", "en", @@ -1113,7 +1125,7 @@ Sitemap: https://example.com/sitemap.xml", date: [], id: "page-1", lang: "en", - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", "en", diff --git a/tests/__snapshots__/slugify_urls.test.ts.snap b/tests/__snapshots__/slugify_urls.test.ts.snap index 5986aa78..a066bc94 100644 --- a/tests/__snapshots__/slugify_urls.test.ts.snap +++ b/tests/__snapshots__/slugify_urls.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`slugify_urls plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -362,7 +368,13 @@ snapshot[`slugify_urls plugin (static files) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/source_maps.test.ts.snap b/tests/__snapshots__/source_maps.test.ts.snap index dda42dc4..fb7f7ff5 100644 --- a/tests/__snapshots__/source_maps.test.ts.snap +++ b/tests/__snapshots__/source_maps.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Source maps from CSS files 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -356,7 +362,13 @@ snapshot[`Source maps from Js files 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -387,8 +399,8 @@ snapshot[`Source maps from Js files 1`] = ` "/_includes", "/_includes/layout.js", "/data.json", - "/main.njk", "/main.ts", + "/main.vto", "/modules", "/modules/to_uppercase.ts", "/other.ts", @@ -533,7 +545,7 @@ document.querySelectorAll("h1")?.forEach((h1) => { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/main", remote: undefined, slug: "main", diff --git a/tests/__snapshots__/static_files.test.ts.snap b/tests/__snapshots__/static_files.test.ts.snap index e8843c3a..be10043d 100644 --- a/tests/__snapshots__/static_files.test.ts.snap +++ b/tests/__snapshots__/static_files.test.ts.snap @@ -66,7 +66,13 @@ snapshot[`Copy static files 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/svgo.test.ts.snap b/tests/__snapshots__/svgo.test.ts.snap index a0863e9b..c797ae1a 100644 --- a/tests/__snapshots__/svgo.test.ts.snap +++ b/tests/__snapshots__/svgo.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`terser plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/symlinks.test.ts.snap b/tests/__snapshots__/symlinks.test.ts.snap index a5f54007..3df4bd81 100644 --- a/tests/__snapshots__/symlinks.test.ts.snap +++ b/tests/__snapshots__/symlinks.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`follow symlinks 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -90,6 +96,12 @@ snapshot[`follow symlinks 1`] = ` loader: [AsyncFunction: yaml], pageType: "page", }, + { + engines: 1, + ext: ".njk", + loader: [AsyncFunction: text], + pageType: "page", + }, ], src: [ "/", diff --git a/tests/__snapshots__/tailwindcss.test.ts.snap b/tests/__snapshots__/tailwindcss.test.ts.snap index 21601531..2b7ff6ab 100644 --- a/tests/__snapshots__/tailwindcss.test.ts.snap +++ b/tests/__snapshots__/tailwindcss.test.ts.snap @@ -67,7 +67,13 @@ snapshot[`postcss plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -101,7 +107,7 @@ snapshot[`postcss plugin 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", "/script.js", "/styles.css", ], @@ -915,7 +921,7 @@ snapshot[`postcss plugin 3`] = ` }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/terser.test.ts.snap b/tests/__snapshots__/terser.test.ts.snap index 328e9d68..6c240fc8 100644 --- a/tests/__snapshots__/terser.test.ts.snap +++ b/tests/__snapshots__/terser.test.ts.snap @@ -67,7 +67,13 @@ snapshot[`terser plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -96,7 +102,7 @@ snapshot[`terser plugin 1`] = ` src: [ "/", "/main.js", - "/numbers.njk", + "/numbers.vto", ], } `; @@ -166,7 +172,7 @@ export function two () { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/numbers", remote: undefined, slug: "numbers", diff --git a/tests/__snapshots__/toml.test.ts.snap b/tests/__snapshots__/toml.test.ts.snap index 1bc4195e..63d08efd 100644 --- a/tests/__snapshots__/toml.test.ts.snap +++ b/tests/__snapshots__/toml.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`TOML plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -95,7 +101,7 @@ snapshot[`TOML plugin 1`] = ` "/", "/_data.toml", "/_includes", - "/_includes/layout.njk", + "/_includes/layout.vto", "/index.toml", "/page1.md", ], @@ -124,7 +130,7 @@ snapshot[`TOML plugin 3`] = ` children: "Content of the index", content: "Content of the index", date: [], - layout: "layout.njk", + layout: "layout.vto", mergedKeys: [ "tags", ], diff --git a/tests/__snapshots__/unocss.test.ts.snap b/tests/__snapshots__/unocss.test.ts.snap index 92fbbdd4..e7b8f2e6 100644 --- a/tests/__snapshots__/unocss.test.ts.snap +++ b/tests/__snapshots__/unocss.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`Unocss plugin 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -93,7 +99,7 @@ snapshot[`Unocss plugin 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", ], } `; @@ -1421,7 +1427,7 @@ video { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", @@ -1495,7 +1501,13 @@ snapshot[`Unocss plugin (css file) 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -1523,7 +1535,7 @@ snapshot[`Unocss plugin (css file) 1`] = ` ], src: [ "/", - "/index.njk", + "/index.vto", ], } `; @@ -3389,7 +3401,7 @@ video { }, src: { asset: false, - ext: ".njk", + ext: ".vto", path: "/index", remote: undefined, slug: "index", diff --git a/tests/__snapshots__/url.test.ts.snap b/tests/__snapshots__/url.test.ts.snap index f93c51c4..e70b250b 100644 --- a/tests/__snapshots__/url.test.ts.snap +++ b/tests/__snapshots__/url.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`url and htmlUrl update href 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -275,7 +281,13 @@ snapshot[`configure url and htmlUrl names 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, diff --git a/tests/__snapshots__/vento.test.ts.snap b/tests/__snapshots__/vento.test.ts.snap index ddf4ebd9..33b7cc07 100644 --- a/tests/__snapshots__/vento.test.ts.snap +++ b/tests/__snapshots__/vento.test.ts.snap @@ -65,7 +65,13 @@ snapshot[`build a site with vento 1`] = ` }, { engines: 1, - ext: ".njk", + ext: ".vento", + loader: [AsyncFunction: text], + pageType: "page", + }, + { + engines: 1, + ext: ".vto", loader: [AsyncFunction: text], pageType: "page", }, @@ -90,18 +96,6 @@ snapshot[`build a site with vento 1`] = ` loader: [AsyncFunction: yaml], pageType: "page", }, - { - engines: 1, - ext: ".vento", - loader: [AsyncFunction: text], - pageType: "page", - }, - { - engines: 1, - ext: ".vto", - loader: [AsyncFunction: text], - pageType: "page", - }, ], src: [ "/", diff --git a/tests/assets/base_path/index.njk b/tests/assets/base_path/index.vto similarity index 100% rename from tests/assets/base_path/index.njk rename to tests/assets/base_path/index.vto diff --git a/tests/assets/code_highlight/other.njk b/tests/assets/code_highlight/other.vto similarity index 100% rename from tests/assets/code_highlight/other.njk rename to tests/assets/code_highlight/other.vto diff --git a/tests/assets/esbuild/main.njk b/tests/assets/esbuild/main.vto similarity index 100% rename from tests/assets/esbuild/main.njk rename to tests/assets/esbuild/main.vto diff --git a/tests/assets/favicon/index.njk b/tests/assets/favicon/index.vto similarity index 100% rename from tests/assets/favicon/index.njk rename to tests/assets/favicon/index.vto diff --git a/tests/assets/inline/index.njk b/tests/assets/inline/index.vto similarity index 100% rename from tests/assets/inline/index.njk rename to tests/assets/inline/index.vto diff --git a/tests/assets/inline/styles.njk b/tests/assets/inline/styles.vto similarity index 100% rename from tests/assets/inline/styles.njk rename to tests/assets/inline/styles.vto diff --git a/tests/assets/json/_includes/layout.njk b/tests/assets/json/_includes/layout.vto similarity index 100% rename from tests/assets/json/_includes/layout.njk rename to tests/assets/json/_includes/layout.vto diff --git a/tests/assets/json/index.page.json b/tests/assets/json/index.page.json index a753c774..08fafae7 100644 --- a/tests/assets/json/index.page.json +++ b/tests/assets/json/index.page.json @@ -2,5 +2,5 @@ "title": "Title of the index", "content": "Content of the index", "date": "1979-06-21T23:45:00.000Z", - "layout": "layout.njk" + "layout": "layout.vto" } diff --git a/tests/assets/layouts/_includes/page.njk b/tests/assets/layouts/_includes/page.vto similarity index 56% rename from tests/assets/layouts/_includes/page.njk rename to tests/assets/layouts/_includes/page.vto index aa92bc0b..19d536c1 100644 --- a/tests/assets/layouts/_includes/page.njk +++ b/tests/assets/layouts/_includes/page.vto @@ -1,5 +1,5 @@ - {{ content | safe }} + {{ content }} \ No newline at end of file diff --git a/tests/assets/layouts/_includes/style.njk b/tests/assets/layouts/_includes/style.njk deleted file mode 100644 index 1a30396b..00000000 --- a/tests/assets/layouts/_includes/style.njk +++ /dev/null @@ -1,3 +0,0 @@ -body.style { - {{ content | safe }} -} \ No newline at end of file diff --git a/tests/assets/layouts/_includes/style.vto b/tests/assets/layouts/_includes/style.vto new file mode 100644 index 00000000..0444875c --- /dev/null +++ b/tests/assets/layouts/_includes/style.vto @@ -0,0 +1,3 @@ +body.style { + {{ content }} +} \ No newline at end of file diff --git a/tests/assets/layouts/index.md b/tests/assets/layouts/index.md index 414137c9..2f619cb5 100644 --- a/tests/assets/layouts/index.md +++ b/tests/assets/layouts/index.md @@ -1,5 +1,5 @@ --- -layout: page.njk +layout: page.vto --- # Hello world diff --git a/tests/assets/layouts/styles.2.css b/tests/assets/layouts/styles.2.css index 5349bbc9..d347f7d2 100644 --- a/tests/assets/layouts/styles.2.css +++ b/tests/assets/layouts/styles.2.css @@ -1,5 +1,5 @@ --- -layout: style.njk +layout: style.vto --- p { color: red; diff --git a/tests/assets/markdown/with-filter.njk b/tests/assets/markdown/with-filter.njk deleted file mode 100644 index 40e62297..00000000 --- a/tests/assets/markdown/with-filter.njk +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: Module **example** -description: | - Welcome to this [page](/) ---- - -

        {{ title | md(true) | safe }}

        - -
        {{ description | md | safe }}
        diff --git a/tests/assets/markdown/with-filter.vto b/tests/assets/markdown/with-filter.vto new file mode 100644 index 00000000..556c2e87 --- /dev/null +++ b/tests/assets/markdown/with-filter.vto @@ -0,0 +1,9 @@ +--- +title: Module **example** +description: | + Welcome to this [page](/) +--- + +

        {{ title |> md(true) }}

        + +
        {{ description |> md }}
        diff --git a/tests/assets/remark/with-nunjucks.md b/tests/assets/markdown/with-vento.md similarity index 62% rename from tests/assets/remark/with-nunjucks.md rename to tests/assets/markdown/with-vento.md index 5c3e3c74..8f2eadd1 100644 --- a/tests/assets/remark/with-nunjucks.md +++ b/tests/assets/markdown/with-vento.md @@ -1,5 +1,6 @@ --- -templateEngine: njk,md +title: Module **example** +templateEngine: vto,md myData: one: un two: dous @@ -10,6 +11,6 @@ myData: Foo -{% for title, no in myData %} +{{ for title, no of myData }} - {{ title }}: [{{ no }}](/items/{{ no }}.html) -{%- endfor %} +{{- /for }} diff --git a/tests/assets/metas/page-1.njk b/tests/assets/metas/page-1.vto similarity index 100% rename from tests/assets/metas/page-1.njk rename to tests/assets/metas/page-1.vto diff --git a/tests/assets/metas/page-2.njk b/tests/assets/metas/page-2.vto similarity index 100% rename from tests/assets/metas/page-2.njk rename to tests/assets/metas/page-2.vto diff --git a/tests/assets/minify_html/index.njk b/tests/assets/minify_html/index.vto similarity index 100% rename from tests/assets/minify_html/index.njk rename to tests/assets/minify_html/index.vto diff --git a/tests/assets/multilanguage/_includes/layout.njk b/tests/assets/multilanguage/_includes/layout.vto similarity index 63% rename from tests/assets/multilanguage/_includes/layout.njk rename to tests/assets/multilanguage/_includes/layout.vto index 01b4274c..f0a0b099 100644 --- a/tests/assets/multilanguage/_includes/layout.njk +++ b/tests/assets/multilanguage/_includes/layout.vto @@ -1,11 +1,11 @@ -{% for item in results %} +{{ for item of results }}
      • {{ item.title }}
        • -{% endfor %} +{{ /for }}
      \ No newline at end of file diff --git a/tests/assets/multilanguage/other.njk b/tests/assets/multilanguage/other.vto similarity index 100% rename from tests/assets/multilanguage/other.njk rename to tests/assets/multilanguage/other.vto diff --git a/tests/assets/multilanguage/pagination.page.js b/tests/assets/multilanguage/pagination.page.js index 9a4802d4..aab2b9d5 100644 --- a/tests/assets/multilanguage/pagination.page.js +++ b/tests/assets/multilanguage/pagination.page.js @@ -1,4 +1,4 @@ -export const layout = "layout.njk"; +export const layout = "layout.vto"; export default function* ({ search, paginate }) { for (const p of paginate(search.pages("lang=gl", "url=asc"))) { diff --git a/tests/assets/nav/_data.yml b/tests/assets/nav/_data.yml index 1f6d5453..b00102d1 100644 --- a/tests/assets/nav/_data.yml +++ b/tests/assets/nav/_data.yml @@ -1 +1 @@ -layout: main.njk \ No newline at end of file +layout: main.vto \ No newline at end of file diff --git a/tests/assets/nav/_includes/main.njk b/tests/assets/nav/_includes/main.njk deleted file mode 100644 index 71c30bfd..00000000 --- a/tests/assets/nav/_includes/main.njk +++ /dev/null @@ -1,37 +0,0 @@ - - - {{ title }} - - - - - -

      {{ title }}

      - - - - - - \ No newline at end of file diff --git a/tests/assets/nav/_includes/main.vto b/tests/assets/nav/_includes/main.vto new file mode 100644 index 00000000..5a63c9e2 --- /dev/null +++ b/tests/assets/nav/_includes/main.vto @@ -0,0 +1,37 @@ + + + {{ title }} + + + + + +

      {{ title }}

      + + + + + + \ No newline at end of file diff --git a/tests/assets/nav/_includes/step.njk b/tests/assets/nav/_includes/step.njk deleted file mode 100644 index 571841fd..00000000 --- a/tests/assets/nav/_includes/step.njk +++ /dev/null @@ -1,15 +0,0 @@ -{% if item.data %} -{{ item.data.title }} -{% else %} -{{ item.slug }} -{% endif %} - -{% ifAsync item.children %} -
        - {% asyncEach item in item.children %} -
      • - {% include "./step.njk" %} -
        • - {% endeach %} -
      -{% endif %} diff --git a/tests/assets/nav/_includes/step.vto b/tests/assets/nav/_includes/step.vto new file mode 100644 index 00000000..a0013d6b --- /dev/null +++ b/tests/assets/nav/_includes/step.vto @@ -0,0 +1,15 @@ +{{ if item.data }} +{{ item.data.title }} +{{ else }} +{{ item.slug }} +{{ /if }} + +{{ if item.children }} +
        + {{ for child of item.children }} +
      • + {{ include "./step.vto" { item: child } }} +
        • + {{ /for }} +
      +{{ /if }} diff --git a/tests/assets/nav/index.njk b/tests/assets/nav/index.vto similarity index 100% rename from tests/assets/nav/index.njk rename to tests/assets/nav/index.vto diff --git a/tests/assets/pagefind/_includes/main.njk b/tests/assets/pagefind/_includes/main.vto similarity index 92% rename from tests/assets/pagefind/_includes/main.njk rename to tests/assets/pagefind/_includes/main.vto index e19f0033..8d33db16 100644 --- a/tests/assets/pagefind/_includes/main.njk +++ b/tests/assets/pagefind/_includes/main.vto @@ -8,6 +8,6 @@ - {{ content | safe }} + {{ content }} diff --git a/tests/assets/pagefind/index.md b/tests/assets/pagefind/index.md index 5abba4a7..9912ed56 100644 --- a/tests/assets/pagefind/index.md +++ b/tests/assets/pagefind/index.md @@ -1,6 +1,6 @@ --- title: First page -layout: main.njk +layout: main.vto --- # Hello world diff --git a/tests/assets/pagefind/page2.md b/tests/assets/pagefind/page2.md index 1b60ecb4..1de8b68c 100644 --- a/tests/assets/pagefind/page2.md +++ b/tests/assets/pagefind/page2.md @@ -1,6 +1,6 @@ --- title: Second page -layout: main.njk +layout: main.vto --- # Other page diff --git a/tests/assets/picture/index.njk b/tests/assets/picture/index.vto similarity index 100% rename from tests/assets/picture/index.njk rename to tests/assets/picture/index.vto diff --git a/tests/assets/reading_info/_includes/layout.njk b/tests/assets/reading_info/_includes/layout.vto similarity index 89% rename from tests/assets/reading_info/_includes/layout.njk rename to tests/assets/reading_info/_includes/layout.vto index d901576d..aa2e5564 100644 --- a/tests/assets/reading_info/_includes/layout.njk +++ b/tests/assets/reading_info/_includes/layout.vto @@ -1,6 +1,6 @@ - {{ content | safe }} + {{ content }}