Buid: Update eslint (finally!!)

code/.eslintignore

@@ -17,4 +17,4 @@ ember-output
 !.eslintrc.js
 !.eslintrc-markdown.js
 !.storybook
-
+lib/core-common/templates/base-preview-head.html

code/.eslintrc.js

@@ -23,12 +23,6 @@ module.exports = {
   },
   plugins: ['local-rules'],
   rules: {
-    // remove as shared eslint has jest rules removed
-    'jest/no-standalone-expect': 'off',
-    'jest/no-done-callback': 'off',
-    'jest/no-deprecated-functions': 'off',
-    'jest/valid-expect': 'off',
-
     'eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
     'eslint-comments/no-unused-disable': 'error',
     'react-hooks/rules-of-hooks': 'off',
@@ -52,6 +46,7 @@ module.exports = {
         ],
       },
     ],
+    '@typescript-eslint/default-param-last': 'off',
   },
   overrides: [
     {

code/addons/a11y/src/components/Report/Elements.tsx

@@ -63,7 +63,6 @@ interface ElementsProps {
 export const Elements: FC<ElementsProps> = ({ elements, type }) => (
   <ol>
     {elements.map((element, index) => (
-      // eslint-disable-next-line react/no-array-index-key
       <Element element={element} key={index} type={type} />
     ))}
   </ol>

code/addons/a11y/src/components/Report/HighlightToggle.tsx

@@ -27,7 +27,6 @@ function areAllRequiredElementsHighlighted(
     highlighted.includes(item.target[0] as any)
   ).length;
 
-  // eslint-disable-next-line no-nested-ternary
   return highlightedCount === 0
     ? CheckBoxStates.UNCHECKED
     : highlightedCount === elementsToHighlight.length

code/addons/a11y/src/components/Report/Rules.tsx

@@ -91,7 +91,6 @@ export const Rules: FC<RulesProps> = ({ rules }) => {
   return (
     <List>
       {rules.map((rule, index) => (
-        // eslint-disable-next-line react/no-array-index-key
         <Rule rule={rule} key={index} />
       ))}
     </List>

code/addons/a11y/src/components/Tabs.tsx

@@ -121,7 +121,6 @@ export const Tabs: React.FC<TabsProps> = ({ tabs }) => {
         <TabsWrapper>
           {tabs.map((tab, index) => (
             <Item
-              /* eslint-disable-next-line react/no-array-index-key */
               key={index}
               data-index={index}
               active={activeTab === index}

code/addons/actions/src/containers/ActionLogger/index.tsx

@@ -65,10 +65,8 @@ export default class ActionLogger extends Component<ActionLoggerProps, ActionLog
       const actions = [...prevState.actions];
       const previous = actions.length && actions[0];
       if (previous && safeDeepEqual(previous.data, action.data)) {
-        // eslint-disable-next-line no-plusplus
         previous.count++;
       } else {
-        // eslint-disable-next-line no-param-reassign
         action.count = 1;
         actions.unshift(action);
       }

code/addons/actions/src/runtime/action.ts

@@ -71,7 +71,6 @@ export function action(name: string, options: ActionOptions = {}): HandlerFuncti
       if (storyRenderer) {
         const deprecated = !window?.FEATURES?.disallowImplicitActionsInRenderV8;
         const error = new ImplicitActionsDuringRendering({
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           phase: storyRenderer.phase!,
           name,
           deprecated,

code/addons/docs/preview.js

@@ -1,2 +1 @@
-// eslint-disable-next-line import/export
 export * from './dist/preview';

code/addons/docs/src/compiler/index.test.ts

@@ -523,7 +523,7 @@ describe('docs-mdx-compiler-plugin', () => {
             "import { Meta, Story } from '@storybook/addon-docs';",
             "import { titleFunction } from '../title-generators';",
             '',
-            // eslint-disable-next-line no-template-curly-in-string
+
             "<Meta title={`${titleFunction('template')}`} />",
           ].join('\n')
         )

code/addons/essentials/src/docs/preset.ts

@@ -1,10 +1,8 @@
 import { dirname, join } from 'path';
 
-// eslint-disable-next-line import/export
 export * from '@storybook/addon-docs/dist/preset';
 
 export const mdxLoaderOptions = async (config: any) => {
-  // eslint-disable-next-line no-param-reassign
   config.mdxCompileOptions.providerImportSource = join(
     dirname(require.resolve('@storybook/addon-docs/package.json')),
     '/dist/shims/mdx-react-shim'

code/addons/essentials/src/docs/preview.ts

@@ -1,2 +1 @@
-// eslint-disable-next-line import/export
 export * from '@storybook/addon-docs/dist/preview';

code/addons/gfm/src/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import { dedent } from 'ts-dedent';
 import { deprecate } from '@storybook/node-logger';
 

code/addons/interactions/src/components/InteractionsPanel.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-array-index-key */
 import * as React from 'react';
 import { Link, Placeholder } from '@storybook/components';
 import { type Call, CallStates, type ControlStates } from '@storybook/instrumenter';
@@ -103,7 +102,6 @@ export const InteractionsPanel: React.FC<InteractionsPanelProps> = React.memo(
             controls={controls}
             controlStates={controlStates}
             status={
-              // eslint-disable-next-line no-nested-ternary
               isPlaying ? CallStates.ACTIVE : hasException ? CallStates.ERROR : CallStates.DONE
             }
             storyFileName={fileName}

code/addons/interactions/src/components/MatcherResult.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-array-index-key */
 import React from 'react';
 import { styled, typography } from '@storybook/theming';
 import { Node } from './MethodCall';

code/addons/interactions/src/components/MethodCall.stories.tsx

@@ -34,7 +34,7 @@ export const Args = () => (
     <Node value="Hello world" />
     <Node value="https://github.com/storybookjs/storybook/blob/next/README.md" />
     <Node value="012345678901234567890123456789012345678901234567890123456789" />
-    {/* eslint-disable-next-line react/jsx-boolean-value */}
+    {}
     <Node value={true} />
     <Node value={false} />
     <Node value={12345} />

code/addons/interactions/src/components/MethodCall.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable react/no-array-index-key */
 import { ObjectInspector } from '@devtools-ds/object-inspector';
 import type { Call, CallRef, ElementRef } from '@storybook/instrumenter';
 import { useTheme } from '@storybook/theming';

code/addons/interactions/src/preview.ts

@@ -29,7 +29,7 @@ const instrumentSpies: LoaderFunction = ({ initialArgs }) => {
     const instrumented = instrument({ [key]: () => value }, { retain: true })[key];
     acc[key] = instrumented();
     // this enhancer is being called multiple times
-    // eslint-disable-next-line no-param-reassign
+
     value._instrumented = true;
     return acc;
   }, {} as Args);

code/addons/jest/src/components/Result.tsx

@@ -79,7 +79,6 @@ export function Result(props: ResultProps) {
       {isOpen ? (
         <Fragment>
           {failureMessages.map((msg: string, i: number) => (
-            // eslint-disable-next-line react/no-array-index-key
             <Message msg={msg} key={i} />
           ))}
         </Fragment>

code/addons/links/src/utils.ts

@@ -23,7 +23,6 @@ function parseQuery(queryString: string) {
     .split('&')
     .filter(Boolean);
 
-  // eslint-disable-next-line no-plusplus
   for (let i = 0; i < pairs.length; i++) {
     const pair = pairs[i].split('=');
     query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');

code/addons/measure/src/box-model/canvas.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import { global } from '@storybook/global';
 import invariant from 'tiny-invariant';
 

code/addons/measure/src/box-model/labels.ts

@@ -1,5 +1,3 @@
-/* eslint-disable operator-assignment */
-/* eslint-disable no-param-reassign */
 type LabelType = 'margin' | 'padding' | 'border' | 'content';
 type LabelPosition = 'top' | 'right' | 'bottom' | 'left' | 'center';
 type Direction = 'top' | 'right' | 'bottom' | 'left';

code/addons/measure/src/box-model/visualizer.ts

@@ -1,4 +1,3 @@
-/* eslint-disable operator-assignment */
 /**
  * Based on https://gist.github.com/awestbro/e668c12662ad354f02a413205b65fce7
  */

code/addons/viewport/src/Tool.tsx

@@ -129,7 +129,6 @@ export const ViewportTool: FC = memo(
     const [isTooltipVisible, setIsTooltipVisible] = useState(false);
 
     if (defaultViewport && !list.find((i) => i.id === defaultViewport)) {
-      // eslint-disable-next-line no-console
       console.warn(
         `Cannot find "defaultViewport" of "${defaultViewport}" in addon-viewport configs, please check the "viewports" setting in the configuration.`
       );

code/builders/builder-manager/src/index.ts

@@ -20,7 +20,7 @@ import type {
   ManagerBuilder,
   StarterFunction,
 } from './types';
-// eslint-disable-next-line import/no-cycle
+
 import { getData } from './utils/data';
 import { safeResolve } from './utils/safeResolve';
 import { readOrderedFiles } from './utils/files';
@@ -298,7 +298,6 @@ export const start: ManagerBuilder['start'] = async (options) => {
   let result;
 
   do {
-    // eslint-disable-next-line no-await-in-loop
     result = await asyncIterator.next();
   } while (!result.done);
 
@@ -310,7 +309,6 @@ export const build: ManagerBuilder['build'] = async (options) => {
   let result;
 
   do {
-    // eslint-disable-next-line no-await-in-loop
     result = await asyncIterator.next();
   } while (!result.done);
 

code/builders/builder-manager/src/utils/data.ts

@@ -3,7 +3,7 @@ import type { Options } from '@storybook/types';
 import { getRefs } from '@storybook/core-common';
 
 import { readTemplate } from './template';
-// eslint-disable-next-line import/no-cycle
+
 import { executor, getConfig } from '../index';
 
 export const getData = async (options: Options) => {

code/builders/builder-vite/src/plugins/code-generator-plugin.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-param-reassign */
-
 import * as fs from 'fs';
 import type { Plugin } from 'vite';
 import type { Options } from '@storybook/types';

code/builders/builder-vite/src/utils/has-vite-plugins.ts

@@ -12,9 +12,8 @@ function checkName(plugin: PluginOption, names: string[]) {
  */
 export async function hasVitePlugins(plugins: PluginOption[], names: string[]) {
   const resolvedPlugins = await Promise.all(plugins);
-  // eslint-disable-next-line no-restricted-syntax -- we need to await in the loop
+
   for (const plugin of resolvedPlugins) {
-    // eslint-disable-next-line no-await-in-loop -- we need to await in the loop
     if (Array.isArray(plugin) && Boolean(await hasVitePlugins(plugin, names))) {
       return true;
     }

code/builders/builder-vite/src/utils/without-vite-plugins.ts

@@ -10,10 +10,9 @@ export const withoutVitePlugins = async (
 ): Promise<PluginOption[]> => {
   const result = [];
   const resolvedPlugins = await Promise.all(plugins);
-  // eslint-disable-next-line no-restricted-syntax -- we need to await in the loop
+
   for (const plugin of resolvedPlugins) {
     if (Array.isArray(plugin)) {
-      // eslint-disable-next-line no-await-in-loop
       result.push(await withoutVitePlugins(plugin, namesToRemove));
     }
     if (plugin && 'name' in plugin && !namesToRemove.includes(plugin.name)) {

code/builders/builder-vite/src/vite-config.ts

@@ -116,7 +116,6 @@ export async function pluginConfig(options: Options) {
 
   // TODO: framework doesn't exist, should move into framework when/if built
   if (frameworkName === '@storybook/glimmerx-vite') {
-    // eslint-disable-next-line global-require
     const plugin = require('vite-plugin-glimmerx/index.cjs');
     plugins.push(plugin.default());
   }

code/builders/builder-webpack5/src/index.ts

@@ -312,7 +312,6 @@ export const start = async (options: BuilderStartOptions) => {
   let result;
 
   do {
-    // eslint-disable-next-line no-await-in-loop
     result = await asyncIterator.next();
   } while (!result.done);
 
@@ -324,7 +323,6 @@ export const build = async (options: BuilderStartOptions) => {
   let result;
 
   do {
-    // eslint-disable-next-line no-await-in-loop
     result = await asyncIterator.next();
   } while (!result.done);
 

code/e2e-tests/addon-actions.spec.ts

@@ -7,9 +7,7 @@ const templateName = process.env.STORYBOOK_TEMPLATE_NAME || '';
 
 test.describe('addon-actions', () => {
   test('should trigger an action', async ({ page }) => {
-    // eslint-disable-next-line jest/no-disabled-tests
     test.skip(
-      // eslint-disable-next-line jest/valid-title
       templateName.includes('svelte') && templateName.includes('prerelease'),
       'Svelte 5 prerelase does not support automatic actions with our current example components yet'
     );

code/e2e-tests/addon-docs.spec.ts

@@ -1,6 +1,3 @@
-/* eslint-disable jest/valid-title */
-/* eslint-disable jest/no-disabled-tests */
-/* eslint-disable no-await-in-loop */
 import { test, expect } from '@playwright/test';
 import process from 'process';
 import dedent from 'ts-dedent';

code/e2e-tests/addon-interactions.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-disabled-tests,jest/valid-title */
 import { test, expect } from '@playwright/test';
 import process from 'process';
 import { SbPage } from './util';

code/e2e-tests/framework-nextjs.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-disabled-tests */
 import type { Locator } from '@playwright/test';
 import { test, expect } from '@playwright/test';
 import process from 'process';
@@ -11,7 +10,6 @@ test.describe('Next.js', () => {
   // TODO: improve these E2E tests given that we have more version of Next.js to test
   // and this only tests nextjs/default-js
   test.skip(
-    // eslint-disable-next-line jest/valid-title
     !templateName?.includes('nextjs/default-js'),
     'Only run this test for the Frameworks that support next/navigation'
   );

code/e2e-tests/framework-svelte.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-disabled-tests */
 import { test, expect } from '@playwright/test';
 import process from 'process';
 import { SbPage } from './util';
@@ -12,11 +11,7 @@ test.beforeEach(async ({ page }) => {
 });
 
 test.describe('Svelte', () => {
-  test.skip(
-    // eslint-disable-next-line jest/valid-title
-    !templateName?.includes('svelte'),
-    'Only run this test on Svelte'
-  );
+  test.skip(!templateName?.includes('svelte'), 'Only run this test on Svelte');
 
   test('JS story has auto-generated args table', async ({ page }) => {
     const sbPage = new SbPage(page);
@@ -28,7 +23,6 @@ test.describe('Svelte', () => {
   });
 
   test('TS story has auto-generated args table', async ({ page }) => {
-    // eslint-disable-next-line jest/valid-title
     test.skip(!templateName?.endsWith('ts') || false, 'Only test TS story in TS templates');
     const sbPage = new SbPage(page);
 
@@ -66,11 +60,7 @@ test.describe('Svelte', () => {
 });
 
 test.describe('SvelteKit', () => {
-  test.skip(
-    // eslint-disable-next-line jest/valid-title
-    !templateName?.includes('svelte-kit'),
-    'Only run this test on SvelteKit'
-  );
+  test.skip(!templateName?.includes('svelte-kit'), 'Only run this test on SvelteKit');
 
   test('Links are logged in Actions panel', async ({ page }) => {
     const sbPage = new SbPage(page);

code/e2e-tests/manager.spec.ts

@@ -192,12 +192,7 @@ test.describe('Manager UI', () => {
     // TODO: remove this when SSV6 templates have been removed
     // Some assertions in these tests are not compatible with SSV6
     // GIven that SSV6 will be removed before the new mobile UI released, it doesn't make sense to fix them
-    // eslint-disable-next-line jest/no-disabled-tests
-    test.skip(
-      // eslint-disable-next-line jest/valid-title
-      templateName?.includes('ssv6') || false,
-      'Skip mobile UI tests for SSV6'
-    );
+    test.skip(templateName?.includes('ssv6') || false, 'Skip mobile UI tests for SSV6');
 
     // standard iPhone viewport size
     test.use({ viewport: { width: 390, height: 844 } });

code/e2e-tests/preview-web.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-disabled-tests */
 import { test, expect } from '@playwright/test';
 import process from 'process';
 import { SbPage } from './util';
@@ -15,7 +14,6 @@ test.describe('preview-web', () => {
 
   test('should pass over shortcuts, but not from play functions, story', async ({ page }) => {
     test.skip(
-      // eslint-disable-next-line jest/valid-title
       /^(lit)/i.test(`${templateName}`),
       `Skipping ${templateName}, which does not support addon-interactions`
     );
@@ -40,7 +38,6 @@ test.describe('preview-web', () => {
 
   test('should pass over shortcuts, but not from play functions, docs', async ({ page }) => {
     test.skip(
-      // eslint-disable-next-line jest/valid-title
       /^(lit)/i.test(`${templateName}`),
       `Skipping ${templateName}, which does not support addon-interactions`
     );

code/e2e-tests/util.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 import type { Page } from '@playwright/test';
 import { expect } from '@playwright/test';
 import { toId } from '@storybook/csf';