creevey 0.10.0-beta.25 → 0.10.0-beta.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. package/dist/client/web/assets/{index-Bmw2S3ik.js → index-Bk1_hhr8.js} +83 -83
  2. package/dist/client/web/index.html +1 -1
  3. package/dist/creevey.js +3 -3
  4. package/dist/creevey.js.map +1 -1
  5. package/dist/server/config.js +18 -2
  6. package/dist/server/config.js.map +1 -1
  7. package/dist/server/connection.d.ts +2 -3
  8. package/dist/server/connection.js +6 -13
  9. package/dist/server/connection.js.map +1 -1
  10. package/dist/server/index.js +28 -12
  11. package/dist/server/index.js.map +1 -1
  12. package/dist/server/master/pool.d.ts +1 -0
  13. package/dist/server/master/pool.js +4 -2
  14. package/dist/server/master/pool.js.map +1 -1
  15. package/dist/server/master/queue.d.ts +1 -1
  16. package/dist/server/master/queue.js +13 -6
  17. package/dist/server/master/queue.js.map +1 -1
  18. package/dist/server/playwright/internal.js +6 -15
  19. package/dist/server/playwright/internal.js.map +1 -1
  20. package/dist/server/selenium/internal.js +6 -15
  21. package/dist/server/selenium/internal.js.map +1 -1
  22. package/dist/server/selenium/selenoid.js +8 -4
  23. package/dist/server/selenium/selenoid.js.map +1 -1
  24. package/dist/server/utils.js +5 -2
  25. package/dist/server/utils.js.map +1 -1
  26. package/dist/types.d.ts +2 -0
  27. package/dist/types.js.map +1 -1
  28. package/package.json +3 -1
  29. package/src/creevey.ts +3 -3
  30. package/src/server/config.ts +19 -1
  31. package/src/server/connection.ts +7 -13
  32. package/src/server/index.ts +32 -16
  33. package/src/server/master/pool.ts +6 -2
  34. package/src/server/master/queue.ts +20 -7
  35. package/src/server/playwright/internal.ts +5 -18
  36. package/src/server/selenium/internal.ts +5 -18
  37. package/src/server/selenium/selenoid.ts +7 -4
  38. package/src/server/utils.ts +3 -2
  39. package/src/types.ts +2 -0
package/dist/client/web/index.html CHANGED
@@ -20,7 +20,7 @@
20
20
  sans-serif;
21
21
  }
22
22
  </style>
23
- <script type="module" crossorigin src="./assets/index-Bmw2S3ik.js"></script>
23
+ <script type="module" crossorigin src="./assets/index-Bk1_hhr8.js"></script>
24
24
  </head>
25
25
  <body>
26
26
  <div id="root"></div>
package/dist/creevey.js CHANGED
@@ -31,10 +31,10 @@ process.on('SIGINT', () => {
31
31
  utils_js_1.isShuttingDown.current = true;
32
32
  });
33
33
  const argv = (0, minimist_1.default)(process.argv.slice(2), {
34
- string: ['browser', 'config', 'reporter', 'reportDir', 'screenDir', 'gridUrl', 'storybookUrl'],
34
+ string: ['browser', 'config', 'reporter', 'reportDir', 'screenDir', 'gridUrl', 'storybookUrl', 'storybookPort'],
35
35
  boolean: ['debug', 'trace', 'ui', 'odiff', 'noDocker'],
36
- default: { port: 3000 },
37
- alias: { port: 'p', config: 'c', debug: 'd', update: 'u' },
36
+ default: { port: '3000' },
37
+ alias: { port: 'p', config: 'c', debug: 'd', update: 'u', storybookStart: 's' },
38
38
  });
39
39
  if ('port' in argv && !isNaN(argv.port))
40
40
  argv.port = Number(argv.port);
package/dist/creevey.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"creevey.js","sourceRoot":"","sources":["../src/creevey.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"creevey.js","sourceRoot":"","sources":["../src/creevey.ts"],"names":[],"mappings":"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"}
package/dist/server/config.js CHANGED
@@ -7,6 +7,7 @@ exports.defaultConfig = exports.defaultBrowser = void 0;
7
7
  exports.readConfig = readConfig;
8
8
  const fs_1 = __importDefault(require("fs"));
9
9
  const path_1 = __importDefault(require("path"));
10
+ const cluster_1 = __importDefault(require("cluster"));
10
11
  const url_1 = require("url");
11
12
  const hybrid_js_1 = require("./providers/hybrid.js");
12
13
  const types_js_1 = require("../types.js");
@@ -82,6 +83,9 @@ async function readConfig(options) {
82
83
  }
83
84
  Object.assign(userConfig, configData);
84
85
  }
86
+ if (userConfig.resolveStorybookUrl && !options.storybookUrl) {
87
+ userConfig.storybookUrl = await userConfig.resolveStorybookUrl();
88
+ }
85
89
  if (options.noDocker)
86
90
  userConfig.useDocker = false;
87
91
  if (options.failFast != undefined)
@@ -92,8 +96,20 @@ async function readConfig(options) {
92
96
  userConfig.screenDir = path_1.default.resolve(options.screenDir);
93
97
  if (options.storybookUrl)
94
98
  userConfig.storybookUrl = options.storybookUrl;
95
- if (options.storybookAutorunCmd)
96
- userConfig.storybookAutorunCmd = options.storybookAutorunCmd;
99
+ if (options.storybookPort && cluster_1.default.isPrimary) {
100
+ const url = new URL(userConfig.storybookUrl);
101
+ url.port = options.storybookPort;
102
+ userConfig.storybookUrl = url.toString();
103
+ }
104
+ if (typeof options.storybookStart === 'string')
105
+ userConfig.storybookAutorunCmd = options.storybookStart;
106
+ if (options.storybookStart && cluster_1.default.isPrimary) {
107
+ const { default: getPort } = await import('get-port');
108
+ const url = new URL(userConfig.storybookUrl);
109
+ const port = await getPort({ port: Number(url.port) });
110
+ url.port = `${port}`;
111
+ userConfig.storybookUrl = url.toString();
112
+ }
97
113
  // NOTE: Hack to pass typescript checking
98
114
  const config = userConfig;
99
115
  Object.entries(config.browsers).forEach(([browser, browserConfig]) => (config.browsers[browser] = normalizeBrowserConfig(browser, browserConfig)));
package/dist/server/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/server/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/server/config.ts"],"names":[],"mappings":"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"}
package/dist/server/connection.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { Config } from 'src/types';
2
- export declare function getStorybookUrl({ storybookUrl, resolveStorybookUrl }: Config): Promise<string>;
3
- export declare function tryAutorunStorybook(url: string, storybookAutorunCmd: string): Promise<void>;
1
+ import type { Config, Options } from '../types';
2
+ export declare function getStorybookUrl({ storybookUrl }: Config, { storybookStart }: Options): [string, string | undefined];
4
3
  export declare function checkIsStorybookConnected(url: string): Promise<boolean>;
package/dist/server/connection.js CHANGED
@@ -1,25 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getStorybookUrl = getStorybookUrl;
4
- exports.tryAutorunStorybook = tryAutorunStorybook;
5
4
  exports.checkIsStorybookConnected = checkIsStorybookConnected;
6
5
  const utils_js_1 = require("./utils.js");
7
6
  const logger_js_1 = require("./logger.js");
8
- const node_child_process_1 = require("node:child_process");
9
- const RESPONSE_FAST_CHECK_TIMEOUT_MS = 3000;
10
7
  const RESPONSE_CHECK_TIMEOUT_MS = 10000;
11
8
  const RESPONSE_CHECK_INTERVAL_MS = 200;
12
- async function getStorybookUrl({ storybookUrl, resolveStorybookUrl }) {
13
- return resolveStorybookUrl ? resolveStorybookUrl() : storybookUrl;
14
- }
15
- async function tryAutorunStorybook(url, storybookAutorunCmd) {
16
- try {
17
- await (0, utils_js_1.waitOnUrl)(url, RESPONSE_FAST_CHECK_TIMEOUT_MS, RESPONSE_CHECK_INTERVAL_MS);
18
- }
19
- catch {
20
- (0, logger_js_1.logger)().info(`Trying start Storybook automatically via \`${storybookAutorunCmd}\` from config...`);
21
- (0, node_child_process_1.exec)(storybookAutorunCmd);
9
+ function getStorybookUrl({ storybookUrl }, { storybookStart }) {
10
+ if (storybookStart) {
11
+ const url = new URL(storybookUrl);
12
+ url.hostname = 'localhost';
13
+ return [url.toString(), storybookUrl];
22
14
  }
15
+ return [storybookUrl, undefined];
23
16
  }
24
17
  async function checkIsStorybookConnected(url) {
25
18
  try {
package/dist/server/connection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/server/connection.ts"],"names":[],"mappings":";;AASA,0CAEC;AAED,kDAOC;AAED,8DASC;AA9BD,yCAAuC;AACvC,2CAAqC;AACrC,2DAA0C;AAE1C,MAAM,8BAA8B,GAAG,IAAI,CAAC;AAC5C,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEhC,KAAK,UAAU,eAAe,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAU;IACjF,OAAO,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;AACpE,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAAC,GAAW,EAAE,mBAA2B;IAChF,IAAI,CAAC;QACH,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,8BAA8B,EAAE,0BAA0B,CAAC,CAAC;IACnF,CAAC;IAAC,MAAM,CAAC;QACP,IAAA,kBAAM,GAAE,CAAC,IAAI,CAAC,8CAA8C,mBAAmB,mBAAmB,CAAC,CAAC;QACpG,IAAA,yBAAI,EAAC,mBAAmB,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAAC,GAAW;IACzD,IAAI,CAAC;QACH,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,MAAe,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,MAAiB,CAAC;QAC9F,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../src/server/connection.ts"],"names":[],"mappings":";;AAOA,0CAOC;AAED,8DASC;AAxBD,yCAAuC;AACvC,2CAAqC;AAErC,MAAM,yBAAyB,GAAG,KAAK,CAAC;AACxC,MAAM,0BAA0B,GAAG,GAAG,CAAC;AAEvC,SAAgB,eAAe,CAAC,EAAE,YAAY,EAAU,EAAE,EAAE,cAAc,EAAW;IACnF,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAClC,GAAG,CAAC,QAAQ,GAAG,WAAW,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAAC,GAAW;IACzD,IAAI,CAAC;QACH,MAAM,IAAA,oBAAS,EAAC,GAAG,EAAE,yBAAyB,EAAE,0BAA0B,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,MAAe,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,MAAiB,CAAC;QAC9F,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
package/dist/server/index.js CHANGED
@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.default = default_1;
7
7
  const cluster_1 = __importDefault(require("cluster"));
8
8
  const path_1 = __importDefault(require("path"));
9
+ const shelljs_1 = require("shelljs");
10
+ const detect_1 = require("package-manager-detector/detect");
11
+ const commands_1 = require("package-manager-detector/commands");
9
12
  const config_js_1 = require("./config.js");
10
13
  const types_js_1 = require("../types.js");
11
14
  const logger_js_1 = require("./logger.js");
@@ -16,6 +19,8 @@ const messages_js_1 = require("./messages.js");
16
19
  const docker_js_1 = require("./docker.js");
17
20
  const promises_1 = require("fs/promises");
18
21
  const connection_js_1 = require("./connection.js");
22
+ const assert_1 = __importDefault(require("assert"));
23
+ const tree_kill_1 = __importDefault(require("tree-kill"));
19
24
  async function startWebdriverServer(browser, config, options) {
20
25
  if (config.webdriver === webdriver_js_1.SeleniumWebdriver) {
21
26
  if (cluster_1.default.isPrimary) {
@@ -90,23 +95,34 @@ async function default_1(options) {
90
95
  gridUrl = await startWebdriverServer(browser, config, options);
91
96
  }
92
97
  if (cluster_1.default.isPrimary) {
93
- const url = await (0, connection_js_1.getStorybookUrl)(config);
94
- if (!url) {
95
- (0, logger_js_1.logger)().error(`Creevey can't access storybook. Set \`storybookUrl\` or \`resolveStorybookUrl\` in config`);
96
- (0, utils_js_1.shutdownWithError)();
97
- return;
98
- }
99
- if (url && config.storybookAutorunCmd) {
100
- (0, logger_js_1.logger)().info(`Storybook should be started via \`${config.storybookAutorunCmd}\` and be accessible at ${url}`);
98
+ const [localUrl, remoteUrl] = (0, connection_js_1.getStorybookUrl)(config, options);
99
+ const pm = (0, detect_1.getUserAgent)();
100
+ (0, assert_1.default)(pm, new Error('Failed to detect current package manager'));
101
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
102
+ const { command, args } = (0, commands_1.resolveCommand)(pm, 'run', ['storybook', 'dev']);
103
+ if (options.storybookStart) {
104
+ const storybookPort = new URL(localUrl).port;
105
+ const storybookCommand = `${config.storybookAutorunCmd ?? [command, ...args, '--ci'].join(' ')} -p ${storybookPort}`;
106
+ (0, logger_js_1.logger)().info(`Start Storybook via \`${storybookCommand}\`, it should be accessible at:`);
107
+ (0, logger_js_1.logger)().info(`Local - ${localUrl}`);
108
+ if (remoteUrl && localUrl != remoteUrl)
109
+ (0, logger_js_1.logger)().info(`On your network - ${remoteUrl}`);
101
110
  (0, logger_js_1.logger)().info('Waiting Storybook...');
102
- await (0, connection_js_1.tryAutorunStorybook)(url, config.storybookAutorunCmd);
111
+ const storybook = (0, shelljs_1.exec)(storybookCommand, { async: true });
112
+ (0, messages_js_1.subscribeOn)('shutdown', () => {
113
+ if (storybook.pid)
114
+ (0, tree_kill_1.default)(storybook.pid);
115
+ });
103
116
  }
104
117
  else {
105
- (0, logger_js_1.logger)().info(`Storybook should be started and be accessible at ${url}`);
106
- (0, logger_js_1.logger)().info("Tip: you can start Storybook automatically by adding `storybookAutorunCmd` to Creevey's config");
118
+ (0, logger_js_1.logger)().info('Storybook should be started and be accessible at:');
119
+ (0, logger_js_1.logger)().info(`Local - ${localUrl}`);
120
+ if (remoteUrl && localUrl != remoteUrl)
121
+ (0, logger_js_1.logger)().info(`On your network - ${remoteUrl}`);
122
+ (0, logger_js_1.logger)().info('Tip: Creevey can start Storybook automatically by using `-s` option at the command line. (e.g., yarn/npm run creevey -s)');
107
123
  (0, logger_js_1.logger)().info('Waiting Storybook...');
108
124
  }
109
- const isConnected = await (0, connection_js_1.checkIsStorybookConnected)(url);
125
+ const isConnected = await (0, connection_js_1.checkIsStorybookConnected)(localUrl);
110
126
  if (isConnected) {
111
127
  (0, logger_js_1.logger)().info('Storybook connected!\n');
112
128
  }
package/dist/server/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"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"}
package/dist/server/master/pool.d.ts CHANGED
@@ -11,6 +11,7 @@ export default class Pool extends EventEmitter {
11
11
  private forcedStop;
12
12
  private failFast;
13
13
  private gridUrl?;
14
+ private storybookUrl;
14
15
  get isRunning(): boolean;
15
16
  constructor(scheduler: WorkerQueue, config: Config, browser: string, gridUrl?: string);
16
17
  init(): Promise<void>;
package/dist/server/master/pool.js CHANGED
@@ -14,6 +14,7 @@ class Pool extends events_1.EventEmitter {
14
14
  forcedStop = false;
15
15
  failFast;
16
16
  gridUrl;
17
+ storybookUrl;
17
18
  get isRunning() {
18
19
  return this.workers.length !== this.freeWorkers.length;
19
20
  }
@@ -25,10 +26,11 @@ class Pool extends events_1.EventEmitter {
25
26
  this.maxRetries = config.maxRetries;
26
27
  this.config = config.browsers[browser];
27
28
  this.gridUrl = this.config.gridUrl ?? gridUrl;
29
+ this.storybookUrl = this.config.storybookUrl ?? config.storybookUrl;
28
30
  }
29
31
  async init() {
30
32
  const poolSize = Math.max(1, this.config.limit ?? 1);
31
- this.workers = (await Promise.all(Array.from({ length: poolSize }).map(() => this.scheduler.forkWorker(this.browser, this.gridUrl)))).filter((workerOrError) => workerOrError instanceof cluster_1.Worker);
33
+ this.workers = (await Promise.all(Array.from({ length: poolSize }).map(() => this.scheduler.forkWorker(this.browser, this.storybookUrl, this.gridUrl)))).filter((workerOrError) => workerOrError instanceof cluster_1.Worker);
32
34
  if (this.workers.length != poolSize)
33
35
  throw new Error(`Can't instantiate workers for ${this.browser} due many errors`);
34
36
  this.workers.forEach((worker) => {
@@ -88,7 +90,7 @@ class Pool extends events_1.EventEmitter {
88
90
  worker.once('exit', async () => {
89
91
  if (utils_js_1.isShuttingDown.current)
90
92
  return;
91
- const workerOrError = await this.scheduler.forkWorker(this.browser, this.gridUrl);
93
+ const workerOrError = await this.scheduler.forkWorker(this.browser, this.storybookUrl, this.gridUrl);
92
94
  if (!(workerOrError instanceof cluster_1.Worker))
93
95
  throw new Error(`Can't instantiate worker for ${this.browser} due many errors`);
94
96
  this.exitHandler(workerOrError);
package/dist/server/master/pool.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":";;AAAA,qCAAkD;AAClD,mCAAsC;AAEtC,gDAAoE;AACpE,0CAA6D;AAS7D,MAAqB,IAAK,SAAQ,qBAAY;IAYnC;IAEC;IAbF,UAAU,CAAS;IACnB,MAAM,CAAsB;IAC5B,OAAO,GAAa,EAAE,CAAC;IACvB,KAAK,GAAiB,EAAE,CAAC;IACzB,UAAU,GAAG,KAAK,CAAC;IACnB,QAAQ,CAAU;IAClB,OAAO,CAAU;IACzB,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IACzD,CAAC;IACD,YACS,SAAsB,EAC7B,MAAc,EACN,OAAe,EACvB,OAAgB;QAEhB,KAAK,EAAE,CAAC;QALD,cAAS,GAAT,SAAS,CAAa;QAErB,YAAO,GAAP,OAAO,CAAQ;QAKvB,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAwB,CAAC;QAC9D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,CACb,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAClG,CACF,CAAC,MAAM,CAAC,CAAC,aAAa,EAA2B,EAAE,CAAC,aAAa,YAAY,gBAAa,CAAC,CAAC;QAC7F,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ;YACjC,MAAM,IAAI,KAAK,CAAC,iCAAiC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;QACnF,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC9B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAuC;QAC3C,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,KAAK,CAAC;QAEjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,OAAO;QACL,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC9E,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI;YAAE,OAAO;QAE7B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;QAExB,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAE3C,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAE7B,IAAA,6BAAe,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAE1D,YAAY,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,OAAgE;QACjF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEO,aAAa;QACnB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAErC,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,IAAY,YAAY;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAClG,CAAC;IAED,IAAY,WAAW;QACrB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAEO,WAAW,CAAC,MAAc;QAChC,kEAAkE;QAClE,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC7B,IAAI,yBAAc,CAAC,OAAO;gBAAE,OAAO;YAEnC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAElF,IAAI,CAAC,CAAC,aAAa,YAAY,gBAAa,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;YAElF,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,CAAC;YAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,IAAgB;QAClC,OAAO,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;IAC5D,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,IAAgB,EAAE,MAAkB;QAC3E,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,IAAI,QAAQ,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAExE,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3F,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAEzB,YAAY,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,SAAS,CAAC,MAAc,EAAE,IAAgB;QAChD,MAAM,aAAa,GAAG;YACpB,IAAA,+BAAiB,EAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC9C,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO;oBAAE,OAAO;gBAEpC,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpC,WAAW,EAAE,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;oBACzC,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC;gBACzB,CAAC;gBAED,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YAC1F,CAAC,CAAC;YACF,IAAA,+BAAiB,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;gBAC5C,IAAI,OAAO,CAAC,IAAI,IAAI,KAAK;oBAAE,OAAO;gBAElC,aAAa,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;oBACpC,WAAW,EAAE,CAAC;gBAChB,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACvD,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;CACF;AAvKD,uBAuKC"}
1
+ {"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/server/master/pool.ts"],"names":[],"mappings":"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"}
package/dist/server/master/queue.d.ts CHANGED
@@ -7,7 +7,7 @@ export declare class WorkerQueue {
7
7
  private isProcessing;
8
8
  private queue;
9
9
  constructor(useQueue: boolean);
10
- forkWorker(browser: string, gridUrl?: string, retry?: number): Promise<MaybeWorker>;
10
+ forkWorker(browser: string, storybookUrl: string, gridUrl?: string, retry?: number): Promise<MaybeWorker>;
11
11
  private process;
12
12
  }
13
13
  export {};
package/dist/server/master/queue.js CHANGED
@@ -16,17 +16,17 @@ class WorkerQueue {
16
16
  constructor(useQueue) {
17
17
  this.useQueue = useQueue;
18
18
  }
19
- async forkWorker(browser, gridUrl, retry = 0) {
19
+ async forkWorker(browser, storybookUrl, gridUrl, retry = 0) {
20
20
  return new Promise((resolve) => {
21
- this.queue.push({ browser, gridUrl, retry, resolve });
21
+ this.queue.push({ browser, storybookUrl, gridUrl, retry, resolve });
22
22
  void this.process();
23
23
  });
24
24
  }
25
25
  async process() {
26
26
  if (this.useQueue && this.isProcessing)
27
27
  return;
28
- const { browser, gridUrl, retry, resolve } = this.queue.pop() ?? {};
29
- if (browser == undefined || retry == undefined || resolve == undefined)
28
+ const { browser, storybookUrl, gridUrl, retry, resolve } = this.queue.pop() ?? {};
29
+ if (browser == undefined || storybookUrl == undefined || retry == undefined || resolve == undefined)
30
30
  return;
31
31
  if (utils_js_1.isShuttingDown.current) {
32
32
  resolve({ error: 'Master process is shutting down' });
@@ -34,7 +34,14 @@ class WorkerQueue {
34
34
  }
35
35
  this.isProcessing = true;
36
36
  cluster_1.default.setupPrimary({
37
- args: ['--browser', browser, ...(gridUrl ? ['--gridUrl', gridUrl] : []), ...process.argv.slice(2)],
37
+ args: [
38
+ '--browser',
39
+ browser,
40
+ ...(gridUrl ? ['--gridUrl', gridUrl] : []),
41
+ ...process.argv.slice(2),
42
+ '--storybookUrl',
43
+ storybookUrl,
44
+ ],
38
45
  });
39
46
  const worker = cluster_1.default.fork();
40
47
  const message = await new Promise((resolve) => {
@@ -51,7 +58,7 @@ class WorkerQueue {
51
58
  if (retry == FORK_RETRIES)
52
59
  resolve(message.payload);
53
60
  else
54
- this.queue.push({ browser, gridUrl, retry: retry + 1, resolve });
61
+ this.queue.push({ browser, storybookUrl, gridUrl, retry: retry + 1, resolve });
55
62
  }
56
63
  else {
57
64
  resolve(worker);
package/dist/server/master/queue.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/server/master/queue.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,6CAAwE;AACxE,0CAA6D;AAE7D,MAAM,YAAY,GAAG,CAAC,CAAC;AAIvB,MAAa,WAAW;IAKF;IAJZ,YAAY,GAAG,KAAK,CAAC;IACrB,KAAK,GAA+F,EAAE,CAAC;IAE/G,uBAAuB;IACvB,YAAoB,QAAiB;QAAjB,aAAQ,GAAR,QAAQ,CAAS;IAAG,CAAC;IAEzC,KAAK,CAAC,UAAU,CAAC,OAAe,EAAE,OAAgB,EAAE,KAAK,GAAG,CAAC;QAC3D,OAAO,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAEtD,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY;YAAE,OAAO;QAE/C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QAEpE,IAAI,OAAO,IAAI,SAAS,IAAI,KAAK,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS;YAAE,OAAO;QAE/E,IAAI,yBAAc,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,CAAC,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,iBAAO,CAAC,YAAY,CAAC;YACnB,IAAI,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACnG,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,iBAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAuC,EAAE,EAAE;YAC5E,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAQ,EAAE;gBAC9C,IAAI,CAAC,IAAA,0BAAe,EAAC,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,MAAM;oBAAE,OAAO;gBAChE,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACpC,OAAO,CAAC,OAAO,CAAC,CAAC;YACnB,CAAC,CAAC;YACF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAA,yBAAc,EAAC,MAAM,CAAC,CAAC;YAEvB,IAAI,KAAK,IAAI,YAAY;gBAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;;gBAC/C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,YAAY,CAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1C,CAAC;CACF;AAvDD,kCAuDC"}
1
+ {"version":3,"file":"queue.js","sourceRoot":"","sources":["../../../src/server/master/queue.ts"],"names":[],"mappings":"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"}
package/dist/server/playwright/internal.js CHANGED
@@ -179,7 +179,6 @@ class InternalBrowser {
179
179
  browserName,
180
180
  viewport,
181
181
  storybookUrl: address,
182
- resolveStorybookUrl: config.resolveStorybookUrl,
183
182
  });
184
183
  return done ? internalBrowser : null;
185
184
  }
@@ -193,7 +192,7 @@ class InternalBrowser {
193
192
  return null;
194
193
  }
195
194
  }
196
- async init({ browserName, viewport, storybookUrl, resolveStorybookUrl, }) {
195
+ async init({ browserName, viewport, storybookUrl, }) {
197
196
  const sessionId = this.#sessionId;
198
197
  loglevel_plugin_prefix_1.default.apply((0, logger_1.logger)(), {
199
198
  format(level) {
@@ -203,7 +202,7 @@ class InternalBrowser {
203
202
  });
204
203
  this.#page.setDefaultTimeout(60000);
205
204
  return await (0, utils_1.runSequence)([
206
- () => this.openStorybookPage(storybookUrl, resolveStorybookUrl),
205
+ () => this.openStorybookPage(storybookUrl),
207
206
  () => this.waitForStorybook(),
208
207
  () => this.triggerViteReload(),
209
208
  () => this.updateStorybookGlobals(),
@@ -212,23 +211,15 @@ class InternalBrowser {
212
211
  () => this.resizeViewport(viewport),
213
212
  ], () => !this.#isShuttingDown);
214
213
  }
215
- async openStorybookPage(storybookUrl, resolver) {
214
+ async openStorybookPage(storybookUrl) {
216
215
  if (!webdriver_1.LOCALHOST_REGEXP.test(storybookUrl)) {
217
216
  await this.#page.goto((0, webdriver_1.appendIframePath)(storybookUrl));
218
217
  return;
219
218
  }
220
219
  try {
221
- if (resolver) {
222
- (0, logger_1.logger)().debug('Resolving storybook url with custom resolver');
223
- const resolvedUrl = await resolver();
224
- (0, logger_1.logger)().debug(`Resolver storybook url ${resolvedUrl}`);
225
- await this.#page.goto((0, webdriver_1.appendIframePath)(resolvedUrl));
226
- }
227
- else {
228
- // TODO this.#page.setDefaultNavigationTimeout(10000);
229
- const resolvedUrl = await (0, webdriver_1.resolveStorybookUrl)((0, webdriver_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url));
230
- await this.#page.goto(resolvedUrl);
231
- }
220
+ // TODO this.#page.setDefaultNavigationTimeout(10000);
221
+ const resolvedUrl = await (0, webdriver_1.resolveStorybookUrl)((0, webdriver_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url));
222
+ await this.#page.goto(resolvedUrl);
232
223
  }
233
224
  catch (error) {
234
225
  (0, logger_1.logger)().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
package/dist/server/playwright/internal.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/server/playwright/internal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/server/playwright/internal.ts"],"names":[],"mappings":"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"}
package/dist/server/selenium/internal.js CHANGED
@@ -315,7 +315,6 @@ class InternalBrowser {
315
315
  gridUrl,
316
316
  viewport,
317
317
  storybookUrl: address,
318
- resolveStorybookUrl: config.resolveStorybookUrl,
319
318
  });
320
319
  return done ? internalBrowser : null;
321
320
  }
@@ -329,7 +328,7 @@ class InternalBrowser {
329
328
  return null;
330
329
  }
331
330
  }
332
- async init({ browserName, gridUrl, viewport, storybookUrl, resolveStorybookUrl, }) {
331
+ async init({ browserName, gridUrl, viewport, storybookUrl, }) {
333
332
  const sessionId = (await this.#browser.getSession()).getId();
334
333
  let browserHost = '';
335
334
  try {
@@ -349,7 +348,7 @@ class InternalBrowser {
349
348
  (0, logger_js_1.logger)().debug(`Connected successful with ${chalk_1.default.green(browserHost)}`);
350
349
  return await (0, utils_js_1.runSequence)([
351
350
  () => this.#browser.manage().setTimeouts({ pageLoad: 60000, script: 60000 }),
352
- () => this.openStorybookPage(storybookUrl, resolveStorybookUrl),
351
+ () => this.openStorybookPage(storybookUrl),
353
352
  () => this.waitForStorybook(),
354
353
  () => this.updateStorybookGlobals(),
355
354
  () => this.resolveCreeveyHost(),
@@ -363,22 +362,14 @@ class InternalBrowser {
363
362
  },
364
363
  ], () => !this.#isShuttingDown);
365
364
  }
366
- async openStorybookPage(storybookUrl, resolver) {
365
+ async openStorybookPage(storybookUrl) {
367
366
  if (!webdriver_js_1.LOCALHOST_REGEXP.test(storybookUrl)) {
368
367
  return this.#browser.get((0, webdriver_js_1.appendIframePath)(storybookUrl));
369
368
  }
370
369
  try {
371
- if (resolver) {
372
- (0, logger_js_1.logger)().debug('Resolving storybook url with custom resolver');
373
- const resolvedUrl = await resolver();
374
- (0, logger_js_1.logger)().debug(`Resolver storybook url ${resolvedUrl}`);
375
- await this.#browser.get((0, webdriver_js_1.appendIframePath)(resolvedUrl));
376
- }
377
- else {
378
- // TODO Pageload timeout 10s
379
- // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
380
- await (0, webdriver_js_1.resolveStorybookUrl)((0, webdriver_js_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url));
381
- }
370
+ // TODO Pageload timeout 10s
371
+ // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
372
+ await (0, webdriver_js_1.resolveStorybookUrl)((0, webdriver_js_1.appendIframePath)(storybookUrl), (url) => this.checkUrl(url));
382
373
  }
383
374
  catch (error) {
384
375
  (0, logger_js_1.logger)().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');