@bigcommerce/stencil-cli 4.0.0 → 5.0.0

package/lib/stencil-push.utils.js

@@ -87,6 +87,7 @@ utils.uploadBundle = async (options) => {
         config: { accessToken },
         bundleZipPath,
         storeHash,
+        uploadBundleAgain,
     } = options;
 
     const apiHost = options.apiHost || options.config.apiHost;
@@ -97,6 +98,7 @@ utils.uploadBundle = async (options) => {
             apiHost,
             bundleZipPath,
             storeHash,
+            uploadBundleAgain,
         });
         return {
             ...options,
@@ -188,12 +190,54 @@ utils.deleteThemesIfNecessary = async (options) => {
     return options;
 };
 
+utils.checkIfDeletionIsComplete = () => {
+    return async.retryable(
+        {
+            interval: 1000,
+            errorFilter: (err) => {
+                if (err.message === 'ThemeStillExists') {
+                    console.log(`${'warning'.yellow} -- Theme still exists;Retrying ...`);
+                    return true;
+                }
+                return false;
+            },
+            times: 5,
+        },
+        utils.checkIfThemeIsDeleted(),
+    );
+};
+
+utils.checkIfThemeIsDeleted = () => async (options) => {
+    const {
+        themeLimitReached,
+        config: { accessToken },
+        storeHash,
+        themeIdsToDelete,
+    } = options;
+
+    if (!themeLimitReached) {
+        return options;
+    }
+
+    const apiHost = options.apiHost || options.config.apiHost;
+
+    const result = await themeApiClient.getThemes({ accessToken, apiHost, storeHash });
+
+    const themeStillExists = result.some((theme) => themeIdsToDelete.includes(theme.uuid));
+
+    if (themeStillExists) {
+        throw new Error('ThemeStillExists');
+    }
+
+    return options;
+};
+
 utils.uploadBundleAgainIfNecessary = async (options) => {
     if (!options.themeLimitReached) {
         return options;
     }
 
-    return utils.uploadBundle(options);
+    return utils.uploadBundle({ ...options, uploadThemeAgain: true });
 };
 
 utils.notifyUserOfThemeUploadCompletion = async (options) => {

package/lib/theme-api-client.js

@@ -278,9 +278,10 @@ async function getVariationsByThemeId({ accessToken, apiHost, storeHash, themeId
  * @param {string} options.accessToken
  * @param {string} options.apiHost
  * @param {string} options.storeHash
+ * @param {boolean} options.uploadBundleAgain
  * @returns {Promise<object>}
  */
-async function postTheme({ bundleZipPath, accessToken, apiHost, storeHash }) {
+async function postTheme({ bundleZipPath, accessToken, apiHost, storeHash, uploadBundleAgain }) {
     const formData = new FormData();
     formData.append('file', fs.createReadStream(bundleZipPath), {
         filename: path.basename(bundleZipPath),
@@ -303,7 +304,12 @@ async function postTheme({ bundleZipPath, accessToken, apiHost, storeHash }) {
         // This status code is overloaded, so we need to check the message to determine
         // if we want to trigger the theme deletion flow.
         const uploadLimitPattern = /You have reached your upload limit/;
-        if (payload && payload.title && uploadLimitPattern.exec(payload.title)) {
+        if (
+            payload &&
+            payload.title &&
+            uploadLimitPattern.exec(payload.title) &&
+            !uploadBundleAgain
+        ) {
             return { themeLimitReached: true };
         }
 

package/lib/utils/NetworkUtils.js

@@ -7,6 +7,7 @@ const fsModule = require('fs');
 const axios = require('axios');
 
 const { PACKAGE_INFO } = require('../../constants');
+const stencilCLISettings = require('../StencilCLISettings');
 
 const defaultHttpsAgent = new https.Agent({ rejectUnauthorized: false });
 
@@ -16,11 +17,13 @@ class NetworkUtils {
         httpsAgent = defaultHttpsAgent,
         reqLibrary = axios,
         packageInfo = PACKAGE_INFO,
+        logger = console,
     } = {}) {
         this._fs = fs;
         this._httpsAgent = httpsAgent;
         this._reqLibrary = reqLibrary;
         this._packageInfo = packageInfo;
+        this._logger = logger;
     }
 
     /** Used to send request to our (Bigcommerce) servers only.
@@ -50,6 +53,10 @@ class NetworkUtils {
             reqConfig.headers['x-auth-token'] = accessToken;
         }
 
+        if (stencilCLISettings.isVerbose()) {
+            this.log(reqConfig);
+        }
+
         return this._reqLibrary(reqConfig);
     }
 
@@ -71,6 +78,11 @@ class NetworkUtils {
                 .on('error', reject);
         });
     }
+
+    log(config) {
+        const method = config.method || 'GET';
+        this._logger.info(`Upcoming request ${method.green}: ${config.url.green}`);
+    }
 }
 
 module.exports = NetworkUtils;