@bigcommerce/stencil-cli 8.10.0 → 8.10.2

package/lib/stencil-start.js

@@ -58,35 +58,38 @@ class StencilStart {
         const initialStencilConfig = await this._stencilConfigManager.read();
         // Use initial (before updates) port for BrowserSync
         const browserSyncPort = cliOptions.port || initialStencilConfig.port;
-        const channelUrl = await this.getChannelUrl(initialStencilConfig, cliOptions);
+        const channelInfo = await this.getChannelInfo(initialStencilConfig, cliOptions);
         const storeInfoFromAPI = await this._themeApiClient.checkCliVersion({
-            storeUrl: channelUrl,
+            storeUrl: channelInfo.url,
         });
         const updatedStencilConfig = this.updateStencilConfig(
             initialStencilConfig,
             storeInfoFromAPI,
             browserSyncPort,
         );
+
         this._storeSettingsLocale = await this.getStoreSettingsLocale(
             cliOptions,
             updatedStencilConfig,
+            channelInfo.channel_id,
         );
         await this.startLocalServer(cliOptions, updatedStencilConfig);
         this._logger.log(this.getStartUpInfo(updatedStencilConfig));
         await this.startBrowserSync(cliOptions, browserSyncPort);
     }
 
-    async getStoreSettingsLocale(cliOptions, stencilConfig) {
+    async getStoreSettingsLocale(cliOptions, stencilConfig, channelId) {
         const { accessToken } = stencilConfig;
         const apiHost = cliOptions.apiHost || stencilConfig.apiHost;
         return this._storeSettingsApiClient.getStoreSettingsLocale({
             storeHash: this.storeHash,
             accessToken,
             apiHost,
+            channelId,
         });
     }
 
-    async getChannelUrl(stencilConfig, cliOptions) {
+    async getChannelInfo(stencilConfig, cliOptions) {
         const { accessToken } = stencilConfig;
         const apiHost = cliOptions.apiHost || stencilConfig.apiHost;
         this.storeHash = await this._themeApiClient.getStoreHash({
@@ -106,7 +109,7 @@ class StencilStart {
         const foundChannel = channels.find(
             (channel) => channel.channel_id === parseInt(channelId, 10),
         );
-        return foundChannel ? foundChannel.url : null;
+        return foundChannel || null;
     }
 
     /**

package/lib/store-settings-api-client.js

@@ -2,29 +2,50 @@ import 'colors';
 import NetworkUtils from './utils/NetworkUtils.js';
 
 const networkUtils = new NetworkUtils();
-async function getStoreSettingsLocale({ apiHost, storeHash, accessToken }) {
+
+async function getStoreSettingsLocaleWithChannel({ apiHost, storeHash, accessToken, channelId }) {
+    let url = `${apiHost}/stores/${storeHash}/v3/settings/store/locale`;
+    if (channelId) {
+        url += `?channel_id=${channelId}`;
+    }
+    const response = await networkUtils.sendApiRequest({
+        url,
+        accessToken,
+    });
+
+    return response.data.data;
+}
+
+async function getStoreSettingsLocale({ apiHost, storeHash, accessToken, channelId }) {
     try {
-        const response = await networkUtils.sendApiRequest({
-            url: `${apiHost}/stores/${storeHash}/v3/settings/store/locale`,
+        let data = await getStoreSettingsLocaleWithChannel({
+            apiHost,
+            storeHash,
             accessToken,
+            channelId,
         });
-        if (!response.data.data) {
+        // if no data available for the channel provided, default to global setting.
+        if (!data) {
+            data = await getStoreSettingsLocaleWithChannel({ apiHost, storeHash, accessToken });
+        }
+        if (!data) {
             throw new Error('Received empty store locale in the server response'.red);
-        } else if (!response.data.data.default_shopper_language) {
+        } else if (!data.default_shopper_language) {
             throw new Error(
                 'Received empty default_shopper_language field in the server response'.red,
             );
-        } else if (!response.data.data.shopper_language_selection_method) {
+        } else if (!data.shopper_language_selection_method) {
             throw new Error(
                 'Received empty shopper_language_selection_method field in the server response'.red,
             );
         }
-        return response.data.data;
+        return data;
     } catch (err) {
         err.name = 'StoreSettingsLocaleError';
         throw err;
     }
 }
+
 export { getStoreSettingsLocale };
 export default {
     getStoreSettingsLocale,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "8.10.0",
+  "version": "8.10.2",
   "type": "module",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
@@ -50,7 +50,7 @@
     "package-lock.json"
   ],
   "dependencies": {
-    "@bigcommerce/stencil-paper": "5.1.6",
+    "@bigcommerce/stencil-paper": "5.3.0",
     "@bigcommerce/stencil-styles": "^6.1.1",
     "@hapi/boom": "^10.0.1",
     "@hapi/glue": "^9.0.1",

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

@@ -315,14 +315,19 @@ internals.getTemplatePath = (requestPath, data) => {
     }
     return templatePath || data.template_file;
 };
-function getAcceptLanguageHeader(request) {
+function getRawAcceptLanguageHeader(request) {
     if (
         internals.options.storeSettingsLocale.shopper_language_selection_method ===
         'default_shopper_language'
     ) {
         return internals.options.storeSettingsLocale.default_shopper_language;
     }
-    return request.headers['accept-language'].toLowerCase();
+    return request.headers['accept-language'];
+}
+
+function getAcceptLanguageHeader(request) {
+    const rawHeader = getRawAcceptLanguageHeader(request);
+    return rawHeader.toLowerCase();
 }
 /**
  * Creates a new Pencil Response object and returns it.