Prepare for SB10

.github/workflows/tests-extended.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x, 22.x]
+        node-version: [20.16.0, 22.x]
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [20.x]
+        node-version: [20.16.0]
     steps:
       - uses: actions/checkout@v4
 

.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

.nvmrc

@@ -1 +1 @@
-v18
+v20.16.0

package.json

@@ -58,6 +58,8 @@
     "@jest/types": "^29.6.3",
     "@swc/core": "^1.5.22",
     "@swc/jest": "^0.2.23",
+    "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0",
+    "esbuild-register": "^3.6.0",
     "expect-playwright": "^0.8.0",
     "jest": "^29.6.4",
     "jest-circus": "^29.6.4",
@@ -81,7 +83,7 @@
     "@storybook/addon-docs": "next",
     "@storybook/react-vite": "next",
     "@types/jest": "^29.0.0",
-    "@types/node": "^16.4.1",
+    "@types/node": "^20.0.0",
     "@types/node-fetch": "^2.6.11",
     "@vitejs/plugin-react": "^4.0.3",
     "auto": "^11.1.6",

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/getStorybookMain.ts

@@ -1,7 +1,7 @@
 import { join, resolve } from 'path';
-import { serverRequire } from 'storybook/internal/common';
 import type { StorybookConfig } from 'storybook/internal/types';
 import dedent from 'ts-dedent';
+import { serverRequire } from './serverRequire';
 
 export const storybookMainConfig = new Map<string, StorybookConfig>();
 

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);

src/util/getTestRunnerConfig.ts

@@ -1,6 +1,6 @@
 import { join, resolve } from 'path';
-import { serverRequire } from 'storybook/internal/common';
 import { TestRunnerConfig } from '../playwright/hooks';
+import { serverRequire } from './serverRequire';
 
 let testRunnerConfig: TestRunnerConfig;
 let loaded = false;

src/util/serverRequire.ts

@@ -0,0 +1,19 @@
+import { serverResolve } from 'storybook/internal/common';
+const { register } = require('esbuild-register/dist/node');
+
+register();
+
+export function serverRequire(path: string) {
+  const located = serverResolve(path);
+  if (!located) {
+    throw new Error(`Could not find ${path}`);
+  }
+
+  const result = require(located);
+
+  if (result.default) {
+    return result.default;
+  }
+
+  return result;
+}

tsup.config.ts

@@ -2,7 +2,6 @@ import { defineConfig } from 'tsup';
 
 export default defineConfig([
   {
-    clean: true,
     entry: ['./src/index.ts', './src/test-storybook.ts'],
     format: ['cjs', 'esm'],
     splitting: false,

yarn.lock

@@ -2946,7 +2946,7 @@ __metadata:
     "@swc/core": "npm:^1.5.22"
     "@swc/jest": "npm:^0.2.23"
     "@types/jest": "npm:^29.0.0"
-    "@types/node": "npm:^16.4.1"
+    "@types/node": "npm:^20.0.0"
     "@types/node-fetch": "npm:^2.6.11"
     "@vitejs/plugin-react": "npm:^4.0.3"
     auto: "npm:^11.1.6"
@@ -2956,6 +2956,8 @@ __metadata:
     can-bind-to-host: "npm:^1.1.1"
     commander: "npm:^9.0.0"
     concurrently: "npm:^7.0.0"
+    esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0"
+    esbuild-register: "npm:^3.6.0"
     expect-playwright: "npm:^0.8.0"
     glob: "npm:^10.2.2"
     husky: "npm:^8.0.0"
@@ -3250,20 +3252,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:1.0.7":
+"@types/estree@npm:1.0.7, @types/estree@npm:^1.0.0":
   version: 1.0.7
   resolution: "@types/estree@npm:1.0.7"
   checksum: 10/419c845ece767ad4b21171e6e5b63dabb2eb46b9c0d97361edcd9cabbf6a95fcadb91d89b5fa098d1336fa0b8fceaea82fca97a2ef3971f5c86e53031e157b21
   languageName: node
   linkType: hard
 
-"@types/estree@npm:^1.0.0":
-  version: 1.0.5
-  resolution: "@types/estree@npm:1.0.5"
-  checksum: 10/7de6d928dd4010b0e20c6919e1a6c27b61f8d4567befa89252055fad503d587ecb9a1e3eab1b1901f923964d7019796db810b7fd6430acb26c32866d126fd408
-  languageName: node
-  linkType: hard
-
 "@types/graceful-fs@npm:^4.1.3":
   version: 4.1.9
   resolution: "@types/graceful-fs@npm:4.1.9"
@@ -3332,19 +3327,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*":
-  version: 20.9.0
-  resolution: "@types/node@npm:20.9.0"
+"@types/node@npm:*, @types/node@npm:^20.0.0":
+  version: 20.19.1
+  resolution: "@types/node@npm:20.19.1"
   dependencies:
-    undici-types: "npm:~5.26.4"
-  checksum: 10/a934f7645ed117a27857147403b0c657ffbca578c8f280e4c21d27dfb43e58dc4f24c4319d4335b8a4fa08e28fb2dc905a5bd5e4bc8878047164c56c1b162139
-  languageName: node
-  linkType: hard
-
-"@types/node@npm:^16.4.1":
-  version: 16.18.61
-  resolution: "@types/node@npm:16.18.61"
-  checksum: 10/ea2fdb3876f77ef8be0bdeee7b0c301a6bf27ab743f55a10486725d8ddd51b84edea7c219e9d09fd24650e8b14c040207a48169bd396915e7a989bac1a7c0bee
+    undici-types: "npm:~6.21.0"
+  checksum: 10/2369a96a832a6e8111d2b996c56fb1b78b27fad0879de3e344ae2835697464e001d6fe813a11902348fc7dc63b9510000f3d2cd4bedadf2d3fce7b7bb7903444
   languageName: node
   linkType: hard
 
@@ -4924,14 +4912,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild-register@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "esbuild-register@npm:3.5.0"
+"esbuild-register@npm:^3.5.0, esbuild-register@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "esbuild-register@npm:3.6.0"
   dependencies:
     debug: "npm:^4.3.4"
   peerDependencies:
     esbuild: ">=0.12 <1"
-  checksum: 10/af6874ce9b5fcdb0974c9d9e9f16530a5b9bd80c699b2ba9d7ace33439c1af1be6948535c775d9a6439e2bf23fb31cfd54ac882cfa38308a3f182039f4b98a01
+  checksum: 10/4ae1a016e3dad5b53c3d68cf07e31d8c1cec1a0b584038ece726097ac80bd33ab48fb224c766c9b341c04793837e652461eaca9327a116e7564f553b61ccca71
   languageName: node
   linkType: hard
 
@@ -7110,14 +7098,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0":
-  version: 3.1.2
-  resolution: "loupe@npm:3.1.2"
-  checksum: 10/8f5734e53fb64cd914aa7d986e01b6d4c2e3c6c56dcbd5428d71c2703f0ab46b5ab9f9eeaaf2b485e8a1c43f865bdd16ec08ae1a661c8f55acdbd9f4d59c607a
-  languageName: node
-  linkType: hard
-
-"loupe@npm:^3.1.3":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.3":
   version: 3.1.3
   resolution: "loupe@npm:3.1.3"
   checksum: 10/9e98c34daf0eba48ccc603595e51f2ae002110982d84879cf78c51de2c632f0c571dfe82ce4210af60c32203d06b443465c269bda925076fe6d9b612cc65c321
@@ -9737,10 +9718,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~5.26.4":
-  version: 5.26.5
-  resolution: "undici-types@npm:5.26.5"
-  checksum: 10/0097779d94bc0fd26f0418b3a05472410408877279141ded2bd449167be1aed7ea5b76f756562cb3586a07f251b90799bab22d9019ceba49c037c76445f7cddd
+"undici-types@npm:~6.21.0":
+  version: 6.21.0
+  resolution: "undici-types@npm:6.21.0"
+  checksum: 10/ec8f41aa4359d50f9b59fa61fe3efce3477cc681908c8f84354d8567bb3701fafdddf36ef6bff307024d3feb42c837cf6f670314ba37fc8145e219560e473d14
   languageName: node
   linkType: hard