creevey 0.8.1-beta.0 → 0.8.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.8.1](https://github.com/wKich/creevey/compare/v0.8.1-beta.1...v0.8.1) (2023-05-29)
+
+## [0.8.1-beta.1](https://github.com/wKich/creevey/compare/v0.8.1-beta.0...v0.8.1-beta.1) (2023-05-05)
+
+### Bug Fixes
+
+- **providers:** set creevey port for all providers ([79e8aae](https://github.com/wKich/creevey/commit/79e8aae629d79260f93a93057486bab659801a46))
+
 ## [0.8.1-beta.0](https://github.com/wKich/creevey/compare/v0.8.0...v0.8.1-beta.0) (2023-04-11)
 
 ### Bug Fixes

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

@@ -429,21 +429,18 @@ async function resolveCreeveyHost(browser, port) {
   return creeveyServerHost;
 }
 
-async function loadStoriesFromBrowser(port) {
+async function loadStoriesFromBrowser() {
   if (!browser) throw new Error("Can't get stories from browser if webdriver isn't connected");
-  const host = await resolveCreeveyHost(browser, port);
-  const stories = await browser.executeAsyncScript(function (creeveyHost, creeveyPort, callback) {
-    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
-    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  const stories = await browser.executeAsyncScript(function (callback) {
     void window.__CREEVEY_GET_STORIES__().then(callback);
-  }, host, port);
+  });
   if (!stories) throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
   return stories;
 }
 
-async function getBrowser(config, name) {
+async function getBrowser(config, options) {
   if (browser) return browser;
-  browserName = name;
+  browserName = options.browser;
   const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
@@ -473,7 +470,7 @@ async function getBrowser(config, name) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${name}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
+    browserLogger.debug(`(${browserName}) Connecting to Selenium ${_chalk.default.magenta(url.toString())}`);
     browser = await new _seleniumWebdriver.Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -487,14 +484,14 @@ async function getBrowser(config, name) {
       /* noop */
     }
 
-    browserLogger.debug(`(${name}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${browserName}) Connected successful with ${[_chalk.default.green(browserHost), _chalk.default.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = (0, _loglevel.getLogger)(sessionId);
 
     _loglevelPluginPrefix.default.apply(browserLogger, {
       format(level) {
         const levelColor = _logger.colors[level.toUpperCase()];
 
-        return `[${name}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${_chalk.default.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -528,9 +525,12 @@ async function getBrowser(config, name) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
-  await browser.executeScript(function (workerId) {
+  const creeveyHost = await resolveCreeveyHost(browser, options.port);
+  await browser.executeScript(function (workerId, creeveyHost, creeveyPort) {
     window.__CREEVEY_WORKER_ID__ = workerId;
-  }, process.pid);
+    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
+    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  }, process.pid, creeveyHost, options.port);
   return browser;
 }
 

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _cluster = _interopRequireDefault(require("cluster"));
 
@@ -17,9 +17,7 @@ var _logger = require("../../logger");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-async function loadStories(_config, {
-  port
-}, storiesListener) {
+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());
@@ -57,7 +55,7 @@ async function loadStories(_config, {
       });
       if (message.type == 'update') storiesListener(new Map(message.payload));
     });
-    const stories = await (0, _selenium.loadStoriesFromBrowser)(port);
+    const stories = await (0, _selenium.loadStoriesFromBrowser)();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -71,4 +69,6 @@ async function loadStories(_config, {
     });
     return stories;
   }
-}
+};
+
+exports.loadStories = loadStories;

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.extractStoriesData = extractStoriesData;
-exports.loadStories = loadStories;
+exports.loadStories = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -189,10 +189,10 @@ async function loadStoriesDirectly(config, {
 } // TODO Do we need to support multiple storybooks here?
 
 
-async function loadStories(config, {
+const loadStories = async (config, {
   watch,
   debug
-}, storiesListener) {
+}, storiesListener) => {
   const storybookApi = await initStorybookEnvironment();
   const Events = await (0, _helpers.importStorybookCoreEvents)();
   const {
@@ -217,7 +217,9 @@ async function loadStories(config, {
     debug
   });
   return loadPromise;
-}
+};
+
+exports.loadStories = loadStories;
 
 async function extractStoriesData(config, {
   watch,

package/lib/cjs/server/worker/worker.js

@@ -194,7 +194,7 @@ async function worker(config, options) {
 
   _chai.default.use((0, _chaiImage.default)(getExpected, config.diffOptions));
 
-  if ((await (0, _selenium.getBrowser)(config, options.browser)) == null) return;
+  if ((await (0, _selenium.getBrowser)(config, options)) == null) return;
   await (0, _helpers.addTestsFromStories)(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -205,12 +205,12 @@ async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await (0, _selenium.getBrowser)(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await (0, _selenium.closeBrowser)();
   }
 
-  const browser = await (0, _selenium.getBrowser)(config, options.browser);
+  const browser = await (0, _selenium.getBrowser)(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
   const interval = setInterval(() => void browser.getCurrentUrl().then(url => {

package/lib/esm/server/selenium/browser.js

@@ -401,20 +401,17 @@ async function resolveCreeveyHost(browser, port) {
   return creeveyServerHost;
 }
 
-export async function loadStoriesFromBrowser(port) {
+export async function loadStoriesFromBrowser() {
   if (!browser) throw new Error("Can't get stories from browser if webdriver isn't connected");
-  const host = await resolveCreeveyHost(browser, port);
-  const stories = await browser.executeAsyncScript(function (creeveyHost, creeveyPort, callback) {
-    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
-    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  const stories = await browser.executeAsyncScript(function (callback) {
     void window.__CREEVEY_GET_STORIES__().then(callback);
-  }, host, port);
+  });
   if (!stories) throw new Error("Can't get stories, it seems creevey or storybook API isn't available");
   return stories;
 }
-export async function getBrowser(config, name) {
+export async function getBrowser(config, options) {
   if (browser) return browser;
-  browserName = name;
+  browserName = options.browser;
   const browserConfig = config.browsers[browserName];
   const {
     gridUrl = config.gridUrl,
@@ -444,7 +441,7 @@ export async function getBrowser(config, name) {
     const url = new URL(gridUrl);
     url.username = url.username ? '********' : '';
     url.password = url.password ? '********' : '';
-    browserLogger.debug(`(${name}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
+    browserLogger.debug(`(${browserName}) Connecting to Selenium ${chalk.magenta(url.toString())}`);
     browser = await new Builder().usingServer(gridUrl).withCapabilities(capabilities).build();
     const sessionId = (_await$browser$getSes = await browser.getSession()) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
     let browserHost = '';
@@ -458,12 +455,12 @@ export async function getBrowser(config, name) {
       /* noop */
     }
 
-    browserLogger.debug(`(${name}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
+    browserLogger.debug(`(${browserName}) Connected successful with ${[chalk.green(browserHost), chalk.magenta(sessionId)].filter(Boolean).join(':')}`);
     browserLogger = getLogger(sessionId);
     prefix.apply(browserLogger, {
       format(level) {
         const levelColor = colors[level.toUpperCase()];
-        return `[${name}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
+        return `[${browserName}:${chalk.gray(sessionId)}] ${levelColor(level)} =>`;
       }
 
     });
@@ -496,9 +493,12 @@ export async function getBrowser(config, name) {
     await updateStorybookGlobals(browser, _storybookGlobals);
   }
 
-  await browser.executeScript(function (workerId) {
+  const creeveyHost = await resolveCreeveyHost(browser, options.port);
+  await browser.executeScript(function (workerId, creeveyHost, creeveyPort) {
     window.__CREEVEY_WORKER_ID__ = workerId;
-  }, process.pid);
+    window.__CREEVEY_SERVER_HOST__ = creeveyHost;
+    window.__CREEVEY_SERVER_PORT__ = creeveyPort;
+  }, process.pid, creeveyHost, options.port);
   return browser;
 }
 

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

@@ -3,9 +3,7 @@ import { loadStoriesFromBrowser } from '../../selenium';
 import { emitStoriesMessage, sendStoriesMessage, subscribeOn, subscribeOnWorker } from '../../messages';
 import { isDefined } from '../../../types';
 import { logger } from '../../logger';
-export async function loadStories(_config, {
-  port
-}, storiesListener) {
+export const loadStories = async (_config, _options, storiesListener) => {
   if (cluster.isPrimary) {
     return new Promise(resolve => {
       const worker = Object.values(cluster.workers ?? {}).filter(isDefined).find(worker => worker.isConnected());
@@ -43,7 +41,7 @@ export async function loadStories(_config, {
       });
       if (message.type == 'update') storiesListener(new Map(message.payload));
     });
-    const stories = await loadStoriesFromBrowser(port);
+    const stories = await loadStoriesFromBrowser();
     const storiesWithOldTests = [];
     Object.values(stories).forEach(story => {
       var _parameters, _parameters$creevey;
@@ -57,4 +55,4 @@ export async function loadStories(_config, {
     });
     return stories;
   }
-}
+};

package/lib/esm/server/storybook/providers/nodejs.js

@@ -169,10 +169,10 @@ async function loadStoriesDirectly(config, {
 } // TODO Do we need to support multiple storybooks here?
 
 
-export async function loadStories(config, {
+export const loadStories = async (config, {
   watch,
   debug
-}, storiesListener) {
+}, storiesListener) => {
   const storybookApi = await initStorybookEnvironment();
   const Events = await importStorybookCoreEvents();
   const {
@@ -197,7 +197,7 @@ export async function loadStories(config, {
     debug
   });
   return loadPromise;
-}
+};
 export async function extractStoriesData(config, {
   watch,
   debug

package/lib/esm/server/worker/worker.js

@@ -166,7 +166,7 @@ export default async function worker(config, options) {
   const mocha = new Mocha(mochaOptions);
   mocha.cleanReferencesAfterRun(false);
   chai.use(chaiImage(getExpected, config.diffOptions));
-  if ((await getBrowser(config, options.browser)) == null) return;
+  if ((await getBrowser(config, options)) == null) return;
   await addTestsFromStories(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
@@ -177,12 +177,12 @@ export default async function worker(config, options) {
   try {
     var _await$getBrowser;
 
-    await ((_await$getBrowser = await getBrowser(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await getBrowser(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await closeBrowser();
   }
 
-  const browser = await getBrowser(config, options.browser);
+  const browser = await getBrowser(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
   const interval = setInterval(() => void browser.getCurrentUrl().then(url => {

package/lib/types/server/selenium/browser.d.ts

@@ -1,6 +1,6 @@
 import { Context } from 'mocha';
 import { WebDriver } from 'selenium-webdriver';
-import { Config, StorybookGlobals, StoriesRaw } from '../../types';
+import { Config, StorybookGlobals, StoriesRaw, Options } from '../../types';
 declare global {
     interface Window {
         __CREEVEY_RESTORE_SCROLL__?: () => void;
@@ -11,7 +11,9 @@ declare global {
 }
 export declare function takeScreenshot(browser: WebDriver, captureElement?: string | null, ignoreElements?: string | string[] | null): Promise<string>;
 export declare function updateStorybookGlobals(browser: WebDriver, globals: StorybookGlobals): Promise<void>;
-export declare function loadStoriesFromBrowser(port: number): Promise<StoriesRaw>;
-export declare function getBrowser(config: Config, name: string): Promise<WebDriver | null>;
+export declare function loadStoriesFromBrowser(): Promise<StoriesRaw>;
+export declare function getBrowser(config: Config, options: Options & {
+    browser: string;
+}): Promise<WebDriver | null>;
 export declare function closeBrowser(): Promise<void>;
 export declare function switchStory(this: Context): Promise<void>;

package/lib/types/server/storybook/providers/browser.d.ts

@@ -1,4 +1,2 @@
-import type { Config, StoriesRaw, StoryInput } from '../../../types';
-export declare function loadStories(_config: Config, { port }: {
-    port: number;
-}, storiesListener: (stories: Map<string, StoryInput[]>) => void): Promise<StoriesRaw>;
+import type { StoriesProvider } from '../../../types';
+export declare const loadStories: StoriesProvider;

package/lib/types/server/storybook/providers/nodejs.d.ts

@@ -1,8 +1,5 @@
-import type { StoryInput, SetStoriesData, Config, StoriesRaw } from '../../../types';
-export declare function loadStories(config: Config, { watch, debug }: {
-    watch: boolean;
-    debug: boolean;
-}, storiesListener: (stories: Map<string, StoryInput[]>) => void): Promise<StoriesRaw>;
+import type { SetStoriesData, Config, StoriesProvider } from '../../../types';
+export declare const loadStories: StoriesProvider;
 export declare function extractStoriesData(config: Config, { watch, debug }: {
     watch: boolean;
     debug: boolean;

package/lib/types/types.d.ts

@@ -209,11 +209,7 @@ export interface Config {
      * }
      * ```
      */
-    storiesProvider: (config: Config, options: {
-        watch: boolean;
-        debug: boolean;
-        port: number;
-    }, storiesListener: (stories: Map<string, StoryInput[]>) => void) => Promise<StoriesRaw>;
+    storiesProvider: StoriesProvider;
     /**
      * Define custom babel options for load stories transformation
      */
@@ -248,6 +244,10 @@ export interface Config {
      */
     dockerImagePlatform: string;
 }
+export declare type StoriesProvider = (config: Config, options: {
+    watch: boolean;
+    debug: boolean;
+}, storiesListener: (stories: Map<string, StoryInput[]>) => void) => Promise<StoriesRaw>;
 export declare type CreeveyConfig = Partial<Config>;
 export interface Options {
     config?: string;

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.8.1-beta.0",
+  "version": "0.8.1",
   "bin": {
     "creevey": "./lib/cjs/cli.js"
   },