Merge pull request #45 from nelsonihc/master

Scrum · web-flow · commit 460db756d79a · 2021-12-07T11:29:02.000+03:00
fix: locals in inherited layout
diff --git a/src/index.js b/src/index.js
@@ -47,12 +47,13 @@ function handleExtendsNodes(tree, options, messages) {
         locals = JSON.parse(extendsNode.attrs.locals);
       } catch {}
     }
+
     options.expressions.locals = merge(options.expressions.locals, locals);
-    options.plugins.push(expressions(options.expressions));
+    const plugins = [...options.plugins, expressions(options.expressions)];
 
     const layoutPath = path.resolve(options.root, extendsNode.attrs.src);
     const layoutHtml = fs.readFileSync(layoutPath, options.encoding);
-    const layoutTree = handleExtendsNodes(applyPluginsToTree(parseToPostHtml(layoutHtml), options.plugins), options, messages);
+    const layoutTree = handleExtendsNodes(applyPluginsToTree(parseToPostHtml(layoutHtml), plugins), options, messages);
 
     extendsNode.tag = false;
     extendsNode.content = mergeExtendsAndLayout(layoutTree, extendsNode, options.strict, options.slotTagName, options.fillTagName);
diff --git a/test/extend.js b/test/extend.js
@@ -154,6 +154,42 @@ describe('Extend', () => {
     });
   });
 
+  it('should accept locals in inherited layout', () => {
+    mfs.writeFileSync('./parent.html', `
+          <div class="parent">
+            <span>{{ parent_var }}</span>
+            <block name="content"></block>
+          </div>
+        `);
+
+    mfs.writeFileSync('./child.html', `
+            <div class="child">
+              <span>{{ child_var }}</span>
+              <block name="child_content"></block>
+            </div>
+        `);
+
+    return init(`
+            <extends src="parent.html" locals='{"parent_var":"parent var sample"}'>
+              <block name="content">
+                <extends src="child.html" locals='{"child_var":"child var sample"}'>
+                  <block name="child_content">child content example</block>
+                </extends>
+              </block>
+            </extends>
+        `, {strict: false}).then(html => {
+      expect(html).toBe(cleanHtml(`
+            <div class="parent">
+            <span>parent var sample</span>
+            <div class="child">
+              <span>child var sample</span>
+              child content example
+            </div>
+            </div>
+            `));
+    });
+  });
+
   it('should extend inherited layout', () => {
     mfs.writeFileSync('./base.html', `
             <html>
