@sprucelabs/spruce-cli 19.0.0 → 19.1.1

package/build/tests/MockProgramFactory.js

@@ -29,12 +29,10 @@ var MockProgramFactory = /*#__PURE__*/function () {
         actionHandler: function () {
           var _actionHandler = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(_options) {
             return _regenerator["default"].wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                  case "end":
-                    return _context.stop();
-                }
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                case "end":
+                  return _context.stop();
               }
             }, _callee);
           }));
@@ -67,15 +65,13 @@ var MockProgramFactory = /*#__PURE__*/function () {
           this.actionHandler = /*#__PURE__*/function () {
             var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(options) {
               return _regenerator["default"].wrap(function _callee2$(_context2) {
-                while (1) {
-                  switch (_context2.prev = _context2.next) {
-                    case 0:
-                      _context2.next = 2;
-                      return cb(options, {});
-                    case 2:
-                    case "end":
-                      return _context2.stop();
-                  }
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    _context2.next = 2;
+                    return cb(options, {});
+                  case 2:
+                  case "end":
+                    return _context2.stop();
                 }
               }, _callee2);
             }));

package/build/tests/MockProgramFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"MockProgramFactory.js","names":["MockProgramFactory","_lastCommand","commandInvocations","descriptionInvocations","actionInvocations","optionInvocations","aliasesInvocations","commands","actionHandler","_options","command","str","push","description","aliases","action","cb","options","option","hint","defaultValue"],"sources":["../../src/tests/MockProgramFactory.ts"],"sourcesContent":["import { CommanderStatic } from 'commander'\n\nexport type MockProgram = CommanderStatic['program'] & {\n\tactionHandler: (options: Record<string, string>) => Promise<void>\n\tdescriptionInvocations: { command: string; description: string }[]\n\toptionInvocations: {\n\t\tcommand: string\n\t\toption: string\n\t\thint: string\n\t\tdefaultValue: string\n\t}[]\n\t_lastCommand: string\n\tcommandInvocations: string[]\n\tactionInvocations: string[]\n\taliasesInvocations: string[]\n}\n\nexport default class MockProgramFactory {\n\tprivate constructor() {}\n\n\tpublic static Program(): MockProgram {\n\t\t// @ts-ignore\n\t\treturn {\n\t\t\t_lastCommand: '',\n\t\t\tcommandInvocations: [],\n\t\t\tdescriptionInvocations: [],\n\t\t\tactionInvocations: [],\n\t\t\toptionInvocations: [],\n\t\t\taliasesInvocations: [],\n\t\t\tcommands: [],\n\t\t\tactionHandler: async (_options?: Record<string, string>) => {},\n\t\t\tcommand(str: string) {\n\t\t\t\tthis.commandInvocations.push(str)\n\t\t\t\tthis._lastCommand = str\n\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\tdescription(str: string) {\n\t\t\t\tthis.descriptionInvocations.push({\n\t\t\t\t\tcommand: this._lastCommand,\n\t\t\t\t\tdescription: str,\n\t\t\t\t})\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\taliases(aliases: string[]) {\n\t\t\t\tthis.aliasesInvocations.push(...aliases)\n\t\t\t\treturn this\n\t\t\t},\n\t\t\taction(cb: (...args: any[]) => Promise<void>) {\n\t\t\t\tthis.actionInvocations.push(this._lastCommand)\n\n\t\t\t\tthis.actionHandler = async (options: Record<string, string>) => {\n\t\t\t\t\tawait cb(options, {})\n\t\t\t\t}\n\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\toption(option: string, hint: string, defaultValue: string) {\n\t\t\t\tthis.optionInvocations.push({\n\t\t\t\t\tcommand: this._lastCommand,\n\t\t\t\t\toption,\n\t\t\t\t\thint,\n\t\t\t\t\tdefaultValue,\n\t\t\t\t})\n\t\t\t\treturn this\n\t\t\t},\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;;;;;;;IAiBqBA,kBAAkB;EACtC,8BAAsB;IAAA;EAAC;EAAC;IAAA;IAAA,OAExB,mBAAqC;MACpC;MACA,OAAO;QACNC,YAAY,EAAE,EAAE;QAChBC,kBAAkB,EAAE,EAAE;QACtBC,sBAAsB,EAAE,EAAE;QAC1BC,iBAAiB,EAAE,EAAE;QACrBC,iBAAiB,EAAE,EAAE;QACrBC,kBAAkB,EAAE,EAAE;QACtBC,QAAQ,EAAE,EAAE;QACZC,aAAa;UAAA,mGAAE,iBAAOC,QAAiC;YAAA;cAAA;gBAAA;kBAAA;kBAAA;oBAAA;gBAAA;cAAA;YAAA;UAAA,CAAO;UAAA;YAAA;UAAA;UAAA;QAAA;QAC9DC,OAAO,mBAACC,GAAW,EAAE;UACpB,IAAI,CAACT,kBAAkB,CAACU,IAAI,CAACD,GAAG,CAAC;UACjC,IAAI,CAACV,YAAY,GAAGU,GAAG;UAEvB,OAAO,IAAI;QACZ,CAAC;QACD;QACAE,WAAW,uBAACF,GAAW,EAAE;UACxB,IAAI,CAACR,sBAAsB,CAACS,IAAI,CAAC;YAChCF,OAAO,EAAE,IAAI,CAACT,YAAY;YAC1BY,WAAW,EAAEF;UACd,CAAC,CAAC;UACF,OAAO,IAAI;QACZ,CAAC;QACD;QACAG,OAAO,mBAACA,QAAiB,EAAE;UAAA;UAC1B,6BAAI,CAACR,kBAAkB,EAACM,IAAI,kEAAIE,QAAO,EAAC;UACxC,OAAO,IAAI;QACZ,CAAC;QACDC,MAAM,kBAACC,EAAqC,EAAE;UAC7C,IAAI,CAACZ,iBAAiB,CAACQ,IAAI,CAAC,IAAI,CAACX,YAAY,CAAC;UAE9C,IAAI,CAACO,aAAa;YAAA,yFAAG,kBAAOS,OAA+B;cAAA;gBAAA;kBAAA;oBAAA;sBAAA;sBAAA,OACpDD,EAAE,CAACC,OAAO,EAAE,CAAC,CAAC,CAAC;oBAAA;oBAAA;sBAAA;kBAAA;gBAAA;cAAA;YAAA,CACrB;YAAA;cAAA;YAAA;UAAA;UAED,OAAO,IAAI;QACZ,CAAC;QACD;QACAC,MAAM,kBAACA,OAAc,EAAEC,IAAY,EAAEC,YAAoB,EAAE;UAC1D,IAAI,CAACf,iBAAiB,CAACO,IAAI,CAAC;YAC3BF,OAAO,EAAE,IAAI,CAACT,YAAY;YAC1BiB,MAAM,EAANA,OAAM;YACNC,IAAI,EAAJA,IAAI;YACJC,YAAY,EAAZA;UACD,CAAC,CAAC;UACF,OAAO,IAAI;QACZ;MACD,CAAC;IACF;EAAC;EAAA;AAAA;AAAA"}
+{"version":3,"file":"MockProgramFactory.js","names":["MockProgramFactory","_classCallCheck2","_createClass2","key","value","Program","_lastCommand","commandInvocations","descriptionInvocations","actionInvocations","optionInvocations","aliasesInvocations","commands","actionHandler","_actionHandler","_asyncToGenerator2","_regenerator","mark","_callee","_options","wrap","_callee$","_context","prev","next","stop","_x","apply","arguments","command","str","push","description","aliases","_this$aliasesInvocati","_toConsumableArray2","action","cb","_ref","_callee2","options","_callee2$","_context2","_x2","option","hint","defaultValue","exports"],"sources":["../../src/tests/MockProgramFactory.ts"],"sourcesContent":["import { CommanderStatic } from 'commander'\n\nexport type MockProgram = CommanderStatic['program'] & {\n\tactionHandler: (options: Record<string, string>) => Promise<void>\n\tdescriptionInvocations: { command: string; description: string }[]\n\toptionInvocations: {\n\t\tcommand: string\n\t\toption: string\n\t\thint: string\n\t\tdefaultValue: string\n\t}[]\n\t_lastCommand: string\n\tcommandInvocations: string[]\n\tactionInvocations: string[]\n\taliasesInvocations: string[]\n}\n\nexport default class MockProgramFactory {\n\tprivate constructor() {}\n\n\tpublic static Program(): MockProgram {\n\t\t// @ts-ignore\n\t\treturn {\n\t\t\t_lastCommand: '',\n\t\t\tcommandInvocations: [],\n\t\t\tdescriptionInvocations: [],\n\t\t\tactionInvocations: [],\n\t\t\toptionInvocations: [],\n\t\t\taliasesInvocations: [],\n\t\t\tcommands: [],\n\t\t\tactionHandler: async (_options?: Record<string, string>) => {},\n\t\t\tcommand(str: string) {\n\t\t\t\tthis.commandInvocations.push(str)\n\t\t\t\tthis._lastCommand = str\n\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\tdescription(str: string) {\n\t\t\t\tthis.descriptionInvocations.push({\n\t\t\t\t\tcommand: this._lastCommand,\n\t\t\t\t\tdescription: str,\n\t\t\t\t})\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\taliases(aliases: string[]) {\n\t\t\t\tthis.aliasesInvocations.push(...aliases)\n\t\t\t\treturn this\n\t\t\t},\n\t\t\taction(cb: (...args: any[]) => Promise<void>) {\n\t\t\t\tthis.actionInvocations.push(this._lastCommand)\n\n\t\t\t\tthis.actionHandler = async (options: Record<string, string>) => {\n\t\t\t\t\tawait cb(options, {})\n\t\t\t\t}\n\n\t\t\t\treturn this\n\t\t\t},\n\t\t\t//@ts-ignore\n\t\t\toption(option: string, hint: string, defaultValue: string) {\n\t\t\t\tthis.optionInvocations.push({\n\t\t\t\t\tcommand: this._lastCommand,\n\t\t\t\t\toption,\n\t\t\t\t\thint,\n\t\t\t\t\tdefaultValue,\n\t\t\t\t})\n\t\t\t\treturn this\n\t\t\t},\n\t\t}\n\t}\n}\n"],"mappings":"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"}

package/build/tests/buildTestCache.js

@@ -15,9 +15,6 @@ var _duration = _interopRequireDefault(require("../utilities/duration.utility"))
 var _FeatureFixture = _interopRequireDefault(require("./fixtures/FeatureFixture"));
 var _MercuryFixture = _interopRequireDefault(require("./fixtures/MercuryFixture"));
 var _process$env$MAX_SIMU;
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 require('dotenv').config();
 var packageJsonContents = _spruceSkillUtils.diskUtil.readFile(_spruceSkillUtils.diskUtil.resolvePath(__dirname, '..', '..', 'package.json'));
 var packageJson = JSON.parse(packageJsonContents);
@@ -45,256 +42,239 @@ function _run() {
   _run = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
     var messages, render, getTimeSpent, renderLine, renderWarning, promises, cacheOrSkip, _cacheOrSkip, setup, cache, _cache;
     return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            _cache = function _cache3() {
-              _cache = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(lineNum, cwd, cacheKey, fixture, options) {
-                return _regenerator["default"].wrap(function _callee4$(_context4) {
-                  while (1) {
-                    switch (_context4.prev = _context4.next) {
-                      case 0:
-                        if (_spruceSkillUtils.diskUtil.doesDirExist(cwd)) {
-                          renderWarning(lineNum, "Found cached '".concat(cacheKey, "', but deleted it since it was not in the cache tracker..."), [_graphicsInterface.GraphicsTextEffect.Italic]);
-                          _spruceSkillUtils.diskUtil.deleteDir(cwd);
-                        }
-                        renderLine(lineNum, "Starting to build '".concat(cacheKey, "'..."), [_graphicsInterface.GraphicsTextEffect.Green]);
-                        _context4.prev = 2;
-                        _context4.next = 5;
-                        return fixture.installFeatures(options, cacheKey);
-                      case 5:
-                        renderLine(lineNum, "Done caching '".concat(cacheKey, "'. ").concat(remaining - 1, " remaining (").concat(_duration["default"].msToFriendly(getTimeSpent()), ")..."), [_graphicsInterface.GraphicsTextEffect.Green, _graphicsInterface.GraphicsTextEffect.Bold]);
-                        _context4.next = 12;
-                        break;
-                      case 8:
-                        _context4.prev = 8;
-                        _context4.t0 = _context4["catch"](2);
-                        renderLine(lineNum, "Error caching '".concat(cacheKey, "'..."), [_graphicsInterface.GraphicsTextEffect.Red, _graphicsInterface.GraphicsTextEffect.Bold]);
-                        renderLine(lineNum, "Error caching ".concat(cacheKey, ":\n\n").concat(_context4.t0.stack));
-                      case 12:
-                      case "end":
-                        return _context4.stop();
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _cache = function _cache3() {
+            _cache = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(lineNum, cwd, cacheKey, fixture, options) {
+              return _regenerator["default"].wrap(function _callee4$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
+                  case 0:
+                    if (_spruceSkillUtils.diskUtil.doesDirExist(cwd)) {
+                      renderWarning(lineNum, "Found cached '".concat(cacheKey, "', but deleted it since it was not in the cache tracker..."), [_graphicsInterface.GraphicsTextEffect.Italic]);
+                      _spruceSkillUtils.diskUtil.deleteDir(cwd);
                     }
-                  }
-                }, _callee4, null, [[2, 8]]);
-              }));
-              return _cache.apply(this, arguments);
-            };
-            cache = function _cache2(_x5, _x6, _x7, _x8, _x9) {
-              return _cache.apply(this, arguments);
-            };
-            setup = function _setup2(cacheKey) {
-              var options = testSkillCache[cacheKey];
-              var importCacheDir = _test["default"].resolveTestDir('spruce-cli-import-cache');
-              _ImportService["default"].setCacheDir(importCacheDir);
-              var serviceFactory = new _ServiceFactory["default"]();
-              var cwd = _test["default"].resolveTestDir(cacheKey);
-              var mercuryFixture = new _MercuryFixture["default"](cwd, serviceFactory);
-              var fixture = new _FeatureFixture["default"]({
-                cwd: cwd,
-                serviceFactory: serviceFactory,
-                ui: new _TerminalInterface["default"](cwd),
-                shouldGenerateCacheIfMissing: true,
-                apiClientFactory: mercuryFixture.getApiClientFactory()
-              });
-              var cacheTracker = fixture.loadCacheTracker();
-              return {
-                cacheTracker: cacheTracker,
-                cwd: cwd,
-                fixture: fixture,
-                options: options
-              };
+                    renderLine(lineNum, "Starting to build '".concat(cacheKey, "'..."), [_graphicsInterface.GraphicsTextEffect.Green]);
+                    _context4.prev = 2;
+                    _context4.next = 5;
+                    return fixture.installFeatures(options, cacheKey);
+                  case 5:
+                    renderLine(lineNum, "Done caching '".concat(cacheKey, "'. ").concat(remaining - 1, " remaining (").concat(_duration["default"].msToFriendly(getTimeSpent()), ")..."), [_graphicsInterface.GraphicsTextEffect.Green, _graphicsInterface.GraphicsTextEffect.Bold]);
+                    _context4.next = 12;
+                    break;
+                  case 8:
+                    _context4.prev = 8;
+                    _context4.t0 = _context4["catch"](2);
+                    renderLine(lineNum, "Error caching '".concat(cacheKey, "'..."), [_graphicsInterface.GraphicsTextEffect.Red, _graphicsInterface.GraphicsTextEffect.Bold]);
+                    renderLine(lineNum, "Error caching ".concat(cacheKey, ":\n\n").concat(_context4.t0.stack));
+                  case 12:
+                  case "end":
+                    return _context4.stop();
+                }
+              }, _callee4, null, [[2, 8]]);
+            }));
+            return _cache.apply(this, arguments);
+          };
+          cache = function _cache2(_x5, _x6, _x7, _x8, _x9) {
+            return _cache.apply(this, arguments);
+          };
+          setup = function _setup2(cacheKey) {
+            var options = testSkillCache[cacheKey];
+            var importCacheDir = _test["default"].resolveTestDir('spruce-cli-import-cache');
+            _ImportService["default"].setCacheDir(importCacheDir);
+            var serviceFactory = new _ServiceFactory["default"]();
+            var cwd = _test["default"].resolveTestDir(cacheKey);
+            var mercuryFixture = new _MercuryFixture["default"](cwd, serviceFactory);
+            var fixture = new _FeatureFixture["default"]({
+              cwd: cwd,
+              serviceFactory: serviceFactory,
+              ui: new _TerminalInterface["default"](cwd),
+              shouldGenerateCacheIfMissing: true,
+              apiClientFactory: mercuryFixture.getApiClientFactory()
+            });
+            var cacheTracker = fixture.loadCacheTracker();
+            return {
+              cacheTracker: cacheTracker,
+              cwd: cwd,
+              fixture: fixture,
+              options: options
             };
-            _cacheOrSkip = function _cacheOrSkip3() {
-              _cacheOrSkip = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(lineNum, cacheKey) {
-                var _setup, cacheTracker, cwd, fixture, options;
-                return _regenerator["default"].wrap(function _callee3$(_context3) {
-                  while (1) {
-                    switch (_context3.prev = _context3.next) {
-                      case 0:
-                        _setup = setup(cacheKey), cacheTracker = _setup.cacheTracker, cwd = _setup.cwd, fixture = _setup.fixture, options = _setup.options;
-                        if (!(onlyInstall && onlyInstall.indexOf(cacheKey) === -1)) {
-                          _context3.next = 6;
-                          break;
-                        }
-                        renderLine(lineNum, "Skipping '".concat(cacheKey, "'."), [_graphicsInterface.GraphicsTextEffect.Yellow]);
-                        remaining--;
-                        _context3.next = 14;
-                        break;
-                      case 6:
-                        if (!(cacheTracker[cacheKey] && _spruceSkillUtils.diskUtil.doesDirExist(_spruceSkillUtils.diskUtil.resolvePath(cwd, 'node_modules')))) {
-                          _context3.next = 11;
-                          break;
-                        }
-                        remaining--;
-                        renderLine(lineNum, "'".concat(cacheKey, "' already cached. Skipping..."), [_graphicsInterface.GraphicsTextEffect.Italic]);
-                        _context3.next = 14;
-                        break;
-                      case 11:
-                        _context3.next = 13;
-                        return cache(lineNum, cwd, cacheKey, fixture, options);
-                      case 13:
-                        remaining--;
-                      case 14:
-                      case "end":
-                        return _context3.stop();
+          };
+          _cacheOrSkip = function _cacheOrSkip3() {
+            _cacheOrSkip = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(lineNum, cacheKey) {
+              var _setup, cacheTracker, cwd, fixture, options;
+              return _regenerator["default"].wrap(function _callee3$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    _setup = setup(cacheKey), cacheTracker = _setup.cacheTracker, cwd = _setup.cwd, fixture = _setup.fixture, options = _setup.options;
+                    if (!(onlyInstall && onlyInstall.indexOf(cacheKey) === -1)) {
+                      _context3.next = 6;
+                      break;
                     }
-                  }
-                }, _callee3);
-              }));
-              return _cacheOrSkip.apply(this, arguments);
-            };
-            cacheOrSkip = function _cacheOrSkip2(_x3, _x4) {
-              return _cacheOrSkip.apply(this, arguments);
-            };
-            renderWarning = function _renderWarning(lineNum, message, effects) {
-              if (doesSupportColor) {
-                didMessagesChange = true;
-                messages[lineNum] = [message, effects];
-                void render();
-              } else {
-                console.log(message);
-              }
-            };
-            renderLine = function _renderLine(lineNum, message, effects) {
-              if (doesSupportColor) {
-                didMessagesChange = true;
-                messages[lineNum] = [message, effects];
-                void render();
-              } else {
-                console.log(message);
-              }
-            };
-            getTimeSpent = function _getTimeSpent() {
-              var now = new Date().getTime();
-              var delta = now - start;
-              return delta;
-            };
-            term.clear();
-            if (process.env.WILL_BUILD_CACHE_SCRIPT) {
-              term.renderLine('Running pre build cache script');
-              if (process.env.CLEAN_CACHE_SCRIPT) {
-                try {
-                  (0, _child_process.execSync)(process.env.CLEAN_CACHE_SCRIPT);
-                } catch (_unused) {
-                  /* Empty */
+                    renderLine(lineNum, "Skipping '".concat(cacheKey, "'."), [_graphicsInterface.GraphicsTextEffect.Yellow]);
+                    remaining--;
+                    _context3.next = 14;
+                    break;
+                  case 6:
+                    if (!(cacheTracker[cacheKey] && _spruceSkillUtils.diskUtil.doesDirExist(_spruceSkillUtils.diskUtil.resolvePath(cwd, 'node_modules')))) {
+                      _context3.next = 11;
+                      break;
+                    }
+                    remaining--;
+                    renderLine(lineNum, "'".concat(cacheKey, "' already cached. Skipping..."), [_graphicsInterface.GraphicsTextEffect.Italic]);
+                    _context3.next = 14;
+                    break;
+                  case 11:
+                    _context3.next = 13;
+                    return cache(lineNum, cwd, cacheKey, fixture, options);
+                  case 13:
+                    remaining--;
+                  case 14:
+                  case "end":
+                    return _context3.stop();
                 }
-              }
-              (0, _child_process.execSync)(process.env.WILL_BUILD_CACHE_SCRIPT);
+              }, _callee3);
+            }));
+            return _cacheOrSkip.apply(this, arguments);
+          };
+          cacheOrSkip = function _cacheOrSkip2(_x3, _x4) {
+            return _cacheOrSkip.apply(this, arguments);
+          };
+          renderWarning = function _renderWarning(lineNum, message, effects) {
+            if (doesSupportColor) {
+              didMessagesChange = true;
+              messages[lineNum] = [message, effects];
+              void render();
+            } else {
+              console.log(message);
             }
-            term.renderHeadline("Found ".concat(testKeys.length, " skills to cache."));
-            messages = [];
-            render = /*#__PURE__*/function () {
-              var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
-                var _iterator, _step, message;
-                return _regenerator["default"].wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        if (!didMessagesChange) {
-                          _context.next = 8;
-                          break;
-                        }
-                        term.moveCursorTo(0, 6);
-                        _iterator = _createForOfIteratorHelper(messages);
-                        try {
-                          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                            message = _step.value;
-                            term.eraseLine();
-                            term.renderLine(message[0], message[1]);
-                          }
-                        } catch (err) {
-                          _iterator.e(err);
-                        } finally {
-                          _iterator.f();
-                        }
-                        _context.next = 6;
-                        return term.stopLoading();
-                      case 6:
-                        term.eraseLine();
-                        term.renderLine('');
-                      case 8:
-                        didMessagesChange = false;
-                        _context.next = 11;
-                        return term.startLoading("".concat("Building ".concat(remaining, " skill").concat(dropInS(remaining)), ". ", _duration["default"].msToFriendly(getTimeSpent())));
-                      case 11:
-                        term.clearBelowCursor();
-                      case 12:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-              return function render() {
-                return _ref.apply(this, arguments);
-              };
-            }();
-            progressInterval = doesSupportColor && setInterval(render, 1000);
-            if (!doesSupportColor) {
-              _context5.next = 17;
-              break;
+          };
+          renderLine = function _renderLine(lineNum, message, effects) {
+            if (doesSupportColor) {
+              didMessagesChange = true;
+              messages[lineNum] = [message, effects];
+              void render();
+            } else {
+              console.log(message);
             }
-            _context5.next = 17;
-            return term.startLoading("Building ".concat(remaining, " remaining skill").concat(dropInS(remaining), "..."));
-          case 17:
-            if (!shouldRunSequentially) {
-              _context5.next = 22;
-              break;
+          };
+          getTimeSpent = function _getTimeSpent() {
+            var now = new Date().getTime();
+            var delta = now - start;
+            return delta;
+          };
+          term.clear();
+          if (process.env.WILL_BUILD_CACHE_SCRIPT) {
+            term.renderLine('Running pre build cache script');
+            if (process.env.CLEAN_CACHE_SCRIPT) {
+              try {
+                (0, _child_process.execSync)(process.env.CLEAN_CACHE_SCRIPT);
+              } catch (_unused) {
+                /* Empty */
+              }
             }
-            _context5.next = 20;
-            return Promise.all(testKeys.map(function (cacheKey, idx) {
-              return cacheOrSkip(idx, cacheKey);
+            (0, _child_process.execSync)(process.env.WILL_BUILD_CACHE_SCRIPT);
+          }
+          term.renderHeadline("Found ".concat(testKeys.length, " skills to cache."));
+          messages = [];
+          render = /*#__PURE__*/function () {
+            var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+              var _i, _messages, message;
+              return _regenerator["default"].wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    if (!didMessagesChange) {
+                      _context.next = 7;
+                      break;
+                    }
+                    term.moveCursorTo(0, 6);
+                    for (_i = 0, _messages = messages; _i < _messages.length; _i++) {
+                      message = _messages[_i];
+                      term.eraseLine();
+                      term.renderLine(message[0], message[1]);
+                    }
+                    _context.next = 5;
+                    return term.stopLoading();
+                  case 5:
+                    term.eraseLine();
+                    term.renderLine('');
+                  case 7:
+                    didMessagesChange = false;
+                    _context.next = 10;
+                    return term.startLoading("".concat("Building ".concat(remaining, " skill").concat(dropInS(remaining)), ". ", _duration["default"].msToFriendly(getTimeSpent())));
+                  case 10:
+                    term.clearBelowCursor();
+                  case 11:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
             }));
-          case 20:
-            _context5.next = 25;
+            return function render() {
+              return _ref.apply(this, arguments);
+            };
+          }();
+          progressInterval = doesSupportColor && setInterval(render, 1000);
+          if (!doesSupportColor) {
+            _context5.next = 17;
+            break;
+          }
+          _context5.next = 17;
+          return term.startLoading("Building ".concat(remaining, " remaining skill").concat(dropInS(remaining), "..."));
+        case 17:
+          if (!shouldRunSequentially) {
+            _context5.next = 22;
             break;
-          case 22:
-            promises = testKeys.map( /*#__PURE__*/function () {
-              var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(cacheKey, idx) {
-                return _regenerator["default"].wrap(function _callee2$(_context2) {
-                  while (1) {
-                    switch (_context2.prev = _context2.next) {
-                      case 0:
-                        if (!(totalSimultaneous >= maxSimultaneous)) {
-                          _context2.next = 5;
-                          break;
-                        }
-                        _context2.next = 3;
-                        return new Promise(function (resolve) {
-                          return setTimeout(resolve, 1000);
-                        });
-                      case 3:
-                        _context2.next = 0;
-                        break;
-                      case 5:
-                        totalSimultaneous++;
-                        _context2.next = 8;
-                        return cacheOrSkip(idx, cacheKey);
-                      case 8:
-                        totalSimultaneous--;
-                      case 9:
-                      case "end":
-                        return _context2.stop();
+          }
+          _context5.next = 20;
+          return Promise.all(testKeys.map(function (cacheKey, idx) {
+            return cacheOrSkip(idx, cacheKey);
+          }));
+        case 20:
+          _context5.next = 25;
+          break;
+        case 22:
+          promises = testKeys.map( /*#__PURE__*/function () {
+            var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(cacheKey, idx) {
+              return _regenerator["default"].wrap(function _callee2$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    if (!(totalSimultaneous >= maxSimultaneous)) {
+                      _context2.next = 5;
+                      break;
                     }
-                  }
-                }, _callee2);
-              }));
-              return function (_x, _x2) {
-                return _ref2.apply(this, arguments);
-              };
-            }());
-            _context5.next = 25;
-            return Promise.all(promises);
-          case 25:
-            _context5.next = 27;
-            return term.stopLoading();
-          case 27:
-            term.renderLine("Done! ".concat(_duration["default"].msToFriendly(getTimeSpent())));
-          case 28:
-          case "end":
-            return _context5.stop();
-        }
+                    _context2.next = 3;
+                    return new Promise(function (resolve) {
+                      return setTimeout(resolve, 1000);
+                    });
+                  case 3:
+                    _context2.next = 0;
+                    break;
+                  case 5:
+                    totalSimultaneous++;
+                    _context2.next = 8;
+                    return cacheOrSkip(idx, cacheKey);
+                  case 8:
+                    totalSimultaneous--;
+                  case 9:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _callee2);
+            }));
+            return function (_x, _x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
+          _context5.next = 25;
+          return Promise.all(promises);
+        case 25:
+          _context5.next = 27;
+          return term.stopLoading();
+        case 27:
+          term.renderLine("Done! ".concat(_duration["default"].msToFriendly(getTimeSpent())));
+        case 28:
+        case "end":
+          return _context5.stop();
       }
     }, _callee5);
   }));