@bigcommerce/stencil-cli 5.3.3 → 5.3.5

package/lib/template-assembler.js

@@ -5,6 +5,7 @@ const path = require('path');
 const upath = require('upath');
 
 const partialRegex = /\{\{>\s*([_|\-|a-zA-Z0-9@'"/]+)[^{]*?}}/g;
+const partialWithoutBracketsRegex = /[^>{{}}\s*]+/g;
 const dynamicComponentRegex = /\{\{\s*?dynamicComponent\s*(?:'|")([_|\-|a-zA-Z0-9/]+)(?:'|").*?}}/g;
 const includeRegex = /{{2}>\s*([_|\-|a-zA-Z0-9/]+)[^{]*?}{2}/g;
 const pathStringRegex = /^["'].+["']$/;
@@ -23,12 +24,24 @@ const defineBaseRoute = (route) => route.split('/').slice(0, 3).join('/');
 const applyExternalPath = (templateName, templates) => {
     return templates.map((t) => `${defineBaseRoute(templateName)}/${t}`);
 };
+const modifyNestedPartial = (partial) => {
+    const partialFragments = partial.match(partialWithoutBracketsRegex);
+
+    if (partialFragments) {
+        return [`${partialFragments.shift()}'`, ...partialFragments].join(' ');
+    }
+
+    return partialFragments;
+};
+
 const replacePartialNames = (content, partialRoute) => {
     return content.replace(
         includeRegex,
-        (__, partialName) => `{{> '${defineBaseRoute(partialRoute)}/${partialName}' }}`,
+        (partialName) =>
+            `{{> '${defineBaseRoute(partialRoute)}/${modifyNestedPartial(partialName)} }}`,
     );
 };
+
 const trimPartial = (partial) => {
     if (pathStringRegex.test(partial)) {
         return partial.slice(1, -1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "5.3.3",
+  "version": "5.3.5",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
   "engines": {

package/server/plugins/renderer/renderer.module.js

@@ -133,7 +133,6 @@ internals.getResponse = async (request) => {
         ? JSON.parse(await readFromStream(response.data))
         : response.data;
 
-    internals.updateTemplatePath(request.path, bcAppData);
     // cache response
     cache.put(
         requestSignature,
@@ -273,7 +272,7 @@ internals.parseResponse = async (bcAppData, request, response, responseArgs) =>
 internals.getResourceConfig = (data, request, configuration) => {
     const missingThemeSettingsRegex = /{{\\s*?theme_settings\\..+?\\s*?}}/g;
     let resourcesConfig = {};
-    const templatePath = data.template_file;
+    const templatePath = internals.getTemplatePath(request.path, data);
 
     // If the requested template is not an array, we parse the Frontmatter
     // If it is an array, then it's an ajax request using `render_with` with multiple components
@@ -337,9 +336,9 @@ internals.redirect = async (response, request) => {
  *
  * @param {string} requestPath
  * @param {Object} data
- * @returns {void}
+ * @returns {string}
  */
-internals.updateTemplatePath = (requestPath, data) => {
+internals.getTemplatePath = (requestPath, data) => {
     const customLayouts = internals.options.customLayouts || {};
     const pageType = data.page_type;
     let templatePath;
@@ -362,10 +361,9 @@ internals.updateTemplatePath = (requestPath, data) => {
 
         if (templatePath) {
             templatePath = path.join('pages/custom', pageType, templatePath.replace(/\.html$/, ''));
-            // eslint-disable-next-line no-param-reassign
-            data.template_file = templatePath;
         }
     }
+    return templatePath || data.template_file;
 };
 
 function getAcceptLanguageHeader(request) {
@@ -406,7 +404,7 @@ internals.getPencilResponse = (data, request, response, configuration, renderedR
 
     return new PencilResponse(
         {
-            template_file: data.template_file,
+            template_file: internals.getTemplatePath(request.path, data),
             templates: data.templates,
             remote: data.remote,
             remote_data: data.remote_data,