creevey 0.10.0-beta.36 → 0.10.0-beta.37

package/src/server/playwright/docker-file.ts

@@ -18,16 +18,16 @@ export async function playwrightDockerFile(browser: string, version: string): Pr
 
   const indexJs = await readFile(new URL('./index-source.mjs', importMetaUrl), 'utf-8');
 
-  return `
+  const dockerfile = `
 FROM node:lts
 
 WORKDIR /creevey
 
 RUN echo "{ \\"type\\": \\"module\\" }" > package.json && \\
-    ${indexJs
-      .split('\n')
-      .map((line) => `echo "${line.replace(/"/g, '\\"')}" >> index.js && \\`)
-      .join('\n')}
+${indexJs
+  .split('\n')
+  .map((line) => `    echo "${line.replace(/"/g, '\\"')}" >> index.js && \\`)
+  .join('\n')}
     ${
       npmRegistry
         ? `
@@ -41,4 +41,6 @@ EXPOSE 4444
 
 ENTRYPOINT [ "node", "./index.js" ]
 `;
+
+  return dockerfile.replace(/\\\n\s*\\?\n/g, '\\\n');
 }

package/src/server/playwright/internal.ts

@@ -13,7 +13,7 @@ import chalk from 'chalk';
 import { v4 } from 'uuid';
 import Logger from 'loglevel';
 import prefix from 'loglevel-plugin-prefix';
-import type { Args } from '@storybook/csf';
+import type { Args } from '@storybook/types';
 import {
   BrowserConfigObject,
   Config,

package/src/server/playwright/webdriver.ts

@@ -1,5 +1,5 @@
 /// <reference types="../../../types/playwright-context" />
-import type { Args } from '@storybook/csf';
+import type { Args } from '@storybook/types';
 import { Config, Options, ServerTest, StoriesRaw, StoryInput } from '../../types';
 import { logger } from '../logger';
 import { subscribeOn } from '../messages';

package/src/server/selenium/internal.ts

@@ -1,4 +1,4 @@
-import type { Args } from '@storybook/csf';
+import type { Args } from '@storybook/types';
 import chalk from 'chalk';
 import http from 'http';
 import https from 'https';
@@ -266,9 +266,7 @@ export class InternalBrowser {
             },
             // NOTE page_Offset is used only for IE9-11
             windowRect: {
-              // eslint-disable-next-line @typescript-eslint/no-deprecated
               top: Math.round(window.scrollY || window.pageYOffset),
-              // eslint-disable-next-line @typescript-eslint/no-deprecated
               left: Math.round(window.scrollX || window.pageXOffset),
               width: window.innerWidth,
               height: window.innerHeight,

package/src/server/selenium/selenoid.ts

@@ -34,7 +34,7 @@ async function createSelenoidConfig(
       dockerImage = `selenoid/${browserName}:${browserVersion}`,
       webdriverCommand = [],
     }) => {
-      if (!selenoidConfig[browserName]) selenoidConfig[browserName] = { default: browserVersion, versions: {} };
+      selenoidConfig[browserName] ??= { default: browserVersion, versions: {} };
       if (!useDocker && webdriverCommand.length == 0)
         throw new Error('Please specify "webdriverCommand" browser option with path to browser webdriver');
       selenoidConfig[browserName].versions[browserVersion] = {

package/src/server/selenium/webdriver.ts

@@ -1,5 +1,5 @@
 /// <reference types="../../../types/selenium-context" />
-import type { Args } from '@storybook/csf';
+import type { Args } from '@storybook/types';
 import { Config, StorybookGlobals, StoryInput, StoriesRaw, Options, ServerTest } from '../../types.js';
 import { subscribeOn } from '../messages.js';
 import { CreeveyWebdriverBase } from '../webdriver.js';

package/src/server/testsFiles/parser.ts

@@ -105,8 +105,6 @@ export const story = (
 
 export const test = (title: string, testFn: CreeveyTestFunction): void => {
   const storyId = getStoryId(kindTitle, storyTitle);
-  if (!result[storyId]) {
-    result[storyId] = {};
-  }
+  result[storyId] ??= {};
   result[storyId].tests = Object.assign({}, result[storyId].tests, { [title]: testFn });
 };

package/src/server/webdriver.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { networkInterfaces } from 'os';
 import { logger } from './logger.js';
-import type { Args } from '@storybook/csf';
+import type { Args } from '@storybook/types';
 import {
   isDefined,
   StoryInput,

package/src/shared/index.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import type { Parameters } from '@storybook/csf';
+import type { Parameters } from '@storybook/types';
 import { SetStoriesData, StoriesRaw, CreeveyStoryParams, StoryInput } from '../types.js';
 import { deserializeRegExp, isSerializedRegExp, isRegExp, serializeRegExp } from './serializeRegExp.js';
 

package/src/types.ts

@@ -1,4 +1,4 @@
-import type { StoryContextForEnhancers, DecoratorFunction } from '@storybook/csf';
+import type { StoryContextForEnhancers, DecoratorFunction } from '@storybook/types';
 import type { Worker as ClusterWorker } from 'cluster';
 import type Pixelmatch from 'pixelmatch';
 import type { ODiffOptions } from 'odiff-bin';