Fix up some more types to bootstrap

lib/api/src/lib/StoryIndexClient.ts

@@ -2,10 +2,11 @@ import global from 'global';
 
 import { StoryIndex } from './stories';
 
-const { fetch, EventSource } = global;
+const { fetch } = global;
 
 const PATH = './stories.json';
 
+// eslint-disable-next-line no-undef
 export class StoryIndexClient extends EventSource {
   constructor() {
     super(PATH);

lib/api/tsconfig.json

@@ -11,5 +11,6 @@
     "src/**/*.stories.*",
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
-  ]
+  ],
+  "lib": ["es2017", "dom"]
 }

lib/core-common/package.json

@@ -91,6 +91,7 @@
   },
   "devDependencies": {
     "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.253f8c1.0",
+    "@types/compression": "^1.7.0",
     "@types/interpret": "^1.1.1",
     "@types/mock-fs": "^4.13.0",
     "mock-fs": "^4.13.0"

lib/core-common/src/utils/progress-reporting.ts

@@ -1,4 +1,4 @@
-import { Router } from 'express';
+import { Router, Request, Response } from 'express';
 import { printDuration } from './print-duration';
 
 export const useProgressReporting = async (
@@ -14,7 +14,7 @@ export const useProgressReporting = async (
     modules?: any;
   }) => void = () => {};
 
-  router.get('/progress', (request, response) => {
+  router.get('/progress', (request: Request, response: Response) => {
     let closed = false;
     const close = () => {
       closed = true;

lib/core-common/typings.d.ts

@@ -1,6 +1,9 @@
+import('@types/compression');
+
 declare module 'lazy-universal-dotenv';
 declare module 'pnp-webpack-plugin';
 declare module '@storybook/semver';
+
 declare module 'file-system-cache' {
   export interface Options {
     basePath?: string;

lib/core-server/src/utils/StoryIndexGenerator.ts

@@ -25,13 +25,12 @@ function sortExtractedStories(
   }, {} as StoryIndex['stories']);
 }
 
+type SpecifierStoriesCache = Record<Path, StoryIndex['stories'] | false>;
+
 export class StoryIndexGenerator {
   // An internal cache mapping specifiers to a set of path=><set of stories>
   // Later, we'll combine each of these subsets together to form the full index
-  private storyIndexEntries: Map<
-    NormalizedStoriesSpecifier,
-    Record<Path, StoryIndex['stories'] | false>
-  >;
+  private storyIndexEntries: Map<NormalizedStoriesSpecifier, SpecifierStoriesCache>;
 
   // Cache the last value of `getStoryIndex`. We invalidate (by unsetting) when:
   //  - any file changes, including deletions
@@ -49,10 +48,17 @@ export class StoryIndexGenerator {
     // Find all matching paths for each specifier
     await Promise.all(
       this.specifiers.map(async (specifier) => {
-        const pathToSubIndex = {} as Record<Path, StoryIndex['stories'] | false>;
+        const pathToSubIndex = {} as SpecifierStoriesCache;
 
         const files = await glob(path.join(this.configDir, specifier.glob));
         files.forEach((fileName: Path) => {
+          const ext = path.extname(fileName);
+          const relativePath = path.relative(this.configDir, fileName);
+          if (!['.js', '.jsx', '.ts', '.tsx', '.mdx'].includes(ext)) {
+            logger.info(`Skipping ${ext} file ${relativePath}`);
+            return;
+          }
+
           pathToSubIndex[fileName] = false;
         });
 
@@ -64,26 +70,23 @@ export class StoryIndexGenerator {
     await this.ensureExtracted();
   }
 
-  async ensureExtracted() {
-    await Promise.all(
-      this.specifiers.map(async (specifier) => {
-        const entry = this.storyIndexEntries.get(specifier);
-        await Promise.all(
-          Object.keys(entry).map(async (fileName) => {
-            if (!entry[fileName]) await this.extractStories(specifier, fileName);
-          })
-        );
-      })
-    );
+  async ensureExtracted(): Promise<StoryIndex['stories'][]> {
+    return (
+      await Promise.all(
+        this.specifiers.map(async (specifier) => {
+          const entry = this.storyIndexEntries.get(specifier);
+          return Promise.all(
+            Object.keys(entry).map(
+              async (fileName) => entry[fileName] || this.extractStories(specifier, fileName)
+            )
+          );
+        })
+      )
+    ).flat();
   }
 
   async extractStories(specifier: NormalizedStoriesSpecifier, absolutePath: Path) {
-    const ext = path.extname(absolutePath);
     const relativePath = path.relative(this.configDir, absolutePath);
-    if (!['.js', '.jsx', '.ts', '.tsx', '.mdx'].includes(ext)) {
-      logger.info(`Skipping ${ext} file ${relativePath}`);
-      return;
-    }
     try {
       const entry = this.storyIndexEntries.get(specifier);
       const fileStories = {} as StoryIndex['stories'];
@@ -99,7 +102,8 @@ export class StoryIndexGenerator {
         };
       });
 
-      entry[absolutePath] = fileStories;
+      entry[importPath] = fileStories;
+      return fileStories;
     } catch (err) {
       logger.warn(`🚨 Extraction error on ${relativePath}: ${err}`);
       logger.warn(`🚨 ${err.stack}`);
@@ -122,12 +126,8 @@ export class StoryIndexGenerator {
     if (this.lastIndex) return this.lastIndex;
 
     // Extract any entries that are currently missing
-    await this.ensureExtracted();
-
     // Pull out each file's stories into a list of stories, to be composed and sorted
-    const storiesList = this.specifiers.flatMap((specifier) =>
-      Object.values(this.storyIndexEntries.get(specifier))
-    );
+    const storiesList = await this.ensureExtracted();
 
     this.lastIndex = {
       v: 3,

lib/core-server/src/utils/__mockdata__/preview.js

@@ -0,0 +1 @@
+export const parameters = {};

lib/core-server/src/utils/__mockdata__/src/C.js

@@ -0,0 +1 @@
+export const C = {};

lib/core-server/src/utils/__mockdata__/src/nested/Button.ts

@@ -0,0 +1 @@
+export const Button = {};

lib/core-server/src/utils/__mockdata__/src/nested/Page.mdx

@@ -0,0 +1 @@
+<h1>Some MDX</h1>

lib/preview-web/src/StoryIndexClient.ts

@@ -2,10 +2,11 @@ import global from 'global';
 
 import { StoryIndex } from '@storybook/store';
 
-const { fetch, EventSource } = global;
+const { fetch } = global;
 
 const PATH = './stories.json';
 
+// eslint-disable-next-line no-undef
 export class StoryIndexClient extends EventSource {
   constructor() {
     super(PATH);

lib/preview-web/tsconfig.json

@@ -12,5 +12,6 @@
     "src/**/*.stories.*",
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
-  ]
+  ],
+  "lib": ["es2017", "dom"]
 }

yarn.lock

@@ -8000,6 +8000,7 @@ __metadata:
     "@storybook/node-logger": 6.4.0-alpha.39
     "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.253f8c1.0
     "@storybook/semver": ^7.3.2
+    "@types/compression": ^1.7.0
     "@types/interpret": ^1.1.1
     "@types/micromatch": ^4.0.1
     "@types/mock-fs": ^4.13.0