Put back some unrelated changes

Author: jmhobbs

node-src/git/mocks/mockIndex.ts

@@ -15,17 +15,16 @@
 import type { MergeCommitsQueryResult } from '../getParentCommits';
 import { Repository } from '../getParentCommits.test';
 
-export interface Build {
-  number: number;
+interface Build {
   branch: string;
   commit: string;
   committedAt: number;
 }
-export interface PR {
+interface PR {
   mergeCommitHash: string;
   headBranch: string;
 }
-export interface MergeInfo {
+interface MergeInfo {
   commit: string;
   branch: string;
 }

node-src/lib/getStorybookInfo.test.ts

@@ -9,7 +9,7 @@ const log = { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() };
 const context: Context = { env: {}, log, options: {}, packageJson: {} } as any;
 const getContext = (ctx: any): Context => ({ ...context, ...ctx });
 
-const REACT = { '@storybook/html-vite': '1.2.3' };
+const REACT = { '@storybook/react-webpack5': '1.2.3' };
 const VUE = { '@storybook/vue': '1.2.3' };
 
 afterEach(() => {
@@ -31,10 +31,10 @@ describe('getStorybookInfo', () => {
     expect(sbInfo).toEqual(
       // We're getting the result of tracing chromatic-cli's node_modules here.
       expect.objectContaining({
-        // We're currently using `react` and `@storybook/html-vite` so the we can end up with
+        // We're currently using `react` and `@storybook/react-webpack5` so the we can end up with
         // either one based on when those promises resolve.
         version: expect.any(String),
-        builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+        builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
       })
     );
   });
@@ -61,7 +61,7 @@ describe('getStorybookInfo', () => {
     const ctx = getContext({ packageJson: { dependencies: VUE } });
     await expect(getStorybookInfo(ctx)).resolves.toEqual(
       expect.objectContaining({
-        builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+        builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
       })
     );
   });
@@ -70,10 +70,10 @@ describe('getStorybookInfo', () => {
     await expect(getStorybookInfo(context)).resolves.toEqual(
       // We're getting the result of tracing chromatic-cli's node_modules here.
       expect.objectContaining({
-        // We're currently using `react` and `@storybook/html-vite` so the we can end up with
+        // We're currently using `react` and `@storybook/react-webpack5` so the we can end up with
         // either one based on when those promises resolve.
         version: expect.any(String),
-        builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+        builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
       })
     );
     expect(log.info).toHaveBeenCalledWith(
@@ -89,7 +89,7 @@ describe('getStorybookInfo', () => {
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
           version: '3.2.1',
-          builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+          builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
         })
       );
     });
@@ -99,7 +99,7 @@ describe('getStorybookInfo', () => {
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
           version: '3.2.1',
-          builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+          builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
         })
       );
     });
@@ -108,7 +108,7 @@ describe('getStorybookInfo', () => {
       const ctx = getContext({ env: { CHROMATIC_STORYBOOK_VERSION: '3.2.1' } });
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
-          builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+          builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
         })
       );
     });
@@ -117,7 +117,7 @@ describe('getStorybookInfo', () => {
       const ctx = getContext({ env: { CHROMATIC_STORYBOOK_VERSION: '@storybook/[email protected]' } });
       expect(await getStorybookInfo(ctx)).toEqual(
         expect.objectContaining({
-          builder: { name: '@storybook/html-vite', packageVersion: expect.any(String) },
+          builder: { name: '@storybook/react-webpack5', packageVersion: expect.any(String) },
         })
       );
     });

node-src/lib/turbosnap/findChangedDependencies.ts

@@ -12,7 +12,7 @@ const PACKAGE_JSON = 'package.json';
 export const SUPPORTED_LOCK_FILES = ['yarn.lock', 'pnpm-lock.yaml', 'package-lock.json'];
 
 // Yields a list of dependency names which have changed since the baseline.
-// E.g. ['react', 'react-dom', '@storybook/react', '@storybook/html-vite']
+// E.g. ['react', 'react-dom', '@storybook/react', '@storybook/react-webpack5']
 // TODO: refactor this function
 // eslint-disable-next-line complexity
 export const findChangedDependencies = async (ctx: Context) => {

node-src/lib/turbosnap/getDependencies.test.ts

@@ -92,6 +92,7 @@ describe('getDependencies', () => {
       expect.arrayContaining([
         // @see https://github.com/chromaui/chromatic-cli/blob/e61c2688597a6fda61a7057c866ebfabde955784/package.json#L75-L170
         '@discoveryjs/json-ext',
+        '@types/webpack-env',
         '@actions/core',
         '@actions/github',
         '@babel/cli',