creevey 0.9.0-beta.13 → 0.9.0-beta.14

package/lib/cjs/server/selenium/selenoid.js

@@ -5,38 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.startSelenoidContainer = startSelenoidContainer;
 exports.startSelenoidStandalone = startSelenoidStandalone;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _util = require("util");
-
 var _fs = require("fs");
-
 var _utils = require("../utils");
-
 var _docker = require("../docker");
-
 var _core = require("@octokit/core");
-
 var _messages = require("../messages");
-
 var _cluster = _interopRequireDefault(require("cluster"));
-
 var _shelljs = require("shelljs");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mkdirAsync = (0, _util.promisify)(_fs.mkdir);
 const writeFileAsync = (0, _util.promisify)(_fs.writeFile);
 const copyFileAsync = (0, _util.promisify)(_fs.copyFile);
-
 async function createSelenoidConfig(browsers, {
   useDocker
 }) {
   const selenoidConfig = {};
-
   const selenoidConfigDir = _path.default.join((0, _utils.getCreeveyCache)(), 'selenoid');
-
   browsers.forEach(({
     browserName,
     version = 'latest',
@@ -60,7 +46,6 @@ async function createSelenoidConfig(browsers, {
   await writeFileAsync(_path.default.join(selenoidConfigDir, 'browsers.json'), JSON.stringify(selenoidConfig));
   return selenoidConfigDir;
 }
-
 async function downloadSelenoidBinary(destination) {
   const platformNameMapping = {
     darwin: 'selenoid_darwin_amd64',
@@ -82,14 +67,11 @@ async function downloadSelenoidBinary(destination) {
     name
   }) => platformNameMapping[process.platform] == name) ?? {};
   if ((0, _fs.existsSync)(destination) && (0, _fs.lstatSync)(destination).size == binarySize) return;
-
   if (!downloadUrl) {
     throw new Error(`Couldn't get download url for selenoid binary. Please download it manually from "https://github.com/aerokube/selenoid/releases/latest" and define "selenoidPath" option in the Creevey config`);
   }
-
   return (0, _utils.downloadBinary)(downloadUrl, destination);
 }
-
 async function startSelenoidStandalone(config, debug) {
   config.gridUrl = 'http://localhost:4444/wd/hub';
   if (_cluster.default.isWorker) return;
@@ -97,37 +79,30 @@ async function startSelenoidStandalone(config, debug) {
   const selenoidConfigDir = await createSelenoidConfig(browsers, {
     useDocker: false
   });
-
   const binaryPath = _path.default.join(selenoidConfigDir, process.platform == 'win32' ? 'selenoid.exe' : 'selenoid');
-
   if (config.selenoidPath) {
     await copyFileAsync(_path.default.resolve(config.selenoidPath), binaryPath);
   } else {
     await downloadSelenoidBinary(binaryPath);
-  } // TODO Download browser webdrivers
-
+  }
 
+  // TODO Download browser webdrivers
   try {
     if (process.platform != 'win32') (0, _shelljs.chmod)('+x', binaryPath);
   } catch (_) {
     /* noop */
   }
-
   const selenoidProcess = (0, _shelljs.exec)(`${binaryPath} -conf ./browsers.json -disable-docker`, {
     async: true,
     cwd: selenoidConfigDir
   });
-
   if (debug) {
     var _selenoidProcess$stdo, _selenoidProcess$stde;
-
-    (_selenoidProcess$stdo = selenoidProcess.stdout) === null || _selenoidProcess$stdo === void 0 ? void 0 : _selenoidProcess$stdo.pipe(process.stdout);
-    (_selenoidProcess$stde = selenoidProcess.stderr) === null || _selenoidProcess$stde === void 0 ? void 0 : _selenoidProcess$stde.pipe(process.stderr);
+    (_selenoidProcess$stdo = selenoidProcess.stdout) === null || _selenoidProcess$stdo === void 0 || _selenoidProcess$stdo.pipe(process.stdout);
+    (_selenoidProcess$stde = selenoidProcess.stderr) === null || _selenoidProcess$stde === void 0 || _selenoidProcess$stde.pipe(process.stderr);
   }
-
   (0, _messages.subscribeOn)('shutdown', () => selenoidProcess.kill());
 }
-
 async function startSelenoidContainer(config, debug) {
   const browsers = Object.values(config.browsers).filter(browser => !browser.gridUrl);
   const images = [];
@@ -146,13 +121,12 @@ async function startSelenoidContainer(config, debug) {
     auth: config.dockerAuth,
     platform: config.dockerImagePlatform
   };
-
   if (config.pullImages) {
     await (0, _docker.pullImages)([selenoidImage], pullOptions);
     await (0, _docker.pullImages)(images, pullOptions);
-  } // TODO Allow pass custom options
-
+  }
 
+  // TODO Allow pass custom options
   const selenoidOptions = {
     ExposedPorts: {
       '4444/tcp': {}

package/lib/cjs/server/stories.js

@@ -6,33 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.loadTestsFromStories = loadTestsFromStories;
 exports.saveStoriesJson = saveStoriesJson;
 exports.saveTestsJson = saveTestsJson;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = require("fs");
-
 var _crypto = require("crypto");
-
 var _lodash = require("lodash");
-
 var _types = require("../types");
-
 var _utils = require("./utils");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function storyTestFabric(delay, testFn) {
   return async function storyTest() {
     delay ? await new Promise(resolve => setTimeout(resolve, delay)) : void 0;
     await (testFn ? testFn.call(this) : this.screenshots.length > 0 ? this.expect(this.screenshots.reduce((screenshots, {
       imageName,
       screenshot
-    }, index) => ({ ...screenshots,
+    }, index) => ({
+      ...screenshots,
       [imageName ?? `screenshot_${index}`]: screenshot
     }), {})).to.matchImages() : this.expect(await this.takeScreenshot()).to.matchImage());
   };
 }
-
 function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
   const {
     kind,
@@ -54,7 +46,6 @@ function createCreeveyTest(browser, storyMeta, skipOptions, testName) {
     storyId
   };
 }
-
 function convertStories(browserName, stories) {
   const tests = {};
   (Array.isArray(stories) ? stories : Object.values(stories)).forEach(storyMeta => {
@@ -65,24 +56,27 @@ function convertStories(browserName, stories) {
       tests: storyTests,
       skip
     } = storyMeta.parameters.creevey ?? {};
-    const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0; // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
+    const delay = typeof delayParam == 'number' ? delayParam : delayParam !== null && delayParam !== void 0 && delayParam.for.includes(browserName) ? delayParam.ms : 0;
+
+    // typeof tests === "undefined" => rootSuite -> kindSuite -> storyTest -> [browsers.png]
     // typeof tests === "function"  => rootSuite -> kindSuite -> storyTest -> browser -> [images.png]
     // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
     // typeof tests === "object"    => rootSuite -> kindSuite -> storySuite -> test -> browser -> [images.png]
 
     if (!storyTests) {
       const test = createCreeveyTest(browserName, storyMeta, skip);
-      tests[test.id] = { ...test,
+      tests[test.id] = {
+        ...test,
         storyId: storyMeta.id,
         story: storyMeta,
         fn: storyTestFabric(delay)
       };
       return;
     }
-
     Object.entries(storyTests).forEach(([testName, testFn]) => {
       const test = createCreeveyTest(browserName, storyMeta, skip, testName);
-      tests[test.id] = { ...test,
+      tests[test.id] = {
+        ...test,
         storyId: storyMeta.id,
         story: storyMeta,
         fn: storyTestFabric(delay, testFn)
@@ -91,7 +85,6 @@ function convertStories(browserName, stories) {
   });
   return tests;
 }
-
 async function loadTestsFromStories(browsers, provider, update) {
   const testIdsByFiles = new Map();
   const stories = await provider(storiesByFiles => {
@@ -100,7 +93,6 @@ async function loadTestsFromStories(browsers, provider, update) {
     browsers.forEach(browser => {
       Array.from(storiesByFiles.entries()).forEach(([filename, stories]) => {
         var _testIdsByFiles$get;
-
         Object.assign(tests, convertStories(browser, stories));
         const changed = Object.keys(tests);
         const removed = ((_testIdsByFiles$get = testIdsByFiles.get(filename)) === null || _testIdsByFiles$get === void 0 ? void 0 : _testIdsByFiles$get.filter(testId => !tests[testId])) ?? [];
@@ -109,7 +101,7 @@ async function loadTestsFromStories(browsers, provider, update) {
         removed.forEach(testId => testsDiff[testId] = undefined);
       });
     });
-    update === null || update === void 0 ? void 0 : update(testsDiff);
+    update === null || update === void 0 || update(testsDiff);
   });
   const tests = browsers.reduce((tests, browser) => Object.assign(tests, convertStories(browser, stories)), {});
   Object.values(tests).filter(_types.isDefined).forEach(({
@@ -119,23 +111,26 @@ async function loadTestsFromStories(browsers, provider, update) {
         fileName
       }
     }
-  }) => // TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
+  }) =>
+  // TODO Don't use filename as a key, due possible collisions if two require.context with same structure of modules are defined
   testIdsByFiles.set(fileName, [...(testIdsByFiles.get(fileName) ?? []), id]));
   return tests;
 }
-
 function saveStoriesJson(storiesData, extract) {
-  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract; // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
+  const outputDir = typeof extract == 'boolean' ? 'storybook-static' : extract;
 
+  // NOTE Copy-pasted from Storybook's `getStoriesJsonData` method
   const allowed = ['fileName', 'docsOnly', 'framework', '__id', '__isArgsStory'];
-  storiesData.globalParameters = (0, _lodash.pick)(storiesData.globalParameters, allowed); // @ts-expect-error ignore error
-
-  storiesData.kindParameters = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed)); // @ts-expect-error ignore error
-
-  storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({ ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
+  storiesData.globalParameters = (0, _lodash.pick)(storiesData.globalParameters, allowed);
+  // @ts-expect-error ignore error
+  storiesData.kindParameters = (0, _lodash.mapValues)(storiesData.kindParameters, v => (0, _lodash.pick)(v, allowed));
+  // @ts-expect-error ignore error
+  storiesData.stories = (0, _lodash.mapValues)(storiesData.stories, v => ({
+    ...(0, _lodash.pick)(v, ['id', 'name', 'kind', 'story']),
     parameters: (0, _lodash.pick)(v.parameters, allowed)
-  })); // TODO Fix args stories
+  }));
 
+  // TODO Fix args stories
   (0, _utils.removeProps)(storiesData ?? {}, ['stories', () => true, 'parameters', '__isArgsStory']);
   Object.values((storiesData === null || storiesData === void 0 ? void 0 : storiesData.stories) ?? {}).forEach(story => (0, _types.isObject)(story) && 'parameters' in story && (0, _types.isObject)(story.parameters) && delete story.parameters.__isArgsStory);
   (0, _fs.mkdirSync)(outputDir, {
@@ -143,11 +138,11 @@ function saveStoriesJson(storiesData, extract) {
   });
   (0, _fs.writeFileSync)(_path.default.join(outputDir, 'stories.json'), JSON.stringify(storiesData, null, 2));
 }
-
 function saveTestsJson(tests, dstPath = process.cwd()) {
   (0, _fs.mkdirSync)(dstPath, {
     recursive: true
   });
-  (0, _fs.writeFileSync)(_path.default.join(dstPath, 'tests.json'), // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  (0, _fs.writeFileSync)(_path.default.join(dstPath, 'tests.json'),
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   JSON.stringify(tests, (_, value) => (0, _types.isFunction)(value) ? value.toString() : value, 2));
 }

package/lib/cjs/server/storybook/providers/browser.js

@@ -4,26 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadStories = void 0;
-
 var _cluster = _interopRequireDefault(require("cluster"));
-
 var _selenium = require("../../selenium");
-
 var _messages = require("../../messages");
-
 var _types = require("../../../types");
-
 var _logger = require("../../logger");
-
 var _shared = require("../../../shared");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const loadStories = async (_config, _options, storiesListener) => {
   if (_cluster.default.isPrimary) {
     return new Promise(resolve => {
       const worker = Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).find(worker => worker.isConnected());
-
       if (worker) {
         const unsubscribe = (0, _messages.subscribeOnWorker)(worker, 'stories', message => {
           if (message.type == 'set') {
@@ -40,7 +31,6 @@ const loadStories = async (_config, _options, storiesListener) => {
           type: 'get'
         });
       }
-
       (0, _messages.subscribeOn)('stories', message => {
         // TODO updates only one browser :(
         if (message.type == 'update') storiesListener(new Map(message.payload));
@@ -60,17 +50,14 @@ const loadStories = async (_config, _options, storiesListener) => {
     const stories = (0, _shared.deserializeRawStories)(await (0, _selenium.loadStoriesFromBrowser)());
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
-      var _parameters, _parameters$creevey;
-
-      if ((_parameters = story.parameters) !== null && _parameters !== void 0 && (_parameters$creevey = _parameters.creevey) !== null && _parameters$creevey !== void 0 && _parameters$creevey.tests) {
-        var _parameters2, _parameters2$creevey;
-
-        (_parameters2 = story.parameters) === null || _parameters2 === void 0 ? true : (_parameters2$creevey = _parameters2.creevey) === null || _parameters2$creevey === void 0 ? true : delete _parameters2$creevey.tests;
+      var _parameters;
+      if ((_parameters = story.parameters) !== null && _parameters !== void 0 && (_parameters = _parameters.creevey) !== null && _parameters !== void 0 && _parameters.tests) {
+        var _parameters2;
+        (_parameters2 = story.parameters) === null || _parameters2 === void 0 || (_parameters2 = _parameters2.creevey) === null || _parameters2 === void 0 || delete _parameters2.tests;
         storiesWithOldTests.push(`${story.kind}/${story.name}`);
       }
     });
     return stories;
   }
 };
-
 exports.loadStories = loadStories;

package/lib/cjs/server/storybook/providers/hybrid.js

@@ -4,79 +4,59 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.loadStories = void 0;
-
 var _chokidar = _interopRequireDefault(require("chokidar"));
-
 var _browser = require("./browser");
-
 var _logger = require("../../logger");
-
 var _parser = _interopRequireDefault(require("../../testsFiles/parser"));
-
 var _utils = require("../../../server/utils");
-
 var _shared = require("../../../shared");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const loadStories = async (_config, _options, storiesListener) => {
   let creeveyParamsByStoryId = {};
-
   const mergeParamsFromTestsToStory = (story, creeveyParams) => {
     if (story.parameters) {
       story.parameters.creevey = (0, _shared.combineParameters)(story.parameters.creevey || {}, creeveyParams);
     }
   };
-
   const stories = await (0, _browser.loadStories)(_config, {}, updatedStoriesByFiles => {
     Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
       storiesArray.forEach(story => {
         const creeveyParams = creeveyParamsByStoryId[story.id];
-
         if (creeveyParams) {
           mergeParamsFromTestsToStory(story, creeveyParams);
         }
       });
     });
     storiesListener(updatedStoriesByFiles);
-  }); // TODO fix test files hot reloading
+  });
 
-  creeveyParamsByStoryId = await parseParams(_config
-  /*, (data) => console.log(data) */
-  );
+  // TODO fix test files hot reloading
+  creeveyParamsByStoryId = await parseParams(_config /*, (data) => console.log(data) */);
   Object.entries(stories).forEach(([storyId, story]) => {
     mergeParamsFromTestsToStory(story, creeveyParamsByStoryId[storyId]);
   });
   return stories;
 };
-
 exports.loadStories = loadStories;
-
 async function parseParams(config, listener) {
   if (!config.testsDir) {
     return Promise.resolve({});
   }
-
   const testFiles = (0, _utils.readDirRecursive)(config.testsDir).filter(file => {
     var _config$testsRegex;
-
     return (_config$testsRegex = config.testsRegex) === null || _config$testsRegex === void 0 ? void 0 : _config$testsRegex.test(file);
   });
   await (await Promise.resolve().then(() => _interopRequireWildcard(require('../../testsFiles/register')))).default(config);
-
   if (listener) {
     _chokidar.default.watch(testFiles).on('change', filePath => {
-      _logger.logger.debug(`changed: ${filePath}`); // doesn't work, always returns {} due modules caching
-      // see https://github.com/nodejs/modules/issues/307
-
+      _logger.logger.debug(`changed: ${filePath}`);
 
+      // doesn't work, always returns {} due modules caching
+      // see https://github.com/nodejs/modules/issues/307
       void (0, _parser.default)(testFiles).then(data => listener(data));
     });
   }
-
   return (0, _parser.default)(testFiles);
 }

package/lib/cjs/server/testsFiles/parser.js

@@ -5,43 +5,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parse;
 exports.test = exports.story = exports.kind = void 0;
-
 var _csf = require("@storybook/csf");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function parse(files) {
   result = {};
-  await Promise.all(files.map(async file => Promise.resolve(`${file}`).then(s => _interopRequireWildcard(require(s)))));
+  await Promise.all(files.map(async file => (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(file)));
   return result;
 }
-
 let result = {};
 let kindTitle = '';
 let storyTitle = '';
 let storyParams = null;
-
 const setStoryParameters = params => {
   storyParams = params;
 };
-
 const getStoryId = (kindTitle, storyTitle) => {
   return (0, _csf.toId)(kindTitle, (0, _csf.storyNameFromExport)(storyTitle));
 };
-
 const kind = (title, kindFn) => {
   kindTitle = title;
   kindFn();
   kindTitle = '';
 };
-
 exports.kind = kind;
-
 const story = (title, storyFn) => {
   var _result$storyId;
-
   storyTitle = title;
   storyParams = null;
   storyFn({
@@ -54,19 +43,14 @@ const story = (title, storyFn) => {
   storyTitle = '';
   storyParams = null;
 };
-
 exports.story = story;
-
 const test = (title, testFn) => {
   const storyId = getStoryId(kindTitle, storyTitle);
-
   if (!result[storyId]) {
     result[storyId] = {};
   }
-
   result[storyId].tests = Object.assign({}, result[storyId].tests, {
     [title]: testFn
   });
 };
-
 exports.test = test;

package/lib/cjs/server/testsFiles/register.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = register;
-
 var _pirates = require("pirates");
-
 var _getTsconfig = require("get-tsconfig");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function register(config) {
   (0, _pirates.addHook)(() => '', {
     exts: ['.jpg', '.jpeg', '.png', '.gif', '.eot', '.otf', '.svg', '.ttf', '.woff', '.woff2', '.css', '.less', '.scss', '.styl'],
@@ -20,8 +15,9 @@ async function register(config) {
   });
   const {
     path: tsConfigPath
-  } = (0, _getTsconfig.getTsconfig)(config.tsConfig) || {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+  } = (0, _getTsconfig.getTsconfig)(config.tsConfig) || {};
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
   (await Promise.resolve().then(() => _interopRequireWildcard(require('@babel/register')))).default(config.babelOptions({
     babelrc: false,
     rootMode: 'upward-optional',
@@ -40,5 +36,7 @@ async function register(config) {
     plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
       tsconfig: tsConfigPath
     }]] : [])]
-  })); // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
+  }));
+
+  // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
 }

package/lib/cjs/server/update.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = update;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireWildcard(require("fs"));
-
 var _micromatch = _interopRequireDefault(require("micromatch"));
-
 var _types = require("../types");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function tryToLoadTestsData(filename) {
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -27,28 +19,22 @@ function tryToLoadTestsData(filename) {
     /* noop */
   }
 }
-
 const actualRegex = /^(.*)-actual-(\d+)\.png$/i;
-
 function approve(dirents, srcPath, dstPath, testPaths, isMatch) {
   dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     (0, _fs.mkdirSync)(dstPath, {
       recursive: true
     });
-
     _fs.default.copyFileSync(_path.default.join(srcPath, `${imageName}-actual-${retry}.png`), _path.default.join(dstPath, `${imageName}.png`));
   });
 }
-
 function traverse(srcPath, dstPath, testPaths, isMatch) {
   const dirents = _fs.default.readdirSync(srcPath, {
     withFileTypes: true
   });
-
   approve(dirents, srcPath, dstPath, testPaths, isMatch);
   dirents.filter(dirent => dirent.isDirectory()).map(dirent => [dirent.name, testPaths === null || testPaths === void 0 ? void 0 : testPaths.map(([token, ...restPath]) => token == dirent.name ? restPath : null).filter(_types.isDefined)]).filter(([, paths]) => !paths || paths.length > 0).forEach(([dirname, paths]) => traverse(_path.default.join(srcPath, dirname), _path.default.join(dstPath, dirname), paths, isMatch));
 }
-
 function update(config, grepPattern) {
   const {
     reportDir,
@@ -60,13 +46,11 @@ function update(config, grepPattern) {
   const testsMeta = tryToLoadTestsData(`${reportDir}/tests.json`);
   const testsReport = tryToLoadTestsData(`${reportDir}/data`);
   let testPaths = null;
-
   if (testsMeta && testsReport) {
     testPaths = Object.values(testsMeta).filter(_types.isDefined).filter(({
       id
     }) => {
       var _testsReport$id;
-
       return ((_testsReport$id = testsReport[id]) === null || _testsReport$id === void 0 ? void 0 : _testsReport$id.status) == 'failed';
     }).map(({
       storyPath,
@@ -74,6 +58,5 @@ function update(config, grepPattern) {
       browser
     }) => [...storyPath, ...(testName ? [testName] : []), browser]);
   }
-
   traverse(reportDir, screenDir, testPaths, value => isMatch(_path.default.relative(reportDir, value)));
 }