@chromatic-com/cypress 0.12.5 → 0.12.6

package/dist/index.js

@@ -5,6 +5,7 @@ var path2 = require('path');
 var fs = require('fs');
 var promises = require('fs/promises');
 var crypto = require('crypto');
+var csf = require('storybook/internal/csf');
 var analyticsNode = require('@segment/analytics-node');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -3868,6 +3869,7 @@ __name(viewportToString, "viewportToString");
 var sanitize = /* @__PURE__ */ __name((string) => {
   return string.toLowerCase().replace(/[ ’–—―′¿'`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "-").replace(/[\r\n]/g, "-").replace(/-+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
 }, "sanitize");
+var collapseNewlines = /* @__PURE__ */ __name((title) => title.replace(/[\r\n]+/g, " ").trim(), "collapseNewlines");
 
 // ../shared/src/write-archive/snapshot-files.ts
 var SNAPSHOT_FILE_EXT = "snapshot.json";
@@ -3886,49 +3888,57 @@ function snapshotFileName(snapshotId2, viewport) {
   return fileNameParts.join(".");
 }
 __name(snapshotFileName, "snapshotFileName");
-
-// ../shared/src/write-archive/stories-files.ts
 var STORIES_FILE_EXT = "stories.json";
+var uniqueId = {
+  value: 1
+};
 function storiesFileName(testTitle) {
   const fileName = [
-    sanitize(testTitle),
+    sanitize(testTitle) + "-" + uniqueId.value++,
     STORIES_FILE_EXT
   ].join(".");
   const maxByteLength = MAX_FILE_NAME_BYTE_LENGTH - 25;
   return truncateFileName(fileName, maxByteLength);
 }
 __name(storiesFileName, "storiesFileName");
-function createStories(title, domSnapshots, chromaticStorybookParams) {
+function createStories(storyTitle, domSnapshots, chromaticStorybookParams) {
+  const title = collapseNewlines(storyTitle);
   return {
     title,
-    stories: Object.entries(domSnapshots).map(([name, { viewport }]) => ({
-      name,
-      // Viewport addon (Storybook 10+): `parameters.viewport.options` registers sizes; `globals.viewport`
-      // selects the active one. See https://storybook.js.org/docs/essentials/viewport#defining-the-viewport-for-a-story
-      // `defaultViewport` is not read by SB 10's types but our archive preview uses it as a fetch fallback.
-      globals: {
-        viewport: viewportToString(viewport)
-      },
-      parameters: {
-        server: {
-          id: snapshotId(title, name)
-        },
-        chromatic: {
-          ...chromaticStorybookParams,
-          modes: buildStoryModesConfig([
-            viewport
-          ])
+    stories: Object.entries(domSnapshots).map(([snapshotName, { viewport }]) => {
+      const name = collapseNewlines(snapshotName);
+      return {
+        name,
+        // Viewport addon (Storybook 10+): `parameters.viewport.options` registers sizes; `globals.viewport`
+        // selects the active one. See https://storybook.js.org/docs/essentials/viewport#defining-the-viewport-for-a-story
+        // `defaultViewport` is not read by SB 10's types but our archive preview uses it as a fetch fallback.
+        globals: {
+          viewport: viewportToString(viewport)
         },
-        viewport: {
-          options: buildStoryViewportsConfig([
-            viewport
-          ]),
-          defaultViewport: viewportToString(findDefaultViewport([
-            viewport
-          ]))
+        parameters: {
+          // Work-around for cases where "あ" in story name would cause Storybook to fail to load the story due to an invalid story ID.
+          // See https://github.com/chromaui/chromatic-e2e/issues/365
+          __id: csf.toId(title, csf.storyNameFromExport(name)),
+          server: {
+            id: snapshotId(title, name)
+          },
+          chromatic: {
+            ...chromaticStorybookParams,
+            modes: buildStoryModesConfig([
+              viewport
+            ])
+          },
+          viewport: {
+            options: buildStoryViewportsConfig([
+              viewport
+            ]),
+            defaultViewport: viewportToString(findDefaultViewport([
+              viewport
+            ]))
+          }
         }
-      }
-    }))
+      };
+    })
   };
 }
 __name(createStories, "createStories");

package/dist/index.mjs

@@ -3,6 +3,7 @@ import path2, { join } from 'path';
 import { existsSync, mkdirSync } from 'fs';
 import { writeFile } from 'fs/promises';
 import { createHash } from 'crypto';
+import { toId, storyNameFromExport } from 'storybook/internal/csf';
 import { Analytics } from '@segment/analytics-node';
 
 var __create = Object.create;
@@ -3861,6 +3862,7 @@ __name(viewportToString, "viewportToString");
 var sanitize = /* @__PURE__ */ __name((string) => {
   return string.toLowerCase().replace(/[ ’–—―′¿'`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "-").replace(/[\r\n]/g, "-").replace(/-+/g, "-").replace(/^-+/, "").replace(/-+$/, "");
 }, "sanitize");
+var collapseNewlines = /* @__PURE__ */ __name((title) => title.replace(/[\r\n]+/g, " ").trim(), "collapseNewlines");
 
 // ../shared/src/write-archive/snapshot-files.ts
 var SNAPSHOT_FILE_EXT = "snapshot.json";
@@ -3879,49 +3881,57 @@ function snapshotFileName(snapshotId2, viewport) {
   return fileNameParts.join(".");
 }
 __name(snapshotFileName, "snapshotFileName");
-
-// ../shared/src/write-archive/stories-files.ts
 var STORIES_FILE_EXT = "stories.json";
+var uniqueId = {
+  value: 1
+};
 function storiesFileName(testTitle) {
   const fileName = [
-    sanitize(testTitle),
+    sanitize(testTitle) + "-" + uniqueId.value++,
     STORIES_FILE_EXT
   ].join(".");
   const maxByteLength = MAX_FILE_NAME_BYTE_LENGTH - 25;
   return truncateFileName(fileName, maxByteLength);
 }
 __name(storiesFileName, "storiesFileName");
-function createStories(title, domSnapshots, chromaticStorybookParams) {
+function createStories(storyTitle, domSnapshots, chromaticStorybookParams) {
+  const title = collapseNewlines(storyTitle);
   return {
     title,
-    stories: Object.entries(domSnapshots).map(([name, { viewport }]) => ({
-      name,
-      // Viewport addon (Storybook 10+): `parameters.viewport.options` registers sizes; `globals.viewport`
-      // selects the active one. See https://storybook.js.org/docs/essentials/viewport#defining-the-viewport-for-a-story
-      // `defaultViewport` is not read by SB 10's types but our archive preview uses it as a fetch fallback.
-      globals: {
-        viewport: viewportToString(viewport)
-      },
-      parameters: {
-        server: {
-          id: snapshotId(title, name)
-        },
-        chromatic: {
-          ...chromaticStorybookParams,
-          modes: buildStoryModesConfig([
-            viewport
-          ])
+    stories: Object.entries(domSnapshots).map(([snapshotName, { viewport }]) => {
+      const name = collapseNewlines(snapshotName);
+      return {
+        name,
+        // Viewport addon (Storybook 10+): `parameters.viewport.options` registers sizes; `globals.viewport`
+        // selects the active one. See https://storybook.js.org/docs/essentials/viewport#defining-the-viewport-for-a-story
+        // `defaultViewport` is not read by SB 10's types but our archive preview uses it as a fetch fallback.
+        globals: {
+          viewport: viewportToString(viewport)
         },
-        viewport: {
-          options: buildStoryViewportsConfig([
-            viewport
-          ]),
-          defaultViewport: viewportToString(findDefaultViewport([
-            viewport
-          ]))
+        parameters: {
+          // Work-around for cases where "あ" in story name would cause Storybook to fail to load the story due to an invalid story ID.
+          // See https://github.com/chromaui/chromatic-e2e/issues/365
+          __id: toId(title, storyNameFromExport(name)),
+          server: {
+            id: snapshotId(title, name)
+          },
+          chromatic: {
+            ...chromaticStorybookParams,
+            modes: buildStoryModesConfig([
+              viewport
+            ])
+          },
+          viewport: {
+            options: buildStoryViewportsConfig([
+              viewport
+            ]),
+            defaultViewport: viewportToString(findDefaultViewport([
+              viewport
+            ]))
+          }
         }
-      }
-    }))
+      };
+    })
   };
 }
 __name(createStories, "createStories");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chromatic-com/cypress",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "description": "Chromatic Visual Regression Testing for Cypress",
   "repository": {
     "type": "git",