@bigcommerce/stencil-cli 8.10.2 → 8.10.4

package/lib/stencil-start.js

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

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

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

package/lib/utils/asyncUtils.js

@@ -1,6 +1,9 @@
 /**
- * @module Contains helpers functions for working with async stuff and streams
+ * @module Contains helpers functions for working with streams
  */
+
+import { PassThrough } from 'stream';
+
 /**
  * WARNING! Can be used with text content only. Binary data (e.g. images) will get broken!
  *
@@ -14,7 +17,38 @@ async function readFromStream(stream) {
     }
     return result;
 }
-export { readFromStream };
+
+function readStream(stream) {
+    return new Promise((resolve, reject) => {
+        let data = '';
+        stream.on('data', (chunk) => {
+            data += chunk;
+        });
+        stream.on('end', () => {
+            resolve(data);
+        });
+        stream.on('error', reject);
+    });
+}
+
+function tapStream(originalStream, onData) {
+    const tee = new PassThrough();
+    originalStream.pipe(tee);
+
+    let data = '';
+    tee.on('data', (chunk) => {
+        data += chunk;
+    });
+    tee.on('end', () => {
+        onData(data);
+    });
+
+    return tee; // Use this stream for downstream consumers
+}
+
+export { readFromStream, tapStream, readStream };
 export default {
     readFromStream,
+    tapStream,
+    readStream,
 };

package/package.json

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

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

@@ -9,7 +9,7 @@ import langAssembler from '../../../lib/lang-assembler.js';
 import { RawResponse, RedirectResponse, PencilResponse } from './responses/index.js';
 import templateAssembler from '../../../lib/template-assembler.js';
 import { int2uuid, stripDomainFromCookies, normalizeRedirectUrl } from '../../lib/utils.js';
-import { readFromStream } from '../../../lib/utils/asyncUtils.js';
+import { readFromStream, readStream, tapStream } from '../../../lib/utils/asyncUtils.js';
 import NetworkUtils from '../../../lib/utils/NetworkUtils.js';
 import contentApiClient from '../../../lib/content-api-client.js';
 import { getPageType } from '../../lib/page-type-util.js';
@@ -114,9 +114,17 @@ internals.getResponse = async (request) => {
     // (5xx will be just thrown by axios)
     const contentType = response.headers['content-type'] || '';
     const isResponseJson = contentType.toLowerCase().includes('application/json');
-    const bcAppData = isResponseJson
-        ? JSON.parse(await readFromStream(response.data))
-        : response.data;
+    const isWebDavRequest = request.path.startsWith('/content');
+    let bcAppData = response.data;
+
+    if (isResponseJson) {
+        bcAppData = JSON.parse(await readFromStream(response.data));
+    } else if (isWebDavRequest) {
+        const tappedStream = tapStream(response.data, (body) => {
+            return body;
+        });
+        bcAppData = await readStream(tappedStream);
+    }
     // cache response
     cache.put(
         requestSignature,