vite-plugin-twig-drupal 1.6.2 → 1.6.4

package/.github/workflows/mr.js.yml

@@ -0,0 +1,40 @@
+name: validate
+on:
+  pull_request: {}
+jobs:
+  main:
+    strategy:
+      matrix:
+        node: [18, 20, 22]
+        vite: [4, 5, 6, 7, 8]
+        exclude:
+          - node: 18
+            vite: 7
+          - node: 18
+            vite: 8
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🛑 Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.9.0
+
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v2
+
+      - name: ⎔ Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: 📥 Download deps
+        uses: bahmutov/npm-install@v1
+        with:
+          useLockFile: false
+
+      - name: ⚡️ Setup vite
+        run: npm install vite@${{ matrix.vite }}
+
+      - name: 🧹 Linting
+        run: npm run lint
+
+      - name: ✅ Tests
+        run: npm run test

package/.github/workflows/release.js.yml

@@ -0,0 +1,41 @@
+name: Release
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read # for checkout
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      issues: write # to be able to comment on released issues
+      pull-requests: write # to be able to comment on released pull requests
+      id-token: write # to enable use of OIDC for trusted publishing and npm provenance
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+      - name: Install dependencies
+        run: npm install
+      - name: Verify the integrity of provenance attestations and registry signatures for installed dependencies
+        run: npm audit signatures
+      - name: Lint
+        run: npm run lint
+      - name: Test
+        run: npm run test
+      - name: Build
+        run: npm run build
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx semantic-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-twig-drupal",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Provides a ⚡️ Vite plugin to transform 🌱 Twig into HTML with a 💧 Drupal flavour",
   "keywords": [
     "Vite",
@@ -18,8 +18,7 @@
     "format": "prettier --write \"{test,src}/**/*.js\"",
     "lint": "prettier --check \"{test,src}/**/*.js\"",
     "test": "vitest run",
-    "pretest": "npm run-script build",
-    "semantic-release": "semantic-release"
+    "pretest": "npm run-script build"
   },
   "repository": {
     "type": "git",
@@ -31,11 +30,10 @@
     "twig": "^1.16.0"
   },
   "peerDependencies": {
-    "vite": "^4.4.11 || ^5 || ^6 || ^7"
+    "vite": "^4.4.11 || ^5 || ^6 || ^7 || ^8"
   },
   "devDependencies": {
     "prettier": "^3.0.3",
-    "semantic-release": "^22.0.5",
     "vite": "^4.4.11 || ^ 5",
     "vitest": "^0.34.6"
   }

package/src/index.js

@@ -146,9 +146,6 @@ const plugin = (options = {}) => {
         options.root = root
       }
     },
-    async shouldTransformCachedModule(src, id) {
-      return options.pattern.test(id)
-    },
     async transform(src, id) {
       if (options.pattern.test(id)) {
         let frameworkInclude = ""
@@ -189,10 +186,16 @@ const plugin = (options = {}) => {
             return includes.reduce(
               (queue, template) =>
                 queue.then(() => {
+                  // _self is a special Twig variable referring to the current
+                  // template — it is not a real file import.
+                  if (template === "_self") {
+                    return Promise.resolve()
+                  }
                   const file = resolveFile(
                     dirname(id),
                     resolveNamespaceOrComponent(options.namespaces, template)
                   )
+                  this.addWatchFile(file)
                   if (!(template in seen)) {
                     return compileTemplate(template, file, options)
                       .catch(errorHandler(template, false))

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

@@ -134,6 +134,20 @@ exports[`Basic smoke test > Should support global context and functions 1`] = `
 "
 `;
 
+exports[`Basic smoke test > Should support import _self for recursive macros 1`] = `
+"
+
+<nav>
+  <ul>
+      <li><a href=\\"/home\\">Home</a></li>
+
+      <li><a href=\\"/about\\">About</a></li>
+
+  </ul>
+</nav>
+"
+`;
+
 exports[`Basic smoke test > Should support includes 1`] = `
 "<section>
   <h1>Include</h1>

package/tests/fixtures/self-import.twig

@@ -0,0 +1,12 @@
+{% import _self as nav %}
+
+{% macro menu_link(title, href) %}
+  <li><a href="{{ href }}">{{ title }}</a></li>
+{% endmacro %}
+
+<nav>
+  <ul>
+    {{ nav.menu_link('Home', '/home') }}
+    {{ nav.menu_link('About', '/about') }}
+  </ul>
+</nav>

package/tests/smoke.test.js

@@ -3,6 +3,7 @@ import Error from "../dist/error.js"
 import ErrorInclude from "../dist/errorInclude.js"
 import drupalFunctions from "../dist/drupalFunctions.js"
 import Menu from "../dist/menu.js"
+import SelfImport from "../dist/selfImport.js"
 import { describe, expect, it } from "vitest"
 
 describe("Basic smoke test", () => {
@@ -72,4 +73,10 @@ describe("Basic smoke test", () => {
     expect(markup).toContain("All received")
     expect(markup).toContain("pony town")
   })
+  it("Should support import _self for recursive macros", () => {
+    const markup = SelfImport()
+    expect(markup).toContain("Home")
+    expect(markup).toContain("About")
+    expect(markup).toMatchSnapshot()
+  })
 })

package/vite.config.js

@@ -15,8 +15,10 @@ export default defineConfig({
           __dirname,
           "tests/fixtures/drupal-functions.twig"
         ),
+        selfImport: resolve(__dirname, "tests/fixtures/self-import.twig"),
       },
       name: "vite-plugin-twig-drupal",
+      formats: ["es"],
       fileName: (_, entry) => `${entry}.js`,
     },
   },

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

@@ -1,77 +0,0 @@
-name: validate
-on:
-  push:
-    branches:
-      - 'main'
-      - 'beta'
-  pull_request: {}
-jobs:
-  main:
-    strategy:
-      matrix:
-        node: [18, 20]
-        vite: [4, 5, 6, 7]
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.0
-
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v2
-
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: 📥 Download deps
-        uses: bahmutov/npm-install@v1
-        with:
-          useLockFile: false
-
-      - name: ⚡️ Setup vite
-        run: npm install vite@${{ matrix.vite }}
-
-      - name: 🧹 Linting
-        run: npm run lint
-
-      - name: ✅ Tests
-        run: npm run test
-
-  release:
-    needs: main
-    runs-on: ubuntu-latest
-    if:
-      ${{ github.repository == 'larowlan/vite-plugin-twig-drupal' &&
-      contains('refs/heads/main',github.ref) && github.event_name == 'push' }}
-    steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.9.0
-
-      - name: ⬇️ Checkout repo
-        uses: actions/checkout@v2
-
-      - name: ⎔ Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18
-
-      - name: 📥 Download deps
-        uses: bahmutov/npm-install@v1
-        with:
-          useLockFile: false
-
-      - name: 🏗 Run build script
-        run: npm run build
-
-      - name: 🚀 Release
-        uses: cycjimmy/semantic-release-action@v4
-        with:
-          semantic_version: 22
-          branches: |
-            [
-              'main'
-            ]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}