vite-plugin-twig-drupal 1.6.0 → 1.6.2

package/.github/workflows/node.js.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         node: [18, 20]
-        vite: [4, 5, 6]
+        vite: [4, 5, 6, 7]
     runs-on: ubuntu-latest
     steps:
       - name: 🛑 Cancel Previous Runs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-twig-drupal",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "Provides a ⚡️ Vite plugin to transform 🌱 Twig into HTML with a 💧 Drupal flavour",
   "keywords": [
     "Vite",
@@ -31,7 +31,7 @@
     "twig": "^1.16.0"
   },
   "peerDependencies": {
-    "vite": "^4.4.11 || ^5 || ^6"
+    "vite": "^4.4.11 || ^5 || ^6 || ^7"
   },
   "devDependencies": {
     "prettier": "^3.0.3",

package/src/index.js

@@ -171,7 +171,7 @@ const plugin = (options = {}) => {
           functions,
           code,
           includes,
-          seen = []
+          seen = {}
 
         try {
           const result = await compileTemplate(id, id, options).catch(
@@ -183,31 +183,36 @@ const plugin = (options = {}) => {
           }
           code = result.code
           includes = result.includes
-          const includePromises = []
-          const processIncludes = (template) => {
-            const file = resolveFile(
-              dirname(id),
-              resolveNamespaceOrComponent(options.namespaces, template)
-            )
-            if (!seen.includes(template)) {
-              includePromises.push(
-                new Promise(async (resolve, reject) => {
-                  const { includes, code } = await compileTemplate(
-                    template,
-                    file,
-                    options
-                  ).catch(errorHandler(template, false))
-                  if (includes) {
-                    includes.forEach(processIncludes)
+
+          // Process includes in a queue.
+          const promisifyIncludes = (includes) => {
+            return includes.reduce(
+              (queue, template) =>
+                queue.then(() => {
+                  const file = resolveFile(
+                    dirname(id),
+                    resolveNamespaceOrComponent(options.namespaces, template)
+                  )
+                  if (!(template in seen)) {
+                    return compileTemplate(template, file, options)
+                      .catch(errorHandler(template, false))
+                      .then(({ code, includes }) => {
+                        seen[template] = code
+                        if (!includes) {
+                          return Promise.resolve()
+                        }
+                        return promisifyIncludes(includes)
+                      })
                   }
-                  resolve(code)
-                })
-              )
-              seen.push(template)
-            }
+                  return Promise.resolve()
+                }),
+              Promise.resolve()
+            )
           }
-          includes.forEach(processIncludes)
-          embed = includes
+          const includeResult = await promisifyIncludes(includes).catch(
+            errorHandler(id)
+          )
+          embed = Object.keys(seen)
             .filter((template) => template !== "_self")
             .map(
               (template) =>
@@ -227,14 +232,11 @@ const plugin = (options = {}) => {
             })
             .join("\n")
 
-          const includeResult = await Promise.all(includePromises).catch(
-            errorHandler(id)
-          )
-          if (!Array.isArray(includeResult) && "map" in includeResult) {
+          if (includeResult !== undefined && "map" in includeResult) {
             // An error occurred.
             return includeResult
           }
-          embeddedIncludes = includeResult.reverse().join("\n")
+          embeddedIncludes = Object.values(seen).reverse().join("\n")
         } catch (e) {
           return errorHandler(id)(e)
         }

package/tests/__snapshots__/smoke.test.js.snap

@@ -38,6 +38,8 @@ exports[`Basic smoke test > Should cast default attributes to attributes 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div  class=\\"ponies\\">hey there</div>
+  All received
+  pony town
 "
 `;
 
@@ -84,6 +86,8 @@ exports[`Basic smoke test > Should support default attributes as a map 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div  class=\\"ponies\\">hey there</div>
+  All received
+  pony town
 "
 `;
 
@@ -125,6 +129,8 @@ exports[`Basic smoke test > Should support global context and functions 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div >hey there</div>
+  All received
+  pony town
 "
 `;
 
@@ -166,6 +172,8 @@ exports[`Basic smoke test > Should support includes 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div >hey there</div>
+  All received
+  pony town
 "
 `;
 
@@ -224,6 +232,8 @@ exports[`Basic smoke test > Should support nested SDC 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div >hey there</div>
+  All received
+  pony town
 "
 `;
 
@@ -265,5 +275,7 @@ exports[`Basic smoke test > Should support variables 1`] = `
 <div>atom badge from nested dir 🙌</div>
 <button>nested button 🙌</button>
 <div >hey there</div>
+  All received
+  pony town
 "
 `;

package/tests/fixtures/extend-level2.twig

@@ -0,0 +1 @@
+{{ title }}

package/tests/fixtures/extend-me.twig

@@ -0,0 +1,7 @@
+{% if variant == 'roger' %}
+  All received
+{% else %}
+  Not hearing you
+{% endif %}
+{% block content %}
+{% endblock %}

package/tests/fixtures/extender.twig

@@ -0,0 +1,5 @@
+{% set variant = 'roger' %}
+{% extends "extend-me.twig" %}
+{% block content %}
+  {% include "field.twig" %}
+{% endblock %}

package/tests/fixtures/field.twig

@@ -0,0 +1,2 @@
+{% set title = "pony town" %}
+{% extends "extend-level2.twig" %}

package/tests/fixtures/mockup.twig

@@ -27,3 +27,4 @@
   teaser: '🏆️ winning',
 } %}
 <div {{ attributes }}>hey there</div>
+{% include "extender.twig" %}

package/tests/smoke.test.js

@@ -67,4 +67,9 @@ describe("Basic smoke test", () => {
     expect(markup).toContain('class="ponies"')
     expect(markup).toContain("hey there")
   })
+  it("Should support extends", () => {
+    const markup = Markup()
+    expect(markup).toContain("All received")
+    expect(markup).toContain("pony town")
+  })
 })