Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maintenance: Regen lockfiles #24152

Merged
merged 11 commits into from
Sep 12, 2023
Merged

Maintenance: Regen lockfiles #24152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6860953
regen lockfiles
ndelangen Sep 12, 2023
966aa79
cleanup
ndelangen Sep 12, 2023
6235cab
downgrade swc/core because of https://github.com/TypeStrong/ts-node/i…
ndelangen Sep 12, 2023
87ca927
fix types issues, after upgrading by regenerating lockfiles
ndelangen Sep 12, 2023
dd31957
fix linting after
ndelangen Sep 12, 2023
291fb03
downgrade zone.js
ndelangen Sep 12, 2023
10efbd5
downgrade zone.js
ndelangen Sep 12, 2023
a985a6f
downgrade of sb/jest and sb/expect and add prettier types
ndelangen Sep 12, 2023
4f6881e
downgrade overlayscrollbars
ndelangen Sep 12, 2023
49f7577
Merge branch 'next' into norbert/regen-lockfile-september
ndelangen Sep 12, 2023
86c218b
Remove unnecessary cast
kasperpeulen Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/addons/a11y/src/components/Report/HighlightToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function areAllRequiredElementsHighlighted(
highlighted: string[]
): CheckBoxStates {
const highlightedCount = elementsToHighlight.filter((item) =>
highlighted.includes(item.target[0])
highlighted.includes(item.target[0] as any)
kasperpeulen marked this conversation as resolved.
Show resolved Hide resolved
).length;

// eslint-disable-next-line no-nested-ternary
Expand Down Expand Up @@ -52,7 +52,7 @@ const HighlightToggle: React.FC<ToggleProps> = ({ toggleId, elementsToHighlight

const handleToggle = React.useCallback((): void => {
toggleHighlight(
elementsToHighlight.map((e) => e.target[0]),
elementsToHighlight.map((e) => e.target[0] as any),
checkBoxState !== CheckBoxStates.CHECKED
);
}, [elementsToHighlight, checkBoxState, toggleHighlight]);
Expand Down
4 changes: 3 additions & 1 deletion code/builders/builder-manager/src/utils/files.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { OutputFile } from 'esbuild';
import { platform } from 'os';
import { sanitizePath } from './files';

Expand All @@ -9,12 +10,13 @@ test('sanitizePath', () => {
? 'C:\\Users\\username\\Projects\\projectname\\storybook'
: '/Users/username/Projects/projectname/storybook';
const text = 'demo text';
const file = {
const file: OutputFile = {
path: isWindows
? 'C:\\Users\\username\\Projects\\projectname\\storybook\\node_modules\\@storybook\\addon-x+y\\dist\\manager.js'
: '/Users/username/Projects/projectname/storybook/node_modules/@storybook/addon-x+y/dist/manager.js',
contents: Uint8Array.from(Array.from(text).map((letter) => letter.charCodeAt(0))),
text,
hash: '',
};
const { location, url } = sanitizePath(file, addonsDir);

Expand Down
2 changes: 1 addition & 1 deletion code/builders/builder-webpack5/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@storybook/node-logger": "workspace:*",
"@storybook/preview": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@swc/core": "^1.3.49",
"@swc/core": "^1.3.82",
"@types/node": "^16.0.0",
"@types/semver": "^7.3.4",
"babel-loader": "^9.0.0",
Expand Down
1 change: 1 addition & 0 deletions code/frameworks/nextjs/src/routing/app-router-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const AppRouterProvider: React.FC<AppRouterProviderProps> = ({ children, action,
apply: false,
hashFragment: null,
segmentPaths: [tree],
onlyHashChange: false,
},
nextUrl: pathname,
}}
Expand Down
3 changes: 2 additions & 1 deletion code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
],
"resolutions": {
"@playwright/test": "1.36.0",
"@testing-library/jest-dom": "^5.11.9",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/experimental-utils": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
Expand Down Expand Up @@ -195,7 +196,7 @@
"@storybook/web-components": "workspace:*",
"@storybook/web-components-vite": "workspace:*",
"@storybook/web-components-webpack5": "workspace:*",
"@swc/core": "^1.3.23",
"@swc/core": "1.3.82",
"@swc/jest": "^0.2.26",
"@testing-library/dom": "^7.29.4",
"@testing-library/jest-dom": "^5.11.9",
Expand Down
Loading