Merge pull request #31 from cgiesche/streamdeck-homeassistant-29

streamdeck-homeassistant-29 Replace ninja-js by nunjucks

.github/workflows/release.yml

@@ -45,5 +45,5 @@ jobs:
         with:
           upload_url: ${{ github.event.release.upload_url }}
           asset_path: ./release.zip
-          asset_name: StreamDeckHomeAssistant.streamDeckPlugin
+          asset_name: StreamDeckHomeAssistant-${{ steps.tagName.outputs.tag }}.streamDeckPlugin
           asset_content_type: application/zip

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "core-js": "^3.6.5",
-    "jinja-js": "^0.1.8",
+    "nunjucks": "^3.2.3",
     "vue": "^2.6.11"
   },
   "devDependencies": {

src/Plugin.vue

@@ -6,7 +6,7 @@
 import StreamDeck from "@/modules/common/streamdeck";
 import {Entity, Homeassistant} from "@/modules/common/homeassistant";
 import {IconFactory} from "@/modules/plugin/imageUtils";
-import jinja from "jinja-js"
+import nunjucks from "nunjucks"
 
 export default {
   name: 'Plugin',
@@ -173,7 +173,7 @@ export default {
         setButtonSVG(svg, currentContext)
 
         if (contextSettings.useCustomTitle) {
-          const customTitle = jinja.render(contextSettings.buttonTitle, {...{state}, ...stateAttributes})
+          const customTitle = nunjucks.renderString(contextSettings.buttonTitle, {...{state}, ...stateAttributes})
           this.$SD.setTitle(currentContext, customTitle);
         }
       }

src/modules/plugin/imageUtils.js

@@ -1,4 +1,4 @@
-import jinja from "jinja-js"
+import nunjucks from "nunjucks"
 
 const colors = {
     action: "#FFFFFF",
@@ -214,9 +214,9 @@ const Icon = {
     },
 
     labelledIcon: (state, attributes, templates = {}, image = "", labelTopOffset = 30) => {
-        const line1 = jinja.render(templates.line1 || "", {...{state}, ...attributes, ...{colors}})
-        const line2 = jinja.render(templates.line2 || "", {...{state}, ...attributes, ...{colors}})
-        const line3 = jinja.render(templates.line3 || "", {...{state}, ...attributes, ...{colors}})
+        const line1 = nunjucks.renderString(templates.line1 || "", {...{state}, ...attributes, ...{colors}})
+        const line2 = nunjucks.renderString(templates.line2 || "", {...{state}, ...attributes, ...{colors}})
+        const line3 = nunjucks.renderString(templates.line3 || "", {...{state}, ...attributes, ...{colors}})
 
         return `<svg width="144" height="144" xmlns="http://www.w3.org/2000/svg">
                     ${image}