Merge branch 'main' into escape-flow

Author: sumitshinde-84

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         id: generate_token
         uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
         with:
-          app-id: ${{ secrets.GH_BOT_APP_ID }}
+          client-id: ${{ secrets.GH_BOT_APP_ID }}
           private-key: ${{ secrets.GH_BOT_APP_KEY }}
           owner: ${{ github.repository_owner }}
       - name: Check out FlowFuse/blueprint-library repository (to access the blueprints)

.github/workflows/test.yml

@@ -10,9 +10,13 @@ jobs:
         id: generate_token
         uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1
         with:
-          app-id: ${{ secrets.GH_BOT_APP_ID }}
-          private-key: ${{ secrets.GH_BOT_APP_KEY }}
+          client-id: ${{ secrets.GH_CI_READONLY_APP_ID }}
+          private-key: ${{ secrets.GH_CI_READONLY_APP_KEY }}
           owner: ${{ github.repository_owner }}
+          repositories: |
+            website
+            flowfuse
+            blueprint-library
       - name: Check out website repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -50,4 +54,3 @@ jobs:
       - uses: untitaker/hyperlink@fb5bb9c5011a3d143a54b4b30aedc30ec5bc0f89 # 0.2.0
         with:
           args: website/_site/ --check-anchors --sources website/src
-

package-lock.json

@@ -48,7 +48,7 @@
         "netlify-plugin-cache": "^1.0.3",
         "nodemon": "^2.0.20",
         "npm-run-all2": "^7.0.1",
-        "postcss": "^8.4.35",
+        "postcss": "^8.5.10",
         "postcss-cli": "^9.0.1",
         "postcss-import": "^14.0.2",
         "postcss-minify": "^1.1.0",
@@ -68,7 +68,7 @@
         "@11ty/eleventy-fetch": "^4.0.0",
         "@flowfuse/flow-renderer": "^0.5.0",
         "@netlify/blobs": "^10.3.0",
-        "@xmldom/xmldom": "^0.8.12",
+        "@xmldom/xmldom": "^0.8.13",
         "algoliasearch": "^4.25.3",
         "codeowners": "^5.1.1",
         "eleventy-plugin-toc": "^1.1.5",

package.json

@@ -66,6 +66,10 @@ module.exports = async () => {
                 node.categories.push("catalogue");
             }
 
+            const stripRelativeTags = (html) => html
+                .replace(/<link\b[^>]*?\bhref=(?:["']|&quot;)(?!https?:\/\/)[^"'>&]*(?:["']|&quot;)[^>]*\/?>/gi, '')
+                .replace(/<script\b[^>]*?\bsrc=(?:["']|&quot;)(?!https?:\/\/)[^"'>&]*(?:["']|&quot;)[^>]*>(?:[\s\S]*?<\/script>)?/gi, '');
+
             // Fetch full npm node details (readme, etc.)
             try {
                 const nodeDetails = await EleventyFetch(
@@ -133,12 +137,30 @@ module.exports = async () => {
                                                 }
                                             });
 
+                                            let sanitizedFlow = flowContent;
+                                            try {
+                                                const flowJson = JSON.parse(flowContent);
+                                                const sanitizeNode = (n) => {
+                                                    if (n && typeof n === 'object') {
+                                                        if (typeof n.template === 'string') n.template = stripRelativeTags(n.template);
+                                                        if (typeof n.html === 'string') n.html = stripRelativeTags(n.html);
+                                                    }
+                                                    return n;
+                                                };
+                                                if (Array.isArray(flowJson)) {
+                                                    flowJson.forEach(sanitizeNode);
+                                                } else {
+                                                    sanitizeNode(flowJson);
+                                                }
+                                                sanitizedFlow = JSON.stringify(flowJson);
+                                            } catch (_) { /* keep original if not valid JSON */ }
+
                                             return {
                                                 name: file.name.replace('.json', ''), // Remove .json extension for display
                                                 path: file.path,
                                                 url: file.html_url,
                                                 downloadUrl: file.download_url,
-                                                flow: flowContent // Store the actual flow JSON as string
+                                                flow: sanitizedFlow
                                             };
                                         } catch (err) {
                                             console.error(`Failed to fetch flow content for ${file.name}:`, err.message);
@@ -195,6 +217,7 @@ module.exports = async () => {
                                 return match;
                             }
                         );
+                    node.readme = stripRelativeTags(node.readme);
                 } else {
                     node.readme = "";
                 }

src/_data/integrations.js

@@ -1,26 +1,26 @@
 <div class="flex flex-wrap justify-center mt-12 md:mt-20">
     <div class="company-value">
         {% image "./images/pictograms/remote_blue.png", "Icon representing Fully Remote", [128] %}
-        <h5>Fully Remote</h5>
+        <h3>Fully Remote</h3>
     </div>
     <div class="company-value">
         {% image "./images/pictograms/vacation_blue.png", "Icon representing Unlimited Vacation", [128] %}
-        <h5>Unlimited Vacation</h5>
+        <h3>Unlimited Vacation</h3>
     </div>
     <div class="company-value">
         {% image "./images/pictograms/time_blue.png", "Icon representing Flexible Hours", [128] %}
-        <h5>Flexible Hours</h3>
+        <h3>Flexible Hours</h3>
     </div>
     <div class="company-value">
         {% image "./images/pictograms/education_blue.png", "Icon representing Education Budget", [128] %}
-        <h5>Education Budget</h5>
+        <h3>Education Budget</h3>
     </div>
     <div class="company-value">
         {% image "./images/pictograms/equipment_blue.png", "Icon representing Equipment", [128] %}
-        <h5>Equipment</h5>
+        <h3>Equipment</h3>
     </div>
     <div class="company-value">
         {% image "./images/pictograms/parental_leave_blue.png", "Icon representing Paid Parental Leave", [128] %}
-        <h5>Paid Parental Leave</h5>
+        <h3>Paid Parental Leave</h3>
     </div>
-</div>
+</div>

src/_includes/benefits.njk

@@ -1,5 +1,5 @@
 
-    <nav aria-labelledby="pagination" class="pagination mt-4">
+    <nav aria-label="Pagination" class="pagination mt-4">
         <ol class="flex flex-row w-full justify-between text-gray-600">
             <li class="flex md:flex-initial w-40 justify-start pl-2 ff-nav-blog-p"{% if not pagination.href.previous %} style="opacity: 0; pointer-events: none;"{% endif %}><a href="{{ pagination.href.previous }}">Previous</a></li>
             <li>

src/_includes/blog/pagination.njk

@@ -26,7 +26,7 @@
         <div class="prose">
             {% include "summary.njk" %}
         </div>
-        <a href="{{ item.url }}" class="group-hover:underline">read more...</a>
+        <a href="{{ item.url }}" class="group-hover:underline" aria-label="Read more about {{ item.data.title }}">read more...</a>
         {% else %}
         <div class="prose">
             {{ item.content | safe }}