creevey 0.9.9-handle-timeout-error.0 → 0.9.9-handle-timeout-error.1
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.
- package/dist/server/storybook/providers/browser.js +9 -2
- package/dist/server/storybook/providers/browser.js.map +1 -1
- package/dist/server/storybook/providers/hybrid.js +3 -0
- package/dist/server/storybook/providers/hybrid.js.map +1 -1
- package/package.json +1 -1
- package/src/server/storybook/providers/browser.ts +8 -2
- package/src/server/storybook/providers/hybrid.ts +4 -0
|
@@ -12,7 +12,7 @@ const logger_js_1 = require("../../logger.js");
|
|
|
12
12
|
const index_js_2 = require("../../../shared/index.js");
|
|
13
13
|
const loadStories = async (_config, _options, storiesListener) => {
|
|
14
14
|
if (cluster_1.default.isPrimary) {
|
|
15
|
-
return new Promise((resolve) => {
|
|
15
|
+
return new Promise((resolve, reject) => {
|
|
16
16
|
const worker = Object.values(cluster_1.default.workers ?? {})
|
|
17
17
|
.filter(types_js_1.isDefined)
|
|
18
18
|
.find((worker) => worker.isConnected());
|
|
@@ -20,6 +20,7 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
20
20
|
const unsubscribe = (0, messages_js_1.subscribeOnWorker)(worker, 'stories', (message) => {
|
|
21
21
|
if (message.type == 'set') {
|
|
22
22
|
const { stories, oldTests } = message.payload;
|
|
23
|
+
(0, logger_js_1.logger)().debug('Received set stories message with', Object.keys(stories).length, 'stories');
|
|
23
24
|
if (oldTests.length > 0)
|
|
24
25
|
(0, logger_js_1.logger)().warn(`If you use browser stories provider of CSFv3 Storybook feature\n` +
|
|
25
26
|
`Creevey will not load tests defined in story parameters from following stories:\n` +
|
|
@@ -28,8 +29,12 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
28
29
|
resolve(stories);
|
|
29
30
|
}
|
|
30
31
|
});
|
|
32
|
+
(0, logger_js_1.logger)().debug('Sending get stories message to worker', worker.process.pid);
|
|
31
33
|
(0, messages_js_1.sendStoriesMessage)(worker, { type: 'get' });
|
|
32
34
|
}
|
|
35
|
+
else {
|
|
36
|
+
reject(new Error('No worker found'));
|
|
37
|
+
}
|
|
33
38
|
(0, messages_js_1.subscribeOn)('stories', (message) => {
|
|
34
39
|
// TODO updates only one browser :(
|
|
35
40
|
if (message.type == 'update')
|
|
@@ -39,8 +44,10 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
39
44
|
}
|
|
40
45
|
else {
|
|
41
46
|
(0, messages_js_1.subscribeOn)('stories', (message) => {
|
|
42
|
-
if (message.type == 'get')
|
|
47
|
+
if (message.type == 'get') {
|
|
48
|
+
(0, logger_js_1.logger)().debug('Received get stories message');
|
|
43
49
|
(0, messages_js_1.emitStoriesMessage)({ type: 'set', payload: { stories, oldTests: storiesWithOldTests } });
|
|
50
|
+
}
|
|
44
51
|
if (message.type == 'update')
|
|
45
52
|
storiesListener(new Map(message.payload));
|
|
46
53
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/browser.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAE9B,sDAAiE;AACjE,mDAA2G;AAC3G,gDAA8C;AAC9C,+CAAyC;AACzC,uDAAiE;AAE1D,MAAM,WAAW,GAAoB,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE;IACvF,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;QACtB,OAAO,IAAI,OAAO,CAAa,CAAC,OAAO,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,9 @@ const loadStories = async (_config, _options, storiesListener) => {
|
|
|
18
18
|
story.parameters.creevey = (0, index_js_1.combineParameters)(story.parameters.creevey ?? {}, creeveyParams);
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
|
+
if (cluster_1.default.isPrimary) {
|
|
22
|
+
(0, logger_js_1.logger)().debug('Loading stories from browser provider');
|
|
23
|
+
}
|
|
21
24
|
const stories = await (0, browser_js_1.loadStories)(_config, {}, (updatedStoriesByFiles) => {
|
|
22
25
|
Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
|
|
23
26
|
storiesArray.forEach((story) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hybrid.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/hybrid.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAEhC,6CAA8D;AAE9D,+CAAyC;AACzC,2EAA2E;AAC3E,6CAAkD;AAClD,uDAA6D;AAC7D,sDAA8B;AAEvB,MAAM,WAAW,GAAoB,KAAK,EAC/C,OAAe,EACf,QAAQ,EACR,eAA6D,EAC7D,EAAE;IACF,IAAI,sBAAsB,GAAoC,EAAE,CAAC;IAEjE,MAAM,2BAA2B,GAAG,CAAC,KAAmB,EAAE,aAAiC,EAAQ,EAAE;QACnG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,IAAA,4BAAiB,EAAC,KAAK,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,EAAC,OAAO,EAAE,EAAE,EAAE,CAAC,qBAAqB,EAAE,EAAE;QAC3E,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;YACvE,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,aAAa;oBAAE,2BAA2B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,eAAe,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;QACtB,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;IAED,oCAAoC;IACpC,sBAAsB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IAEvF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;QACnD,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,aAAa;YAAE,2BAA2B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"hybrid.js","sourceRoot":"","sources":["../../../../src/server/storybook/providers/hybrid.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAgC;AAEhC,6CAA8D;AAE9D,+CAAyC;AACzC,2EAA2E;AAC3E,6CAAkD;AAClD,uDAA6D;AAC7D,sDAA8B;AAEvB,MAAM,WAAW,GAAoB,KAAK,EAC/C,OAAe,EACf,QAAQ,EACR,eAA6D,EAC7D,EAAE;IACF,IAAI,sBAAsB,GAAoC,EAAE,CAAC;IAEjE,MAAM,2BAA2B,GAAG,CAAC,KAAmB,EAAE,aAAiC,EAAQ,EAAE;QACnG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,IAAA,4BAAiB,EAAC,KAAK,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;QACtB,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,EAAC,OAAO,EAAE,EAAE,EAAE,CAAC,qBAAqB,EAAE,EAAE;QAC3E,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;YACvE,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC7B,MAAM,aAAa,GAAG,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,aAAa;oBAAE,2BAA2B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YACvE,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,eAAe,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAO,CAAC,SAAS,EAAE,CAAC;QACtB,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;IAED,oCAAoC;IACpC,sBAAsB,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;IAEvF,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE;QACnD,MAAM,aAAa,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,aAAa;YAAE,2BAA2B,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAxCW,QAAA,WAAW,eAwCtB;AAEF,oCAAoC;AACpC,KAAK,UAAU,WAAW,CACxB,MAAc,EACd,QAAiD;IAEjD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,2BAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpG,IAAI,QAAQ,EAAE,CAAC;QACb,kBAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YAClD,IAAA,kBAAM,GAAE,CAAC,KAAK,CAAC,YAAY,QAAQ,EAAE,CAAC,CAAC;YAEvC,sDAAsD;YACtD,mDAAmD;YACnD,KAAK,IAAA,mBAAK,EAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAClC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAA,mBAAK,EAAC,SAAS,CAAC,CAAC;AAC1B,CAAC;AAED,mBAAW,CAAC,YAAY,GAAG,QAAQ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "creevey",
|
|
3
3
|
"description": "Cross-browser screenshot testing tool for Storybook with fancy UI Runner",
|
|
4
|
-
"version": "0.9.9-handle-timeout-error.
|
|
4
|
+
"version": "0.9.9-handle-timeout-error.1",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"bin": "./dist/cli.js",
|
|
7
7
|
"main": "./dist/index.js",
|
|
@@ -8,7 +8,7 @@ import { deserializeRawStories } from '../../../shared/index.js';
|
|
|
8
8
|
|
|
9
9
|
export const loadStories: StoriesProvider = async (_config, _options, storiesListener) => {
|
|
10
10
|
if (cluster.isPrimary) {
|
|
11
|
-
return new Promise<StoriesRaw>((resolve) => {
|
|
11
|
+
return new Promise<StoriesRaw>((resolve, reject) => {
|
|
12
12
|
const worker = Object.values(cluster.workers ?? {})
|
|
13
13
|
.filter(isDefined)
|
|
14
14
|
.find((worker) => worker.isConnected());
|
|
@@ -17,6 +17,7 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
17
17
|
const unsubscribe = subscribeOnWorker(worker, 'stories', (message) => {
|
|
18
18
|
if (message.type == 'set') {
|
|
19
19
|
const { stories, oldTests } = message.payload;
|
|
20
|
+
logger().debug('Received set stories message with', Object.keys(stories).length, 'stories');
|
|
20
21
|
if (oldTests.length > 0)
|
|
21
22
|
logger().warn(
|
|
22
23
|
`If you use browser stories provider of CSFv3 Storybook feature\n` +
|
|
@@ -27,7 +28,10 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
27
28
|
resolve(stories);
|
|
28
29
|
}
|
|
29
30
|
});
|
|
31
|
+
logger().debug('Sending get stories message to worker', worker.process.pid);
|
|
30
32
|
sendStoriesMessage(worker, { type: 'get' });
|
|
33
|
+
} else {
|
|
34
|
+
reject(new Error('No worker found'));
|
|
31
35
|
}
|
|
32
36
|
subscribeOn('stories', (message) => {
|
|
33
37
|
// TODO updates only one browser :(
|
|
@@ -36,8 +40,10 @@ export const loadStories: StoriesProvider = async (_config, _options, storiesLis
|
|
|
36
40
|
});
|
|
37
41
|
} else {
|
|
38
42
|
subscribeOn('stories', (message) => {
|
|
39
|
-
if (message.type == 'get')
|
|
43
|
+
if (message.type == 'get') {
|
|
44
|
+
logger().debug('Received get stories message');
|
|
40
45
|
emitStoriesMessage({ type: 'set', payload: { stories, oldTests: storiesWithOldTests } });
|
|
46
|
+
}
|
|
41
47
|
if (message.type == 'update') storiesListener(new Map(message.payload));
|
|
42
48
|
});
|
|
43
49
|
const stories = deserializeRawStories(await loadStoriesFromBrowser());
|
|
@@ -21,6 +21,10 @@ export const loadStories: StoriesProvider = async (
|
|
|
21
21
|
}
|
|
22
22
|
};
|
|
23
23
|
|
|
24
|
+
if (cluster.isPrimary) {
|
|
25
|
+
logger().debug('Loading stories from browser provider');
|
|
26
|
+
}
|
|
27
|
+
|
|
24
28
|
const stories = await browserProvider(_config, {}, (updatedStoriesByFiles) => {
|
|
25
29
|
Array.from(updatedStoriesByFiles.entries()).forEach(([, storiesArray]) => {
|
|
26
30
|
storiesArray.forEach((story) => {
|