@argos-ci/storybook 4.0.3 → 4.0.5

package/dist/test-runner.js

@@ -119,13 +119,13 @@ async function storybookArgosScreenshot(handler, context, options) {
     allAttachments.push(...attachments);
   }
   await context.setViewportSize("default");
-  if (context.applyGlobals) {
-    await context.applyGlobals({
+  await setStorybookGlobals({ handler, globals: {} });
+  if (context.afterScreenshot) {
+    await context.afterScreenshot({
       handler,
       globals: {}
     });
   }
-  await setStorybookGlobals({ handler, globals: {} });
   return allAttachments;
 }
 async function setStorybookGlobals(args) {
@@ -153,13 +153,13 @@ async function setStorybookGlobals(args) {
 }
 async function runHooksAndScreenshot(args) {
   const { handler, context, options, globals, metadata } = args;
-  if (context.applyGlobals) {
-    await context.applyGlobals({
+  await setStorybookGlobals({ handler, globals });
+  if (context.beforeScreenshot) {
+    await context.beforeScreenshot({
       handler,
       globals
     });
   }
-  await setStorybookGlobals({ handler, globals });
   const viewportFromGlobals = globals.viewport ? getViewport(context.story.parameters, globals.viewport) : null;
   const viewport = viewportFromGlobals ?? getDefaultViewport(context.story.parameters) ?? "default";
   await context.setViewportSize(viewport);
@@ -183,7 +183,7 @@ async function argosScreenshot(page, context, options) {
     {
       name: storyContext.id,
       playwrightLibraries: ["@storybook/test-runner"],
-      applyGlobals: async ({ handler }) => {
+      beforeScreenshot: async ({ handler }) => {
         await waitForPageReady(handler);
       },
       story: {

package/dist/vitest-plugin.d.ts

@@ -11,23 +11,11 @@ type StorybookScreenshotContext<Handler extends Page | Frame> = {
     playwrightLibraries: string[];
     test?: MetadataConfig["test"];
     setViewportSize: (size: ViewportSize | "default") => Promise<void>;
-    /**
-     * Opportunity to apply globals or other context-specific settings.
-     * This can be useful to emulate dark mode or other visual modes.
-     * @example
-     * ```typescript
-     * applyGlobals: async ({ frame, globals }) => {
-     *   await frame.evaluate((globals) => {
-     *     if (globals.theme === "dark") {
-     *       document.documentElement.classList.add("dark");
-     *     } else {
-     *       document.documentElement.classList.remove("dark");
-     *     }
-     *   }, globals);
-     * }
-     * ```
-     */
-    applyGlobals?: (input: {
+    beforeScreenshot?: (input: {
+        handler: Handler;
+        globals: StorybookGlobals;
+    }) => Promise<void>;
+    afterScreenshot?: (input: {
         handler: Handler;
         globals: StorybookGlobals;
     }) => Promise<void>;
@@ -44,12 +32,32 @@ type ArgosReporterConfig = UploadParameters;
 type ArgosScreenshotCommandArgs = [
     Pick<StorybookScreenshotContext<Frame>, "name" | "story" | "test">
 ];
-interface ArgosVitestPluginOptions extends Pick<StorybookScreenshotContext<Frame>, "applyGlobals">, ArgosReporterConfig, ArgosScreenshotOptions {
+interface ArgosVitestPluginOptions extends ArgosReporterConfig, ArgosScreenshotOptions {
     /**
      * Upload the report to Argos.
      * @default true
      */
     uploadToArgos?: boolean;
+    /**
+     * Opportunity to apply globals or other context-specific settings.
+     * This can be useful to emulate dark mode or other visual modes.
+     * @example
+     * ```typescript
+     * applyGlobals: async ({ frame, globals }) => {
+     *   await frame.evaluate((globals) => {
+     *     if (globals.theme === "dark") {
+     *       document.documentElement.classList.add("dark");
+     *     } else {
+     *       document.documentElement.classList.remove("dark");
+     *     }
+     *   }, globals);
+     * }
+     * ```
+     */
+    applyGlobals?: (input: {
+        handler: Frame;
+        globals: StorybookGlobals;
+    }) => Promise<void>;
 }
 /**
  * Create a command for taking Argos screenshots in Vitest.

package/dist/vitest-plugin.js

@@ -116,13 +116,13 @@ async function storybookArgosScreenshot(handler, context, options) {
     allAttachments.push(...attachments);
   }
   await context.setViewportSize("default");
-  if (context.applyGlobals) {
-    await context.applyGlobals({
+  await setStorybookGlobals({ handler, globals: {} });
+  if (context.afterScreenshot) {
+    await context.afterScreenshot({
       handler,
       globals: {}
     });
   }
-  await setStorybookGlobals({ handler, globals: {} });
   return allAttachments;
 }
 async function setStorybookGlobals(args) {
@@ -150,13 +150,13 @@ async function setStorybookGlobals(args) {
 }
 async function runHooksAndScreenshot(args) {
   const { handler, context, options, globals, metadata } = args;
-  if (context.applyGlobals) {
-    await context.applyGlobals({
+  await setStorybookGlobals({ handler, globals });
+  if (context.beforeScreenshot) {
+    await context.beforeScreenshot({
       handler,
       globals
     });
   }
-  await setStorybookGlobals({ handler, globals });
   const viewportFromGlobals = globals.viewport ? getViewport(context.story.parameters, globals.viewport) : null;
   const viewport = viewportFromGlobals ?? getDefaultViewport(context.story.parameters) ?? "default";
   await context.setViewportSize(viewport);
@@ -227,7 +227,8 @@ var createArgosScreenshotCommand = (pluginOptions) => {
             }
           }, size);
         },
-        applyGlobals
+        beforeScreenshot: applyGlobals,
+        afterScreenshot: applyGlobals
       },
       applyFitToContent(screenshotOptions, fitToContent)
     );

package/dist/vitest.d.ts

@@ -8,23 +8,11 @@ type StorybookScreenshotContext<Handler extends Page | Frame> = {
     playwrightLibraries: string[];
     test?: MetadataConfig["test"];
     setViewportSize: (size: ViewportSize | "default") => Promise<void>;
-    /**
-     * Opportunity to apply globals or other context-specific settings.
-     * This can be useful to emulate dark mode or other visual modes.
-     * @example
-     * ```typescript
-     * applyGlobals: async ({ frame, globals }) => {
-     *   await frame.evaluate((globals) => {
-     *     if (globals.theme === "dark") {
-     *       document.documentElement.classList.add("dark");
-     *     } else {
-     *       document.documentElement.classList.remove("dark");
-     *     }
-     *   }, globals);
-     * }
-     * ```
-     */
-    applyGlobals?: (input: {
+    beforeScreenshot?: (input: {
+        handler: Handler;
+        globals: StorybookGlobals;
+    }) => Promise<void>;
+    afterScreenshot?: (input: {
         handler: Handler;
         globals: StorybookGlobals;
     }) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/storybook",
   "description": "Visual testing for Storybook test runner.",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "author": "Smooth Code",
   "license": "MIT",
   "repository": {
@@ -50,12 +50,12 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@argos-ci/playwright": "6.0.3",
+    "@argos-ci/playwright": "6.0.4",
     "@argos-ci/util": "3.0.0"
   },
   "devDependencies": {
-    "@argos-ci/cli": "3.0.1",
-    "@argos-ci/core": "4.0.1",
+    "@argos-ci/cli": "3.0.2",
+    "@argos-ci/core": "4.0.2",
     "@argos-ci/util": "workspace:*",
     "@storybook/addon-docs": "^9.1.0",
     "@storybook/addon-links": "^9.1.0",
@@ -97,5 +97,5 @@
     "check-format": "prettier --check --ignore-unknown --ignore-path=./.gitignore --ignore-path=../../.gitignore --ignore-path=../../.prettierignore .",
     "lint": "eslint ."
   },
-  "gitHead": "db55659eaaffc6a3a92655f621be0d6344901da2"
+  "gitHead": "cc53d0519b6e07fd339bd3e200626ec7833fc495"
 }