creevey 0.8.0-beta.1 → 0.8.1-beta.0

package/lib/cjs/server/loaders/webpack/compile.js

@@ -244,7 +244,7 @@ async function compile(config, {
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   }), // TODO Don't work well with monorepos
   (0, _webpackNodeExternals.default)({
-    modulesDir: (0, _helpers.resolveFromStorybook)('@storybook/core').split('@storybook')[0],
+    modulesDir: (0, _helpers.resolveFromStorybook)('@storybook/core-client').split('@storybook')[0],
     includeAbsolutePaths: true,
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   })]; // NOTE Exclude some plugins

package/lib/cjs/server/storybook/entry.js

@@ -11,7 +11,7 @@ var _helpers = require("./helpers");
 
 const framework = (0, _helpers.getStorybookFramework)(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-const core = require((0, _helpers.resolveFromStorybook)('@storybook/core'));
+const core = require((0, _helpers.resolveFromStorybook)('@storybook/core-client'));
 
 const start = core.start;
 const api = start(() => void 0);

package/lib/cjs/server/storybook/helpers.js

@@ -14,7 +14,7 @@ exports.isCSFv3Enabled = isCSFv3Enabled;
 exports.isStorybookVersion = isStorybookVersion;
 exports.isStorybookVersionGreaterThan = isStorybookVersionGreaterThan;
 exports.isStorybookVersionLessThan = isStorybookVersionLessThan;
-exports.storybookDirRef = exports.storybookConfigRef = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCore = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = void 0;
+exports.storybookDirRef = exports.storybookConfigRef = exports.resolveFromStorybookCoreServer = exports.resolveFromStorybookCoreClient = exports.resolveFromStorybookBuilderWebpack4 = exports.resolveFromStorybookAddonDocs = exports.resolveFromStorybook = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -44,9 +44,9 @@ const resolveFromStorybookBuilderWebpack4 = modulePath => (0, _resolveFrom.defau
 
 exports.resolveFromStorybookBuilderWebpack4 = resolveFromStorybookBuilderWebpack4;
 
-const resolveFromStorybookCore = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core'), modulePath);
+const resolveFromStorybookCoreClient = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core-client'), modulePath);
 
-exports.resolveFromStorybookCore = resolveFromStorybookCore;
+exports.resolveFromStorybookCoreClient = resolveFromStorybookCoreClient;
 
 const resolveFromStorybookCoreServer = modulePath => (0, _resolveFrom.default)(resolveFromStorybook('@storybook/core-server'), modulePath);
 

package/lib/cjs/server/utils.js

@@ -9,6 +9,7 @@ exports.isShuttingDown = exports.isInsideDocker = void 0;
 exports.removeProps = removeProps;
 exports.runSequence = runSequence;
 exports.shouldSkip = shouldSkip;
+exports.shouldSkipByOption = shouldSkipByOption;
 exports.shutdown = shutdown;
 exports.shutdownWorkers = shutdownWorkers;
 exports.skipOptionKeys = void 0;
@@ -48,38 +49,30 @@ function shouldSkip(browser, meta, skipOptions, test) {
     return skipOptions;
   }
 
-  if (Array.isArray(skipOptions)) {
-    for (const skip of skipOptions) {
-      const reason = shouldSkip(browser, meta, skip, test);
-      if (reason) return reason;
-    }
-
-    return false;
+  for (const skipKey in skipOptions) {
+    const reason = shouldSkipByOption(browser, meta, skipOptions[skipKey], skipKey, test);
+    if (reason) return reason;
   }
 
-  let hasSkipOptionKeys = false;
+  return false;
+}
 
-  for (const skipKey in skipOptions) {
-    if (skipOptionKeys.includes(skipKey)) {
-      hasSkipOptionKeys = true;
-      continue;
+function shouldSkipByOption(browser, meta, skipOption, reason, test) {
+  if (Array.isArray(skipOption)) {
+    for (const skip of skipOption) {
+      const result = shouldSkipByOption(browser, meta, skip, reason, test);
+      if (result) return result;
     }
 
-    const reason = shouldSkip(browser, meta, {
-      reason: skipKey,
-      ...skipOptions[skipKey]
-    }, test);
-    if (reason) return reason;
+    return false;
   }
 
-  if (!hasSkipOptionKeys) return false;
   const {
     in: browsers,
     kinds,
     stories,
-    tests,
-    reason = true
-  } = skipOptions;
+    tests
+  } = skipOption;
   const {
     kind,
     story

package/lib/esm/server/loaders/webpack/compile.js

@@ -221,7 +221,7 @@ export default async function compile(config, {
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   }), // TODO Don't work well with monorepos
   nodeExternals({
-    modulesDir: resolveFromStorybook('@storybook/core').split('@storybook')[0],
+    modulesDir: resolveFromStorybook('@storybook/core-client').split('@storybook')[0],
     includeAbsolutePaths: true,
     allowlist: /(webpack|dummy-hmr|generated-stories-entry|generated-config-entry|generated-other-entry)/
   })]; // NOTE Exclude some plugins

package/lib/esm/server/storybook/entry.js

@@ -2,7 +2,7 @@ import { addons } from '@storybook/addons';
 import { getStorybookFramework, resolveFromStorybook } from './helpers';
 const framework = getStorybookFramework(); // eslint-disable-next-line @typescript-eslint/no-var-requires
 
-const core = require(resolveFromStorybook('@storybook/core'));
+const core = require(resolveFromStorybook('@storybook/core-client'));
 
 const start = core.start;
 const api = start(() => void 0);

package/lib/esm/server/storybook/helpers.js

@@ -7,7 +7,7 @@ export const storybookDirRef = {
 export const resolveFromStorybook = modulePath => resolveFrom(storybookDirRef.current, modulePath);
 export const resolveFromStorybookAddonDocs = modulePath => resolveFrom(resolveFromStorybook('@storybook/addon-docs'), modulePath);
 export const resolveFromStorybookBuilderWebpack4 = modulePath => resolveFrom(resolveFromStorybook('@storybook/builder-webpack4'), modulePath);
-export const resolveFromStorybookCore = modulePath => resolveFrom(resolveFromStorybook('@storybook/core'), modulePath);
+export const resolveFromStorybookCoreClient = modulePath => resolveFrom(resolveFromStorybook('@storybook/core-client'), modulePath);
 export const resolveFromStorybookCoreServer = modulePath => resolveFrom(resolveFromStorybook('@storybook/core-server'), modulePath);
 
 const importFromStorybook = modulePath => import(resolveFromStorybook(modulePath));

package/lib/esm/server/utils.js

@@ -20,38 +20,29 @@ export function shouldSkip(browser, meta, skipOptions, test) {
     return skipOptions;
   }
 
-  if (Array.isArray(skipOptions)) {
-    for (const skip of skipOptions) {
-      const reason = shouldSkip(browser, meta, skip, test);
-      if (reason) return reason;
-    }
-
-    return false;
+  for (const skipKey in skipOptions) {
+    const reason = shouldSkipByOption(browser, meta, skipOptions[skipKey], skipKey, test);
+    if (reason) return reason;
   }
 
-  let hasSkipOptionKeys = false;
-
-  for (const skipKey in skipOptions) {
-    if (skipOptionKeys.includes(skipKey)) {
-      hasSkipOptionKeys = true;
-      continue;
+  return false;
+}
+export function shouldSkipByOption(browser, meta, skipOption, reason, test) {
+  if (Array.isArray(skipOption)) {
+    for (const skip of skipOption) {
+      const result = shouldSkipByOption(browser, meta, skip, reason, test);
+      if (result) return result;
     }
 
-    const reason = shouldSkip(browser, meta, {
-      reason: skipKey,
-      ...skipOptions[skipKey]
-    }, test);
-    if (reason) return reason;
+    return false;
   }
 
-  if (!hasSkipOptionKeys) return false;
   const {
     in: browsers,
     kinds,
     stories,
-    tests,
-    reason = true
-  } = skipOptions;
+    tests
+  } = skipOption;
   const {
     kind,
     story

package/lib/types/server/storybook/entry.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="webpack-env" />
 import type { StoryApi } from '@storybook/addons';
-declare const start: typeof import("@storybook/core").start;
+declare const start: typeof import("@storybook/core-client").start;
 export declare const channel: import("@storybook/channels").Channel;
 declare type ClientApi = ReturnType<typeof start>['clientApi'];
 export declare const clientApi: ClientApi;

package/lib/types/server/storybook/helpers.d.ts

@@ -5,7 +5,7 @@ export declare const storybookDirRef: {
 export declare const resolveFromStorybook: (modulePath: string) => string;
 export declare const resolveFromStorybookAddonDocs: (modulePath: string) => string;
 export declare const resolveFromStorybookBuilderWebpack4: (modulePath: string) => string;
-export declare const resolveFromStorybookCore: (modulePath: string) => string;
+export declare const resolveFromStorybookCoreClient: (modulePath: string) => string;
 export declare const resolveFromStorybookCoreServer: (modulePath: string) => string;
 export declare const importStorybookClientLogger: <T = typeof import("@storybook/client-logger")>() => Promise<T>;
 export declare const importStorybookCoreCommon: <T = typeof import("@storybook/core-common")>() => Promise<T>;

package/lib/types/server/utils.d.ts

@@ -1,4 +1,4 @@
-import { SkipOptions, TestData } from '../types';
+import { SkipOptions, SkipOption, TestData } from '../types';
 export declare const isShuttingDown: {
     current: boolean;
 };
@@ -9,6 +9,10 @@ export declare function shouldSkip(browser: string, meta: {
     kind: string;
     story: string;
 }, skipOptions: SkipOptions, test?: string): string | boolean;
+export declare function shouldSkipByOption(browser: string, meta: {
+    kind: string;
+    story: string;
+}, skipOption: SkipOption | SkipOption[], reason: string, test?: string): string | boolean;
 export declare function shutdownWorkers(): Promise<void>;
 export declare function shutdown(): void;
 export declare function getCreeveyCache(): string;

package/lib/types/types.d.ts

@@ -400,13 +400,12 @@ export interface CreeveyUpdate {
     removedTests?: TestMeta[];
 }
 export interface SkipOption {
-    reason?: string;
     in?: string | string[] | RegExp;
     kinds?: string | string[] | RegExp;
     stories?: string | string[] | RegExp;
     tests?: string | string[] | RegExp;
 }
-export declare type SkipOptions = boolean | string | SkipOption | SkipOption[] | Record<string, SkipOption | SkipOption[]>;
+export declare type SkipOptions = boolean | string | Record<string, SkipOption | SkipOption[]>;
 export declare type CreeveyTestFunction = (this: {
     browser: WebDriver;
     until: typeof until;

package/package.json

@@ -13,7 +13,7 @@
     "addon",
     "test"
   ],
-  "version": "0.8.0-beta.1",
+  "version": "0.8.1-beta.0",
   "bin": {
     "creevey": "./lib/cjs/cli.js"
   },
@@ -24,6 +24,7 @@
     },
     "./addon": {
       "types": "./lib/types/client/addon/index.d.ts",
+      "module": "./lib/esm/client/addon/index.js",
       "default": "./lib/cjs/client/addon/index.js"
     },
     "./preset": "./preset/index.js",
@@ -149,7 +150,6 @@
     "@storybook/channels": "^6.5.9",
     "@storybook/client-api": "^6.5.9",
     "@storybook/client-logger": "^6.5.9",
-    "@storybook/core": "^6.5.9",
     "@storybook/core-client": "^6.5.9",
     "@storybook/core-common": "^6.5.9",
     "@storybook/core-events": "^6.5.9",