Skip to content

Commit 849f2a4

Browse files
authored
Merge pull request #4263 from github/copilot/fix-github-actions-workflow-again
Re-enable MDX documentation support in Storybook v10
2 parents 06d4c69 + e01f33c commit 849f2a4

File tree

16 files changed

+179
-126
lines changed

16 files changed

+179
-126
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ 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",
78
"@storybook/addon-a11y",
89
"./vscode-theme-addon/preset.ts",
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
import { dirname, join } from "path";
2+
import { fileURLToPath } from "url";
3+
4+
const __dirname = dirname(fileURLToPath(import.meta.url));
5+
16
export function previewAnnotations(entry = []) {
2-
return [...entry, require.resolve("./preview.ts")];
7+
return [...entry, join(__dirname, "preview.ts")];
38
}
49

510
export function managerEntries(entry = []) {
6-
return [...entry, require.resolve("./manager.tsx")];
11+
return [...entry, join(__dirname, "manager.tsx")];
712
}

extensions/ql-vscode/package-lock.json

Lines changed: 119 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2110,6 +2110,7 @@
21102110
"@microsoft/eslint-formatter-sarif": "^3.1.0",
21112111
"@playwright/test": "^1.50.1",
21122112
"@storybook/addon-a11y": "^10.1.11",
2113+
"@storybook/addon-docs": "^10.1.11",
21132114
"@storybook/addon-links": "^10.1.11",
21142115
"@storybook/components": "^8.6.14",
21152116
"@storybook/csf": "^0.1.13",

extensions/ql-vscode/src/stories/Overview.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Canvas, Meta, Story } from '@storybook/blocks';
1+
import { Canvas, Meta, Story } from '@storybook/addon-docs/blocks';
22

33
import iframeImage from './images/update-css-variables-iframe.png';
44
import stylesImage from './images/update-css-variables-styles.png';

extensions/ql-vscode/src/view/common/CodePaths/CodeFlowsDropdown.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ChangeEvent, SetStateAction } from "react";
1+
import type { SetStateAction } from "react";
22
import { useCallback } from "react";
33
import {
44
VscodeOption,
@@ -25,8 +25,8 @@ export const CodeFlowsDropdown = ({
2525
setSelectedCodeFlow,
2626
}: CodeFlowsDropdownProps) => {
2727
const handleChange = useCallback(
28-
(e: ChangeEvent<HTMLSelectElement>) => {
29-
const selectedOption = e.target;
28+
(e: Event) => {
29+
const selectedOption = e.target as HTMLSelectElement;
3030
const selectedIndex = parseInt(selectedOption.value);
3131
setSelectedCodeFlow(codeFlows[selectedIndex]);
3232
},

extensions/ql-vscode/src/view/common/DataGrid.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const DataGridRow = forwardRef(
8383
"data-testid": testId,
8484
onClick,
8585
}: DataGridRowProps,
86-
ref?: React.Ref<HTMLElement | undefined>,
86+
ref?: React.Ref<HTMLDivElement>,
8787
) => (
8888
<StyledDataGridRow
8989
$focused={focused}
@@ -135,7 +135,7 @@ export const DataGridCell = forwardRef(
135135
className,
136136
children,
137137
}: DataGridCellProps,
138-
ref?: React.Ref<HTMLElement | undefined>,
138+
ref?: React.Ref<HTMLDivElement>,
139139
) => {
140140
return (
141141
<StyledDataGridCell

extensions/ql-vscode/src/view/common/TextButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { styled } from "styled-components";
22

33
type Size = "x-small" | "small" | "medium" | "large" | "x-large";
44

5-
const StyledButton = styled.button<{ $size: Size }>`
5+
const StyledButton = styled.button<{ $size?: Size }>`
66
background: none;
77
color: var(--vscode-textLink-foreground);
88
border: none;

extensions/ql-vscode/src/view/model-alerts/ModelAlertsSort.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type Props = {
2020

2121
export const ModelAlertsSort = ({ value, onChange, className }: Props) => {
2222
const handleInput = useCallback(
23-
(e: InputEvent) => {
23+
(e: Event) => {
2424
const target = e.target as HTMLSelectElement;
2525

2626
onChange(target.value as SortKey);

0 commit comments

Comments
 (0)