@bigcommerce/stencil-cli 3.8.5 → 3.10.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+### Draft
+
+### 3.10.0 (2022-02-08)
+
+-   fix(storefront): bctheme-1000 handle regular css in stencil ([845](https://github.com/bigcommerce/stencil-cli/pull/845))
+-   chore: bump paper to 3.0.0 ([868](https://github.com/bigcommerce/stencil-cli/pull/868))
+
+### 3.9.2 (2022-01-31)
+
+-   chore: bump paper to latest ([863](https://github.com/bigcommerce/stencil-cli/pull/863))
+
+### 3.9.1 (2022-01-25)
+
+-   fix: strf-9612 Fix stencil pull when there is 1 channel ([859](https://github.com/bigcommerce/stencil-cli/pull/859))
+
+### 3.9.0 (2022-01-21)
+
+-   fix: return channel id as an iterable when a store only has a single storefront ([849](https://github.com/bigcommerce/stencil-cli/pull/849))
+-   feat: warn npm users if npm is above 7 version ([846](https://github.com/bigcommerce/stencil-cli/pull/846))
+
 ### 3.8.5 (2022-01-18)
 
 -   fix(storefront): strf-9594 loosed frontmatter refex ([841](https://github.com/bigcommerce/stencil-cli/pull/841))

package/lib/stencil-bundle.js

@@ -110,7 +110,12 @@ class Bundle {
             bundle: true,
         };
         return (callback) => {
-            const basePath = path.join(this.themePath, 'assets', compiler);
+            let basePath;
+            if (compiler === 'css') {
+                basePath = path.join(this.themePath, 'assets/dist', compiler);
+            } else {
+                basePath = path.join(this.themePath, 'assets', compiler);
+            }
 
             console.log('%s Parsing Started...', compiler.toUpperCase());
             fs.readdir(basePath, (err, files) => {
@@ -395,7 +400,12 @@ class Bundle {
                 case 'css':
                     // Create the parsed tree files
                     for (const [filename, data] of Object.entries(result)) {
-                        archiveJsonFile(data, `parsed/scss/${filename}.json`);
+                        const ext =
+                            this.configuration.css_compiler === 'css'
+                                ? this.configuration.css_compiler
+                                : 'scss';
+
+                        archiveJsonFile(data, `parsed/${ext}/${filename}.json`);
                     }
                     break;
 

package/lib/stencil-push.js

@@ -18,7 +18,7 @@ function stencilPush(options = {}, callback) {
             utils.pollForJobCompletion((data) => ({ themeId: data.theme_id })),
             utils.promptUserWhetherToApplyTheme,
             utils.getChannels,
-            utils.promptUserForChannel,
+            utils.promptUserForChannels,
             utils.getVariations,
             utils.promptUserForVariation,
             utils.requestToApplyVariationWithRetrys(),

package/lib/stencil-push.utils.js

@@ -274,6 +274,7 @@ utils.promptUserWhetherToApplyTheme = async (options) => {
 utils.getChannels = async (options) => {
     const {
         config: { accessToken },
+        channelId,
         channelIds,
         storeHash,
         applyTheme,
@@ -281,7 +282,7 @@ utils.getChannels = async (options) => {
 
     const apiHost = options.apiHost || options.config.apiHost;
 
-    if (!applyTheme || channelIds) {
+    if (!applyTheme || channelIds || channelId) {
         return options;
     }
 
@@ -338,7 +339,7 @@ utils.getVariations = async (options) => {
     return { ...options, variations };
 };
 
-utils.promptUserForChannel = async (options) => {
+utils.promptUserForChannels = async (options) => {
     const { applyTheme, channelIds, channels, allChannels } = options;
 
     if (!applyTheme || channelIds) {
@@ -350,13 +351,13 @@ utils.promptUserForChannel = async (options) => {
         return { ...options, channelIds: allIds };
     }
 
-    const selectedChannelIds = await utils.promptUserToSelectChannel(channels);
+    const selectedChannelIds = await utils.promptUserToSelectChannels(channels);
     return { ...options, channelIds: selectedChannelIds };
 };
 
-utils.promptUserToSelectChannel = async (channels) => {
+utils.promptUserToSelectChannels = async (channels) => {
     if (channels.length < 2) {
-        return channels[0].channel_id;
+        return [channels[0].channel_id];
     }
 
     const questions = [
@@ -375,6 +376,38 @@ utils.promptUserToSelectChannel = async (channels) => {
     return answer.channelIds;
 };
 
+utils.promptUserForChannel = async (options) => {
+    const { applyTheme, channelId, channels } = options;
+
+    if (!applyTheme || channelId) {
+        return options;
+    }
+
+    const selectedChannelId = await utils.promptUserToSelectChannel(channels);
+    return { ...options, channelId: selectedChannelId };
+};
+
+utils.promptUserToSelectChannel = async (channels) => {
+    if (channels.length < 2) {
+        return channels[0].channel_id;
+    }
+
+    const questions = [
+        {
+            type: 'list',
+            name: 'channelId',
+            message: 'Which channel would you like to use?',
+            choices: channels.map((channel) => ({
+                name: channel.url,
+                value: channel.channel_id,
+            })),
+        },
+    ];
+
+    const answer = await Inquirer.prompt(questions);
+    return answer.channelId;
+};
+
 utils.promptUserForVariation = async (options) => {
     if (!options.applyTheme || options.variationId) {
         return options;

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "3.8.5",
+  "version": "3.10.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -537,9 +537,9 @@
       }
     },
     "@bigcommerce/stencil-paper": {
-      "version": "3.0.0-rc.52",
-      "resolved": "https://registry.npmjs.org/@bigcommerce/stencil-paper/-/stencil-paper-3.0.0-rc.52.tgz",
-      "integrity": "sha512-hANH4m0dh9YJuXIlirXj2F9HeWv8k2kJXH1lZkDWx7Ukl0Mn+caibBFprb4Ds+maAc9mHjg9ECUZ5WFT2wBSgA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@bigcommerce/stencil-paper/-/stencil-paper-3.0.0.tgz",
+      "integrity": "sha512-+8Zyln2L7yvoFabDzgXgSE+7it01Q5UZml+pq70qrx9GtsX+leIhdY01RoziDnES1I12qIx+bPUX+vM7oD1NZg==",
       "requires": {
         "@bigcommerce/stencil-paper-handlebars": "4.5.1",
         "accept-language-parser": "~1.4.1",
@@ -2873,6 +2873,16 @@
         "is-string": "^1.0.5"
       }
     },
+    "array-sort": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-0.1.4.tgz",
+      "integrity": "sha512-BNcM+RXxndPxiZ2rd76k6nyQLRZr2/B/sdi8pQ+Joafr5AH279L40dfokSUTp8O+AaqYjXWhblBWa2st2nc4fQ==",
+      "requires": {
+        "default-compare": "^1.0.0",
+        "get-value": "^2.0.6",
+        "kind-of": "^5.0.2"
+      }
+    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -7640,23 +7650,6 @@
             "arr-flatten": "^1.0.1"
           }
         },
-        "array-sort": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-0.1.4.tgz",
-          "integrity": "sha512-BNcM+RXxndPxiZ2rd76k6nyQLRZr2/B/sdi8pQ+Joafr5AH279L40dfokSUTp8O+AaqYjXWhblBWa2st2nc4fQ==",
-          "requires": {
-            "default-compare": "^1.0.0",
-            "get-value": "^2.0.6",
-            "kind-of": "^5.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
-            }
-          }
-        },
         "array-unique": {
           "version": "0.2.1",
           "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
@@ -15443,9 +15436,9 @@
       "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g=="
     },
     "uglify-js": {
-      "version": "3.14.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.4.tgz",
-      "integrity": "sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA==",
+      "version": "3.15.1",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz",
+      "integrity": "sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==",
       "optional": true
     },
     "uglify-to-browserify": {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "3.8.5",
+  "version": "3.10.0",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
   "engines": {
-    "node": "^10.17 || ^12"
+    "node": "^10.17 || ^12",
+    "npm": ">=v6.11.3 <7.0.0"
   },
   "scripts": {
     "lint": "eslint . && prettier --check . --ignore-unknown",
@@ -44,7 +45,7 @@
     "package-lock.json"
   ],
   "dependencies": {
-    "@bigcommerce/stencil-paper": "^3.0.0-rc.52",
+    "@bigcommerce/stencil-paper": "3.0.0",
     "@bigcommerce/stencil-styles": "2.1.1",
     "@hapi/boom": "^8.0.1",
     "@hapi/glue": "^6.2.0",

package/server/plugins/theme-assets/theme-assets.module.js

@@ -60,21 +60,21 @@ internals.cssHandler = async (request, h) => {
     request.app.themeConfig.setVariation(variationIndex);
 
     // Get the theme configuration
+    const configuration = await request.app.themeConfig.getConfig();
     const fileName = internals.getOriginalFileName(request.params.fileName);
     const fileParts = path.parse(fileName);
-    const pathToFile = path.join(fileParts.dir, `${fileParts.name}.scss`);
-    const basePath = path.join(internals.getThemeAssetsPath(), 'scss');
+    const ext = configuration.css_compiler === 'css' ? configuration.css_compiler : 'scss';
+    const pathToFile = path.join(fileParts.dir, `${fileParts.name}.${ext}`);
+    const basePath = path.join(internals.getThemeAssetsPath(), `${ext}`);
 
     let files;
     try {
-        files = await promisify(cssAssembler.assemble)(pathToFile, basePath, 'scss', {});
+        files = await promisify(cssAssembler.assemble)(pathToFile, basePath, `${ext}`, {});
     } catch (err) {
         console.error(err);
         throw Boom.badData(err);
     }
 
-    const configuration = await request.app.themeConfig.getConfig();
-
     const params = {
         data: files[pathToFile],
         files,