@bigcommerce/stencil-cli 3.6.2 → 3.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "3.6.2",
+  "version": "3.7.1",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
   "engines": {
@@ -44,7 +44,7 @@
     "package-lock.json"
   ],
   "dependencies": {
-    "@bigcommerce/stencil-paper": "^3.0.0-rc.48",
+    "@bigcommerce/stencil-paper": "^3.0.0-rc.52",
     "@bigcommerce/stencil-styles": "2.1.0",
     "@hapi/boom": "^8.0.1",
     "@hapi/glue": "^6.2.0",
@@ -67,6 +67,7 @@
     "graceful-fs": "^4.2.4",
     "image-size": "^0.9.1",
     "inquirer": "^8.1.5",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.20",
     "memory-cache": "^0.2.0",
     "npm-which": "^3.0.1",

package/server/index.js

@@ -19,6 +19,7 @@ function buildManifest(srcManifest, options) {
         parsedNormalUrl.protocol + '//' + parsedNormalUrl.host;
     pluginsByName['./plugins/router/router.module'].apiKey = options.dotStencilFile.apiKey;
     pluginsByName['./plugins/router/router.module'].port = options.dotStencilFile.port;
+    pluginsByName['./plugins/router/router.module'].stencilCliVersion = options.stencilCliVersion;
     pluginsByName['./plugins/renderer/renderer.module'].useCache = options.useCache;
     pluginsByName['./plugins/renderer/renderer.module'].username = options.dotStencilFile.username;
     pluginsByName['./plugins/renderer/renderer.module'].token = options.dotStencilFile.token;
@@ -28,6 +29,8 @@ function buildManifest(srcManifest, options) {
         options.dotStencilFile.customLayouts;
     pluginsByName['./plugins/renderer/renderer.module'].themePath = options.themePath;
     pluginsByName['./plugins/renderer/renderer.module'].storeUrl = storeUrl;
+    pluginsByName['./plugins/renderer/renderer.module'].storeSettingsLocale =
+        options.storeSettingsLocale;
     pluginsByName['./plugins/theme-assets/theme-assets.module'].themePath = options.themePath;
 
     resManifest.register.plugins = _.reduce(

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

@@ -14,6 +14,11 @@ const { readFromStream } = require('../../../lib/utils/asyncUtils');
 const NetworkUtils = require('../../../lib/utils/NetworkUtils');
 const contentApiClient = require('../../../lib/content-api-client');
 const { getPageType } = require('../../lib/page-type-util');
+const {
+    frontmatterRegex,
+    getFrontmatterContent,
+    interpolateThemeSettings,
+} = require('../../../lib/utils/frontmatter');
 
 const networkUtils = new NetworkUtils();
 
@@ -262,7 +267,6 @@ internals.parseResponse = async (bcAppData, request, response, responseArgs) =>
  * @returns {Object}
  */
 internals.getResourceConfig = (data, request, configuration) => {
-    const frontmatterRegex = /---\r?\n(?:.|\s)*?\r?\n---\r?\n/g;
     const missingThemeSettingsRegex = /{{\\s*?theme_settings\\..+?\\s*?}}/g;
     let resourcesConfig = {};
     const templatePath = data.template_file;
@@ -276,16 +280,12 @@ internals.getResourceConfig = (data, request, configuration) => {
             templatePath,
         );
 
-        const frontmatterMatch = rawTemplate.match(frontmatterRegex);
-        if (frontmatterMatch !== null) {
-            let frontmatterContent = frontmatterMatch[0];
-            // Interpolate theme settings for frontmatter
-            for (const [key, val] of Object.entries(configuration.settings)) {
-                const regex = `{{\\s*?theme_settings\\.${key}\\s*?}}`;
-
-                frontmatterContent = frontmatterContent.replace(new RegExp(regex, 'g'), val);
-            }
-
+        let frontmatterContent = getFrontmatterContent(rawTemplate);
+        if (frontmatterContent !== null) {
+            frontmatterContent = interpolateThemeSettings(
+                frontmatterContent,
+                configuration.settings,
+            );
             // Remove any handlebars tags that weren't interpolated because there was no setting for it
             frontmatterContent = frontmatterContent.replace(missingThemeSettingsRegex, '');
             // Replace the frontmatter with the newly interpolated version
@@ -364,6 +364,16 @@ internals.getTemplatePath = (requestPath, data) => {
     return templatePath || data.template_file;
 };
 
+function getAcceptLanguageHeader(request) {
+    if (
+        internals.options.storeSettingsLocale.shopper_language_selection_method ===
+        'default_shopper_language'
+    ) {
+        return internals.options.storeSettingsLocale.default_shopper_language;
+    }
+    return request.headers['accept-language'];
+}
+
 /**
  * Creates a new Pencil Response object and returns it.
  *
@@ -400,7 +410,7 @@ internals.getPencilResponse = (data, request, response, configuration, renderedR
             context,
             translations: data.translations,
             method: request.method,
-            acceptLanguage: request.headers['accept-language'],
+            acceptLanguage: getAcceptLanguageHeader(request),
             headers: response.headers,
             statusCode: response.status,
         },

package/server/plugins/router/router.module.js

@@ -98,7 +98,6 @@ internals.registerRoutes = (server) => {
                     protocol: 'https',
                     port: 443,
                     passThrough: true,
-                    xforward: false,
                 },
             },
             options: {
@@ -112,12 +111,18 @@ internals.registerRoutes = (server) => {
             path: internals.paths.storefrontAPI,
             handler: {
                 proxy: {
-                    host: internals.options.storeUrl.replace(/http[s]?:\/\//, ''),
                     rejectUnauthorized: false,
-                    protocol: 'https',
-                    port: 443,
+                    mapUri: (req) => {
+                        const host = `https://${internals.options.storeUrl.replace(
+                            /http[s]?:\/\//,
+                            '',
+                        )}`;
+                        const urlParams = req.url.search || '';
+                        const uri = `${host}${req.path}${urlParams}`;
+                        const headers = { 'stencil-cli': internals.options.stencilCliVersion };
+                        return { uri, headers };
+                    },
                     passThrough: true,
-                    xforward: false,
                 },
             },
             options: {
@@ -165,6 +170,7 @@ internals.registerRoutes = (server) => {
                             },
                         ),
                     }),
+                    rejectUnauthorized: false,
                     passThrough: true,
                 },
             },