Refactor typecheck workflow and update test mocks to use local serverRequire module

Author: ndelangen

.github/workflows/typecheck.yml

@@ -3,19 +3,18 @@ name: Typecheck
 on: [push, pull_request]
 
 jobs:
-    typecheck:
-        runs-on: ubuntu-latest
-        steps:
-        - uses: actions/checkout@v2
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
 
-        - name: Use Node.js 20.x
-          uses: actions/setup-node@v1
-          with:
-            node-version: '20.x'
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: .nvmrc
 
-        - name: Install dependencies
-          uses: bahmutov/npm-install@v1
-
-        - name: Type check
-          run: yarn tsc
+      - name: Install dependencies
+        uses: bahmutov/npm-install@v1
 
+      - name: Type check
+        run: yarn tsc

src/util/getStorybookMain.test.ts

@@ -1,7 +1,7 @@
 import { getStorybookMain, resetStorybookMainCache, storybookMainConfig } from './getStorybookMain';
-import * as coreCommon from 'storybook/internal/common';
+import * as coreCommon from './serverRequire';
 
-jest.mock('storybook/internal/common');
+jest.mock('./serverRequire');
 
 describe('getStorybookMain', () => {
   beforeEach(() => {

src/util/getTestRunnerConfig.test.ts

@@ -26,7 +26,7 @@ const testRunnerConfig: TestRunnerConfig = {
   },
 };
 
-jest.mock('storybook/internal/common', () => ({
+jest.mock('./serverRequire', () => ({
   serverRequire: jest.fn(),
 }));
 
@@ -37,23 +37,19 @@ describe('getTestRunnerConfig', () => {
 
   it('should load the test runner config', () => {
     const configDir = '.storybook';
-    (require('storybook/internal/common').serverRequire as jest.Mock).mockReturnValueOnce(
-      testRunnerConfig
-    );
+    (require('./serverRequire').serverRequire as jest.Mock).mockReturnValueOnce(testRunnerConfig);
 
     const result = getTestRunnerConfig(configDir);
 
     expect(result).toEqual(testRunnerConfig);
-    expect(require('storybook/internal/common').serverRequire).toHaveBeenCalledWith(
+    expect(require('./serverRequire').serverRequire).toHaveBeenCalledWith(
       join(resolve('.storybook', 'test-runner'))
     );
   });
 
   it('should cache the test runner config', () => {
     const configDir = '.storybook';
-    (require('storybook/internal/common').serverRequire as jest.Mock).mockReturnValueOnce(
-      testRunnerConfig
-    );
+    (require('./serverRequire').serverRequire as jest.Mock).mockReturnValueOnce(testRunnerConfig);
 
     const result1 = getTestRunnerConfig(configDir);
     const result2 = getTestRunnerConfig(configDir);