@micromag/cli 0.3.700 → 0.3.702

package/lib/index.js

@@ -1,12 +1,13 @@
 'use strict';
 
-var _regeneratorRuntime = require('@babel/runtime/helpers/regeneratorRuntime');
+var _regenerator = require('@babel/runtime/helpers/regenerator');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var fs = require('fs');
 var core = require('@micromag/core');
 var screensManager = require('@micromag/screens');
 var FieldsManager = require('@micromag/fields');
 var transforms = require('@micromag/transforms');
+var _regeneratorValues = require('@babel/runtime/helpers/regeneratorValues');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var path = require('path');
 var puppeteer = require('puppeteer');
@@ -141,37 +142,35 @@ var transformStory = function transformStory(story, format) {
 };
 
 var startServer = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(path) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(path) {
     var port,
       finalPort,
-      _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+      _args = arguments,
+      _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           port = _args.length > 1 && _args[1] !== undefined ? _args[1] : null;
-          _context.t0 = port;
-          if (_context.t0) {
-            _context.next = 6;
+          _t = port;
+          if (_t) {
+            _context.n = 2;
             break;
           }
-          _context.next = 5;
+          _context.n = 1;
           return getPort({
             port: getPort.makeRange(3050, 3100)
           });
-        case 5:
-          _context.t0 = _context.sent;
-        case 6:
-          finalPort = _context.t0;
-          return _context.abrupt("return", new Promise(function (resolve) {
+        case 1:
+          _t = _context.v;
+        case 2:
+          finalPort = _t;
+          return _context.a(2, new Promise(function (resolve) {
             var app = express();
             app.use(express["static"](path));
             var server = app.listen(finalPort, function () {
               return resolve(server);
             });
           }));
-        case 8:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -201,7 +200,7 @@ var DEFAULT_VIEWPORT = {
   isMobile: true
 };
 var captureStory = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(story, location) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(story, location) {
     var settings,
       _settings$viewport,
       defaultViewport,
@@ -223,20 +222,21 @@ var captureStory = /*#__PURE__*/function () {
       count,
       _loop,
       index,
-      _args2 = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+      _args2 = arguments,
+      _t2;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           settings = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : {};
           _settings$viewport = settings.viewport, defaultViewport = _settings$viewport === void 0 ? DEFAULT_VIEWPORT : _settings$viewport, _settings$googleApiKe = settings.googleApiKey, googleApiKey = _settings$googleApiKe === void 0 ? null : _settings$googleApiKe, _settings$executableP = settings.executablePath, executablePath = _settings$executableP === void 0 ? null : _settings$executableP;
-          _context2.next = 4;
+          _context2.n = 1;
           return startServer(path.join(process.cwd(), './node_modules/@micromag/viewer-build/build/'));
-        case 4:
-          server = _context2.sent;
+        case 1:
+          server = _context2.v;
           serverPort = server.address().port;
           width = defaultViewport.width, height = defaultViewport.height;
           _ref2 = story || {}, _ref2$components = _ref2.components, screens = _ref2$components === void 0 ? null : _ref2$components;
-          _context2.next = 10;
+          _context2.n = 2;
           return puppeteer.launch(_objectSpread(_objectSpread({
             devtools: DEBUG
           }, executablePath !== null ? {
@@ -245,39 +245,39 @@ var captureStory = /*#__PURE__*/function () {
             defaultViewport: defaultViewport,
             args: ['--no-sandbox']
           }));
-        case 10:
-          browser = _context2.sent;
-          _context2.next = 13;
+        case 2:
+          browser = _context2.v;
+          _context2.n = 3;
           return browser.pages();
-        case 13:
-          pages = _context2.sent;
+        case 3:
+          pages = _context2.v;
           hasPage = pages.length > 0;
           if (!hasPage) {
-            _context2.next = 19;
+            _context2.n = 4;
             break;
           }
-          _context2.t0 = pages[0];
-          _context2.next = 22;
+          _t2 = pages[0];
+          _context2.n = 6;
           break;
-        case 19:
-          _context2.next = 21;
+        case 4:
+          _context2.n = 5;
           return browser.newPage();
-        case 21:
-          _context2.t0 = _context2.sent;
-        case 22:
-          page = _context2.t0;
-          _context2.next = 25;
+        case 5:
+          _t2 = _context2.v;
+        case 6:
+          page = _t2;
+          _context2.n = 7;
           return page["goto"]("http://127.0.0.1:".concat(serverPort));
-        case 25:
+        case 7:
           if (!(screens !== null)) {
-            _context2.next = 34;
+            _context2.n = 10;
             break;
           }
           count = screens.length;
-          _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+          _loop = /*#__PURE__*/_regenerator().m(function _loop() {
             var screenNumber, screen, id, type, singleScreenStory, _screen$video, _screen$video2, _screen$video2$media, _screen$video2$media2, _screen$video2$media3, url, fileExtension, res, fileStream;
-            return _regeneratorRuntime().wrap(function _loop$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+            return _regenerator().w(function (_context) {
+              while (1) switch (_context.n) {
                 case 0:
                   screenNumber = index + 1;
                   screen = screens[index];
@@ -287,25 +287,25 @@ var captureStory = /*#__PURE__*/function () {
                   });
                   console.log("Screen ".concat(screenNumber, "/").concat(count, " (").concat(type, ")..."));
                   if (!(type === 'video' || type === 'video-360')) {
-                    _context.next = 15;
+                    _context.n = 2;
                     break;
                   }
                   _screen$video = screen.video, _screen$video2 = _screen$video === void 0 ? {} : _screen$video, _screen$video2$media = _screen$video2.media, _screen$video2$media2 = _screen$video2$media === void 0 ? {} : _screen$video2$media, _screen$video2$media3 = _screen$video2$media2.url, url = _screen$video2$media3 === void 0 ? null : _screen$video2$media3;
                   console.log("Downloading video from ".concat(url, "..."));
                   fileExtension = url.split(/[#?]/)[0].split('.').pop().trim();
-                  _context.next = 11;
+                  _context.n = 1;
                   return nodeFetch(url);
-                case 11:
-                  res = _context.sent;
+                case 1:
+                  res = _context.v;
                   fileStream = fsExtra.createWriteStream(getOutputPath(location, "".concat(screenNumber, ".").concat(fileExtension)));
-                  _context.next = 15;
+                  _context.n = 2;
                   return new Promise(function (resolve, reject) {
                     res.body.pipe(fileStream);
                     res.body.on('error', reject);
                     fileStream.on('finish', resolve);
                   });
-                case 15:
-                  _context.next = 17;
+                case 2:
+                  _context.n = 3;
                   return page.evaluate(function (storyToRender, storyProps) {
                     return renderStory(storyToRender, storyProps);
                   }, singleScreenStory, {
@@ -317,49 +317,47 @@ var captureStory = /*#__PURE__*/function () {
                     height: height,
                     googleApiKey: googleApiKey
                   });
-                case 17:
-                  _context.prev = 17;
-                  _context.next = 20;
+                case 3:
+                  _context.p = 3;
+                  _context.n = 4;
                   return page.waitForSelector('[data-screen-ready="true"]', {
                     timeout: READY_WAIT_TIMEOUT
                   });
-                case 20:
-                  _context.next = 25;
+                case 4:
+                  _context.n = 6;
                   break;
-                case 22:
-                  _context.prev = 22;
-                  _context.t0 = _context["catch"](17);
+                case 5:
+                  _context.p = 5;
+                  _context.v;
                   console.log("Timeout reached: ".concat(id));
-                case 25:
-                  _context.next = 27;
+                case 6:
+                  _context.n = 7;
                   return page.screenshot({
                     path: getOutputPath(location, "".concat(screenNumber, ".png"))
                   });
-                case 27:
-                case "end":
-                  return _context.stop();
+                case 7:
+                  return _context.a(2);
               }
-            }, _loop, null, [[17, 22]]);
+            }, _loop, null, [[3, 5]]);
           });
           index = 0;
-        case 29:
+        case 8:
           if (!(index < count)) {
-            _context2.next = 34;
+            _context2.n = 10;
             break;
           }
-          return _context2.delegateYield(_loop(), "t1", 31);
-        case 31:
+          return _context2.d(_regeneratorValues(_loop()), 9);
+        case 9:
           index += 1;
-          _context2.next = 29;
+          _context2.n = 8;
           break;
-        case 34:
-          _context2.next = 36;
+        case 10:
+          _context2.n = 11;
           return browser.close();
-        case 36:
+        case 11:
           server.close();
-        case 37:
-        case "end":
-          return _context2.stop();
+        case 12:
+          return _context2.a(2);
       }
     }, _callee);
   }));
@@ -369,7 +367,7 @@ var captureStory = /*#__PURE__*/function () {
 }();
 
 var getStoryHtml = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(story) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(story) {
     var settings,
       _settings$googleApiKe,
       googleApiKey,
@@ -382,18 +380,19 @@ var getStoryHtml = /*#__PURE__*/function () {
       hasPage,
       page,
       pageContent,
-      _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+      _args = arguments,
+      _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           settings = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
           _settings$googleApiKe = settings.googleApiKey, googleApiKey = _settings$googleApiKe === void 0 ? null : _settings$googleApiKe, _settings$executableP = settings.executablePath, executablePath = _settings$executableP === void 0 ? null : _settings$executableP;
-          _context.next = 4;
+          _context.n = 1;
           return startServer(path.join(process.cwd(), './node_modules/@micromag/viewer-build/build/'));
-        case 4:
-          server = _context.sent;
+        case 1:
+          server = _context.v;
           serverPort = server.address().port;
-          _context.next = 8;
+          _context.n = 2;
           return puppeteer.launch(_objectSpread(_objectSpread({
             devtools: false
           }, executablePath !== null ? {
@@ -406,31 +405,31 @@ var getStoryHtml = /*#__PURE__*/function () {
               isMobile: true
             }
           }));
-        case 8:
-          browser = _context.sent;
-          _context.next = 11;
+        case 2:
+          browser = _context.v;
+          _context.n = 3;
           return browser.pages();
-        case 11:
-          pages = _context.sent;
+        case 3:
+          pages = _context.v;
           hasPage = pages.length > 0;
           if (!hasPage) {
-            _context.next = 17;
+            _context.n = 4;
             break;
           }
-          _context.t0 = pages[0];
-          _context.next = 20;
+          _t = pages[0];
+          _context.n = 6;
           break;
-        case 17:
-          _context.next = 19;
+        case 4:
+          _context.n = 5;
           return browser.newPage();
-        case 19:
-          _context.t0 = _context.sent;
-        case 20:
-          page = _context.t0;
-          _context.next = 23;
+        case 5:
+          _t = _context.v;
+        case 6:
+          page = _t;
+          _context.n = 7;
           return page["goto"]("http://127.0.0.1:".concat(serverPort));
-        case 23:
-          _context.next = 25;
+        case 7:
+          _context.n = 8;
           return page.evaluate(function (storyToRender, storyProps) {
             return renderStory(storyToRender, storyProps);
           }, story, {
@@ -439,19 +438,16 @@ var getStoryHtml = /*#__PURE__*/function () {
             withoutMenu: true,
             googleApiKey: googleApiKey
           });
-        case 25:
-          _context.next = 27;
+        case 8:
+          _context.n = 9;
           return page.content();
-        case 27:
-          pageContent = _context.sent;
-          _context.next = 30;
+        case 9:
+          pageContent = _context.v;
+          _context.n = 10;
           return browser.close();
-        case 30:
+        case 10:
           server.close();
-          return _context.abrupt("return", pageContent);
-        case 32:
-        case "end":
-          return _context.stop();
+          return _context.a(2, pageContent);
       }
     }, _callee);
   }));
@@ -480,7 +476,7 @@ var storyParser = new core.StoryParser({
   screensManager: screensManager
 });
 var exportStoryToPath = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(story, format, output) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(story, format, output) {
     var settings,
       storyParsed,
       html,
@@ -490,43 +486,43 @@ var exportStoryToPath = /*#__PURE__*/function () {
       parsedDestination,
       newStory,
       fileDestination,
-      _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+      _args = arguments,
+      _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           settings = _args.length > 3 && _args[3] !== undefined ? _args[3] : {};
           storyParsed = storyParser.parse(story);
-          _context.t0 = format;
-          _context.next = _context.t0 === 'html' ? 5 : _context.t0 === 'html-ssr' ? 12 : _context.t0 === 'images' ? 16 : 18;
+          _t = format;
+          _context.n = _t === 'html' ? 1 : _t === 'html-ssr' ? 3 : _t === 'images' ? 4 : 5;
           break;
-        case 5:
-          _context.next = 7;
+        case 1:
+          _context.n = 2;
           return getStoryHtml(storyParsed, settings);
-        case 7:
-          html = _context.sent;
+        case 2:
+          html = _context.v;
           destination = getOutputPath(output, 'story.html');
           console.log('destination', destination);
           fs.writeFileSync(destination, html, 'utf-8');
-          return _context.abrupt("break", 25);
-        case 12:
+          return _context.a(3, 6);
+        case 3:
           _html = getStoryHtmlSSR(storyParsed, settings);
           _destination = getOutputPath(output, 'story-ssr.html');
           fs.writeFileSync(_destination, _html, 'utf-8');
-          return _context.abrupt("break", 25);
-        case 16:
+          return _context.a(3, 6);
+        case 4:
           captureStory(storyParsed, output, settings);
-          return _context.abrupt("break", 25);
-        case 18:
+          return _context.a(3, 6);
+        case 5:
           parsedDestination = getOutputPath(output, 'parsed.json');
           fs.writeFileSync(parsedDestination, JSON.stringify(storyParsed), 'utf-8');
           newStory = transformStory(storyParsed, format); // const mediaDestination = getOutputPath(output);
           fileDestination = getOutputPath(output, 'article.json');
           console.log(output, fileDestination);
           fs.writeFileSync(fileDestination, JSON.stringify(newStory), 'utf-8');
-          return _context.abrupt("break", 25);
-        case 25:
-        case "end":
-          return _context.stop();
+          return _context.a(3, 6);
+        case 6:
+          return _context.a(2);
       }
     }, _callee);
   }));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/cli",
-    "version": "0.3.700",
+    "version": "0.3.702",
     "private": false,
     "description": "",
     "keywords": [
@@ -49,10 +49,10 @@
         "@micromag/core": "^0.3.679",
         "@micromag/elements": "^0.3.700",
         "@micromag/fields": "^0.3.699",
-        "@micromag/screens": "^0.3.700",
+        "@micromag/screens": "^0.3.702",
         "@micromag/transforms": "^0.3.679",
-        "@micromag/viewer": "^0.3.700",
-        "@micromag/viewer-build": "^0.3.700",
+        "@micromag/viewer": "^0.3.702",
+        "@micromag/viewer-build": "^0.3.702",
         "change-case": "^5.4.4",
         "classnames": "^2.2.6",
         "commander": "^12.0.0",
@@ -70,5 +70,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "b335d7d45cc5a556a4b4bb9c68e52809501cc6e1"
+    "gitHead": "32ebadd6d81e82991e0b70200c38c91d51ba357a"
 }