Merge pull request #5638 from github/repo-sync

repo sync

Author: Octomerger

lib/liquid-tags/indented-data-reference.js

@@ -14,7 +14,7 @@ module.exports = {
     this.markup = tagToken.args.trim()
   },
 
-  async render (context) {
+  async render (scope) {
     // obfuscate first legit space, remove all other spaces, then restore legit space
     // this way we can support spaces=NUMBER as well as spaces = NUMBER
     const input = this.markup
@@ -30,7 +30,7 @@ module.exports = {
     assert(parseInt(numSpaces) || numSpaces === '0', '"spaces=NUMBER" must include a number')
 
     // Get the referenced value from the context
-    const value = await this.liquid.evalValue(`site.data.${dataReference}`, context)
+    const value = await this.liquid.evalValue(`site.data.${dataReference}`, scope)
 
     // If nothing is found in the context, exit with nothing; this may
     // feel weird and that we should throw an error, but this is "The Liquid Way TM"
@@ -39,6 +39,6 @@ module.exports = {
     // add spaces to each line
     const renderedReferenceWithIndent = value.replace(/^/mg, ' '.repeat(numSpaces))
 
-    return this.liquid.parseAndRender(renderedReferenceWithIndent, context)
+    return this.liquid.parseAndRender(renderedReferenceWithIndent, scope.environments)
   }
 }

lib/render-content/create-processor.js

@@ -27,7 +27,7 @@ module.exports = function createProcessor (context) {
     .use(highlight, { languages: { graphql }, subset: false })
     .use(raw)
     .use(rewriteLegacyAssetPaths, context)
-    .use(wrapInElement, { selector: 'ol > li img', wrapper: 'div.procedural-image-wrapper' })
+    .use(wrapInElement, { selector: 'ol > li img', wrapper: 'span.procedural-image-wrapper' })
     .use(rewriteLocalLinks, { languageCode: context.currentLanguage, version: context.currentVersion })
     .use(html)
 }

lib/render-content/plugins/wrap-in-element.js

@@ -22,11 +22,11 @@ module.exports = options => {
       throw new TypeError('Expected a `string` as selector')
     }
 
-    for (const match of selectAll(options.selector, tree)) {
+    for (const match of selectAll(selector, tree)) {
       visit(tree, match, (node, i, parent) => {
-        const wrapper = parseSelector('div')
-        wrapper.children = [node]
-        parent.children[i] = wrapper
+        const parsedWrapper = parseSelector(wrapper)
+        parsedWrapper.children = [node]
+        parent.children[i] = parsedWrapper
       })
     }
   }