From 9bf1a0140b769dc57fa8ced5403f2aa929964431 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 30 May 2024 00:25:46 +0800 Subject: [PATCH 1/3] Pin `@swc/core` to 1.5.7 https://github.com/swc-project/swc/issues/8988 --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 0a326439..6c8a6384 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@storybook/csf": "^0.1.2", "@storybook/csf-tools": "next", "@storybook/preview-api": "next", - "@swc/core": "^1.3.18", + "@swc/core": "1.5.7", "@swc/jest": "^0.2.23", "expect-playwright": "^0.8.0", "jest": "^29.6.4", diff --git a/yarn.lock b/yarn.lock index 29e66e59..a13ae9ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3970,7 +3970,7 @@ __metadata: "@storybook/react": next "@storybook/react-vite": next "@storybook/test": next - "@swc/core": ^1.3.18 + "@swc/core": 1.5.7 "@swc/jest": ^0.2.23 "@types/jest": ^29.0.0 "@types/node": ^16.4.1 @@ -4136,7 +4136,7 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:^1.3.18": +"@swc/core@npm:1.5.7": version: 1.5.7 resolution: "@swc/core@npm:1.5.7" dependencies: From 4112e6950bfca3cd7db03722f0743b9dfa43d665 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 30 May 2024 02:48:51 +0800 Subject: [PATCH 2/3] Fix 8.1.4+ support for v5 index.json --- src/playwright/transformPlaywrightJson.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playwright/transformPlaywrightJson.ts b/src/playwright/transformPlaywrightJson.ts index 5f499d78..85adece8 100644 --- a/src/playwright/transformPlaywrightJson.ts +++ b/src/playwright/transformPlaywrightJson.ts @@ -94,7 +94,7 @@ function v3TitleMapToV4TitleMap(titleIdToStories: Record) { ({ type: isV3DocsOnly(stories) ? 'docs' : 'story', ...story, - } satisfies V4Entry) + }) satisfies V4Entry ), ]) ); @@ -120,7 +120,7 @@ export const transformPlaywrightJson = (index: V3StoriesIndex | V4Index | Unsupp Object.values((index as V3StoriesIndex).stories) ); titleIdToEntries = v3TitleMapToV4TitleMap(titleIdToStories); - } else if (index.v === 4) { + } else if (index.v === 4 || index.v === 5) { // TODO: Once Storybook 8.0 is released, we should only support v4 and higher titleIdToEntries = groupByTitleId(Object.values((index as V4Index).entries)); } else { From d05e4497849a418ebd9ce445bcef8ef42fc1f188 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Wed, 29 May 2024 21:02:30 +0200 Subject: [PATCH 3/3] Update src/playwright/transformPlaywrightJson.ts --- src/playwright/transformPlaywrightJson.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/playwright/transformPlaywrightJson.ts b/src/playwright/transformPlaywrightJson.ts index 85adece8..c22bea24 100644 --- a/src/playwright/transformPlaywrightJson.ts +++ b/src/playwright/transformPlaywrightJson.ts @@ -120,6 +120,7 @@ export const transformPlaywrightJson = (index: V3StoriesIndex | V4Index | Unsupp Object.values((index as V3StoriesIndex).stories) ); titleIdToEntries = v3TitleMapToV4TitleMap(titleIdToStories); + // v4 and v5 are pretty much similar, so we process it in the same way } else if (index.v === 4 || index.v === 5) { // TODO: Once Storybook 8.0 is released, we should only support v4 and higher titleIdToEntries = groupByTitleId(Object.values((index as V4Index).entries));