Skip to content

Commit 5da83c8

Browse files
authored
Merge pull request #4276 from github/ginsbach/upgrade-storybook-9
Upgrade Storybook from v8 to v9
2 parents 8fcde39 + 38fdd92 commit 5da83c8

File tree

10 files changed

+339
-845
lines changed

10 files changed

+339
-845
lines changed

extensions/ql-vscode/.storybook/main.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,15 @@ import type { StorybookConfig } from "@storybook/react-vite";
33
const config: StorybookConfig = {
44
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
55
addons: [
6+
"@storybook/addon-docs",
67
"@storybook/addon-links",
7-
"@storybook/addon-essentials",
8-
"@storybook/addon-interactions",
98
"@storybook/addon-a11y",
109
"./vscode-theme-addon/preset.ts",
1110
],
1211
framework: {
1312
name: "@storybook/react-vite",
1413
options: {},
1514
},
16-
docs: {
17-
autodocs: "tag",
18-
},
1915
};
2016

2117
export default config;

extensions/ql-vscode/.storybook/manager.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { addons } from "@storybook/manager-api";
2-
import { themes } from "@storybook/theming";
1+
import { addons } from "storybook/manager-api";
2+
import { themes } from "storybook/theming";
33

44
addons.setConfig({
55
theme: themes.dark,

extensions/ql-vscode/.storybook/preview.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Preview } from "@storybook/react";
2-
import { themes } from "@storybook/theming";
3-
import { action } from "@storybook/addon-actions";
2+
import { themes } from "storybook/theming";
3+
import { action } from "storybook/actions";
44

55
// Allow all stories/components to use Codicons
66
import "@vscode/codicons/dist/codicon.css";

extensions/ql-vscode/.storybook/vscode-theme-addon/ThemeSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import * as React from "react";
22
import type { FunctionComponent } from "react";
33
import { useCallback } from "react";
44

5-
import { useGlobals } from "@storybook/manager-api";
5+
import { useGlobals } from "storybook/manager-api";
66
import {
77
IconButton,
88
TooltipLinkList,
99
WithTooltip,
10-
} from "@storybook/components";
10+
} from "storybook/internal/components";
1111
import { DashboardIcon } from "@storybook/icons";
1212

1313
import { themeNames, VSCodeTheme } from "./theme";

extensions/ql-vscode/.storybook/vscode-theme-addon/manager.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import { addons } from "@storybook/manager-api";
2+
import { addons } from "storybook/manager-api";
33
import { Addon_TypesEnum } from "storybook/internal/types";
44
import { ThemeSelector } from "./ThemeSelector";
55

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
export function previewAnnotations(entry = []) {
2-
return [...entry, require.resolve("./preview.ts")];
1+
import { fileURLToPath } from "node:url";
2+
3+
const previewPath = fileURLToPath(new URL("./preview.ts", import.meta.url));
4+
const managerPath = fileURLToPath(new URL("./manager.tsx", import.meta.url));
5+
export function previewAnnotations(entry: string[] = []) {
6+
return [...entry, previewPath];
37
}
48

5-
export function managerEntries(entry = []) {
6-
return [...entry, require.resolve("./manager.tsx")];
9+
export function managerEntries(entry: string[] = []) {
10+
return [...entry, managerPath];
711
}

0 commit comments

Comments
 (0)