From 231a9ce2226afd3e56ee748b543f4b08cdac5572 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 11 Jul 2024 23:27:42 +0800 Subject: [PATCH 1/3] Core: Upgrade docs-mdx for smaller install --- code/core/package.json | 2 +- .../src/core-server/utils/StoryIndexGenerator.ts | 4 ++-- code/yarn.lock | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 49a46f20a7d4..7b42c00a3642 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -277,7 +277,7 @@ "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-scroll-area": "^1.0.5", "@radix-ui/react-slot": "^1.0.2", - "@storybook/docs-mdx": "3.1.0-next.0", + "@storybook/docs-mdx": "4.0.0--canary.19.48b6c75.0", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", "@tanstack/react-virtual": "^3.3.0", diff --git a/code/core/src/core-server/utils/StoryIndexGenerator.ts b/code/core/src/core-server/utils/StoryIndexGenerator.ts index 29f71429bf95..dfcf2d4a5f51 100644 --- a/code/core/src/core-server/utils/StoryIndexGenerator.ts +++ b/code/core/src/core-server/utils/StoryIndexGenerator.ts @@ -23,7 +23,6 @@ import { commonGlobOptions, normalizeStoryPath } from '@storybook/core/common'; import { logger, once } from '@storybook/core/node-logger'; import { getStorySortParameter, loadConfig } from '@storybook/core/csf-tools'; import { storyNameFromExport, toId, combineTags } from '@storybook/csf'; -import { analyze } from '@storybook/docs-mdx'; import { dedent } from 'ts-dedent'; import { autoName } from './autoName'; import { IndexingError, MultipleIndexingError } from './IndexingError'; @@ -408,7 +407,8 @@ export class StoryIndexGenerator { const content = await fs.readFile(absolutePath, 'utf8'); - const result = analyze(content); + const { analyze } = await import('@storybook/docs-mdx'); + const result = await analyze(content); // Templates are not indexed if (result.isTemplate) return false; diff --git a/code/yarn.lock b/code/yarn.lock index 891cc77ecc9d..1d3bd4217601 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5758,7 +5758,7 @@ __metadata: "@radix-ui/react-scroll-area": "npm:^1.0.5" "@radix-ui/react-slot": "npm:^1.0.2" "@storybook/csf": "npm:0.1.11" - "@storybook/docs-mdx": "npm:3.1.0-next.0" + "@storybook/docs-mdx": "npm:4.0.0--canary.19.48b6c75.0" "@storybook/global": "npm:^5.0.0" "@storybook/icons": "npm:^1.2.5" "@tanstack/react-virtual": "npm:^3.3.0" @@ -5911,10 +5911,12 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-mdx@npm:3.1.0-next.0": - version: 3.1.0-next.0 - resolution: "@storybook/docs-mdx@npm:3.1.0-next.0" - checksum: 10c0/7622d7c6318e842c90a71c1836d68531236c31fff7081c885803eddfafb7e3f8998689f612eaa0292209ada8352a36657dcacb5d3ef4632b8e8b8a283c39602e +"@storybook/docs-mdx@npm:4.0.0--canary.19.48b6c75.0": + version: 4.0.0--canary.19.48b6c75.0 + resolution: "@storybook/docs-mdx@npm:4.0.0--canary.19.48b6c75.0" + dependencies: + acorn: "npm:^8.12.1" + checksum: 10c0/6229aea30fbe02b46162de9ad0871ded4a0a37d92823e379a17b657d06fb6f694d20e79ca7b107dc0c19b0a586059133482248aa2ea6f27ce14f59c076f1853b languageName: node linkType: hard @@ -9241,7 +9243,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.11.2, acorn@npm:^8.11.3, acorn@npm:^8.4.1, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": +"acorn@npm:^8.0.0, acorn@npm:^8.10.0, acorn@npm:^8.11.2, acorn@npm:^8.11.3, acorn@npm:^8.12.1, acorn@npm:^8.4.1, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: From f3530d04492dedc3640aa66a534ae9c1c9f86138 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 12 Jul 2024 00:10:08 +0800 Subject: [PATCH 2/3] Fix docs-mdx package.json --- code/core/package.json | 2 +- code/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 7b42c00a3642..7c58e4ce0d83 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -277,7 +277,7 @@ "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-scroll-area": "^1.0.5", "@radix-ui/react-slot": "^1.0.2", - "@storybook/docs-mdx": "4.0.0--canary.19.48b6c75.0", + "@storybook/docs-mdx": "4.0.0--canary.19.f920eba.0", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", "@tanstack/react-virtual": "^3.3.0", diff --git a/code/yarn.lock b/code/yarn.lock index 1d3bd4217601..5647cb8b6de5 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5758,7 +5758,7 @@ __metadata: "@radix-ui/react-scroll-area": "npm:^1.0.5" "@radix-ui/react-slot": "npm:^1.0.2" "@storybook/csf": "npm:0.1.11" - "@storybook/docs-mdx": "npm:4.0.0--canary.19.48b6c75.0" + "@storybook/docs-mdx": "npm:4.0.0--canary.19.f920eba.0" "@storybook/global": "npm:^5.0.0" "@storybook/icons": "npm:^1.2.5" "@tanstack/react-virtual": "npm:^3.3.0" @@ -5911,12 +5911,12 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-mdx@npm:4.0.0--canary.19.48b6c75.0": - version: 4.0.0--canary.19.48b6c75.0 - resolution: "@storybook/docs-mdx@npm:4.0.0--canary.19.48b6c75.0" +"@storybook/docs-mdx@npm:4.0.0--canary.19.f920eba.0": + version: 4.0.0--canary.19.f920eba.0 + resolution: "@storybook/docs-mdx@npm:4.0.0--canary.19.f920eba.0" dependencies: acorn: "npm:^8.12.1" - checksum: 10c0/6229aea30fbe02b46162de9ad0871ded4a0a37d92823e379a17b657d06fb6f694d20e79ca7b107dc0c19b0a586059133482248aa2ea6f27ce14f59c076f1853b + checksum: 10c0/b25c8bb5651932d5e883c8c5441d94d33e528b84ebe35ae565abfda0804eafd635f9f6c90b8c52cd0fe3473b458cb77acceb63d7b87e10dc6a36d47b508b753f languageName: node linkType: hard From f4b0bb5a9fd6dcb331c5111034dae624366d2398 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 12 Jul 2024 11:33:26 +0800 Subject: [PATCH 3/3] Upgrade from canary to prerelease --- code/core/package.json | 2 +- code/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 7c58e4ce0d83..326b6d18f517 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -277,7 +277,7 @@ "@radix-ui/react-dialog": "^1.0.5", "@radix-ui/react-scroll-area": "^1.0.5", "@radix-ui/react-slot": "^1.0.2", - "@storybook/docs-mdx": "4.0.0--canary.19.f920eba.0", + "@storybook/docs-mdx": "4.0.0-next.0", "@storybook/global": "^5.0.0", "@storybook/icons": "^1.2.5", "@tanstack/react-virtual": "^3.3.0", diff --git a/code/yarn.lock b/code/yarn.lock index 5647cb8b6de5..9ff47ee2f2dd 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5758,7 +5758,7 @@ __metadata: "@radix-ui/react-scroll-area": "npm:^1.0.5" "@radix-ui/react-slot": "npm:^1.0.2" "@storybook/csf": "npm:0.1.11" - "@storybook/docs-mdx": "npm:4.0.0--canary.19.f920eba.0" + "@storybook/docs-mdx": "npm:4.0.0-next.0" "@storybook/global": "npm:^5.0.0" "@storybook/icons": "npm:^1.2.5" "@tanstack/react-virtual": "npm:^3.3.0" @@ -5911,12 +5911,12 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-mdx@npm:4.0.0--canary.19.f920eba.0": - version: 4.0.0--canary.19.f920eba.0 - resolution: "@storybook/docs-mdx@npm:4.0.0--canary.19.f920eba.0" +"@storybook/docs-mdx@npm:4.0.0-next.0": + version: 4.0.0-next.0 + resolution: "@storybook/docs-mdx@npm:4.0.0-next.0" dependencies: acorn: "npm:^8.12.1" - checksum: 10c0/b25c8bb5651932d5e883c8c5441d94d33e528b84ebe35ae565abfda0804eafd635f9f6c90b8c52cd0fe3473b458cb77acceb63d7b87e10dc6a36d47b508b753f + checksum: 10c0/6253361e4e3c6c716c4f4c8cc30c082bcdab66b35b30183f6574d94720d875e28927916be8bda0bff4987090c3e50d348ca898160b1812a90c5afa845400414e languageName: node linkType: hard