Merge pull request #24152 from storybookjs/norbert/regen-lockfile-sep…

…tember Maintenance: Regen lockfiles
storybookjs · Sep 12, 2023 · f86a652 · f86a652
2 parents 22bc762 + 86c218b
commit f86a652
Show file tree

Hide file tree

Showing 8 changed files with 4,327 additions and 3,499 deletions.
diff --git a/code/addons/a11y/src/components/Report/HighlightToggle.tsx b/code/addons/a11y/src/components/Report/HighlightToggle.tsx
@@ -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)
   ).length;
 
   // eslint-disable-next-line no-nested-ternary
@@ -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]);

diff --git a/code/builders/builder-manager/src/utils/files.test.ts b/code/builders/builder-manager/src/utils/files.test.ts
@@ -1,3 +1,4 @@
+import type { OutputFile } from 'esbuild';
 import { platform } from 'os';
 import { sanitizePath } from './files';
 
@@ -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);
 

diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
@@ -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",

diff --git a/code/frameworks/nextjs/src/routing/app-router-provider.tsx b/code/frameworks/nextjs/src/routing/app-router-provider.tsx
@@ -74,6 +74,7 @@ const AppRouterProvider: React.FC<AppRouterProviderProps> = ({ children, action,
               apply: false,
               hashFragment: null,
               segmentPaths: [tree],
+              onlyHashChange: false,
             },
             nextUrl: pathname,
           }}

diff --git a/code/package.json b/code/package.json
@@ -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",
@@ -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",