TypeScript: Revert a few @ts-expect-errors

code/lib/api/src/modules/versions.ts

@@ -1,5 +1,5 @@
 import global from 'global';
-// @ts-expect-error no typedefs
+// @ts-ignore (FIXME should be expect-error no typedefs but fails build --prep)
 import semver from '@storybook/semver';
 import memoize from 'memoizerific';
 

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

@@ -72,7 +72,7 @@ export const bail: WebpackBuilder['bail'] = async () => {
   }
   // we wait for the compiler to finish it's work, so it's command-line output doesn't interfere
   return new Promise((res, rej) => {
-    // @ts-expect-error (Converted from ts-ignore)
+    // @ts-ignore (FIXME: should be expect-error but fails build --prep)
     if (process && compilation) {
       try {
         compilation.close(() => res());
@@ -219,7 +219,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime,
 
       logger.trace({ message: '=> Preview built', time: process.hrtime(startTime) });
       if (stats && stats.hasWarnings()) {
-        // @ts-expect-error (Converted from ts-ignore)
+        // @ts-ignore (FIXME should be @ts-expect-error but fails build --prep)
         stats
           .toJson({ warnings: true } as StatsOptions)
           .warnings.forEach((e) => logger.warn(e.message));

code/lib/core-common/src/utils/envs.ts

@@ -1,4 +1,4 @@
-// @ts-expect-error does not have defs, but universal-dotenv is in TS now
+// @ts-ignore (FIXME should be "@ts-expect-error does not have defs, but universal-dotenv is in TS now" but fails build --prep)
 import { getEnvironment } from 'lazy-universal-dotenv';
 import { nodePathsToArray } from './paths';
 

code/lib/core-common/src/utils/normalize-stories.ts

@@ -15,7 +15,7 @@ const DEFAULT_FILES = '**/*.@(mdx|stories.mdx|stories.tsx|stories.ts|stories.jsx
 // TODO: remove - LEGACY support for bad glob patterns we had in SB 5 - remove in SB7
 const fixBadGlob = deprecate(
   (match: RegExpMatchArray) => {
-    // @ts-expect-error this will get removed later anyway
+    // @ts-ignore (FIXME should be "@ts-expect-error this will get removed later anyway" but fails build --prep)
     return match.input.replace(match[1], `@${match[1]}`);
   },
   dedent`

code/lib/preview-web/src/render/StoryRender.ts

@@ -40,7 +40,7 @@ function createController(): AbortController {
   return {
     signal: { aborted: false },
     abort() {
-      // @ts-expect-error (Converted from ts-ignore)
+      // @ts-ignore (should be @ts-expect-error but fails build --prep)
       this.signal.aborted = true;
     },
   } as AbortController;