Merge branch 'next' into kasper/export-order

storybookjs · Aug 8, 2024 · af4bbe6 · af4bbe6
2 parents f114790 + e46747e
commit af4bbe6
Show file tree

Hide file tree

Showing 60 changed files with 641 additions and 12,281 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ parameters:
     default: "next"
 
 executors:
-  sb_node_18_classic:
+  sb_node_22_classic:
     parameters:
       class:
         description: The Resource class
@@ -25,7 +25,7 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:18.19.1
+      - image: cimg/node:22.6.0
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -38,7 +38,20 @@ executors:
         default: "small"
     working_directory: /tmp/storybook
     docker:
-      - image: cimg/node:18.19.1-browsers
+      - image: cimg/node:18.20.3-browsers
+        environment:
+          NODE_OPTIONS: --max_old_space_size=6144
+    resource_class: <<parameters.class>>
+  sb_node_22_browsers:
+    parameters:
+      class:
+        description: The Resource class
+        type: enum
+        enum: ["small", "medium", "medium+", "large", "xlarge"]
+        default: "small"
+    working_directory: /tmp/storybook
+    docker:
+      - image: cimg/node:22.6.0-browsers
         environment:
           NODE_OPTIONS: --max_old_space_size=6144
     resource_class: <<parameters.class>>
@@ -74,7 +87,6 @@ orbs:
   browser-tools: circleci/[email protected]
   discord: antonioned/[email protected]
   codecov: codecov/[email protected]
-  bun-orb: cmgriffing/[email protected]
   node: circleci/[email protected]
   nx: nrwl/[email protected]
 
@@ -109,7 +121,7 @@ jobs:
   pretty-docs:
     executor:
       class: medium
-      name: sb_node_18_classic
+      name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -135,12 +147,10 @@ jobs:
   build:
     executor:
       class: xlarge
-      name: sb_node_18_classic
+      name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
-      - bun-orb/setup:
-          version: 1.1.1
       - restore_cache:
           name: Restore Yarn cache
           keys:
@@ -182,7 +192,7 @@ jobs:
   lint:
     executor:
       class: large
-      name: sb_node_18_classic
+      name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -198,12 +208,10 @@ jobs:
   check:
     executor:
       class: xlarge
-      name: sb_node_18_classic
+      name: sb_node_22_classic
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
-      - bun-orb/setup:
-          version: 1.1.1
       - attach_workspace:
           at: .
       - nx/set-shas:
@@ -218,7 +226,7 @@ jobs:
       - report-workflow-on-failure
       - cancel-workflow-on-failure
   script-checks:
-    executor: sb_node_18_browsers
+    executor: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -246,7 +254,7 @@ jobs:
   unit-tests:
     executor:
       class: xlarge
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -268,7 +276,7 @@ jobs:
   coverage:
     executor:
       class: small
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
@@ -279,7 +287,7 @@ jobs:
   chromatic-internal-storybook:
     executor:
       class: medium+
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     environment:
       NODE_OPTIONS: --max_old_space_size=6144
     steps:
@@ -301,7 +309,7 @@ jobs:
         type: integer
     executor:
       class: medium
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
@@ -348,13 +356,11 @@ jobs:
         type: integer
     executor:
       class: large
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: "--depth 1 --verbose"
-      - bun-orb/setup:
-          version: 1.1.1
       - attach_workspace:
           at: .
       - run:
@@ -431,7 +437,7 @@ jobs:
         type: integer
     executor:
       class: medium
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     parallelism: << parameters.parallelism >>
     steps:
       - checkout
@@ -514,7 +520,7 @@ jobs:
   test-empty-init:
     executor:
       class: medium
-      name: sb_node_18_browsers
+      name: sb_node_22_browsers
     parameters:
       packageManager:
         type: string

diff --git a/.github/workflows/canary-release-pr.yml b/.github/workflows/canary-release-pr.yml
@@ -60,10 +60,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/generate-sandboxes.yml b/.github/workflows/generate-sandboxes.yml
@@ -29,10 +29,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: next
-
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
 
       - uses: actions/setup-node@v4
         with:
@@ -86,10 +82,6 @@ jobs:
         with:
           ref: main
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"

diff --git a/.github/workflows/prepare-non-patch-release.yml b/.github/workflows/prepare-non-patch-release.yml
@@ -56,10 +56,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -35,10 +35,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -47,10 +47,6 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/tests-unit.yml b/.github/workflows/tests-unit.yml
@@ -17,9 +17,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: oven-sh/setup-bun@v1
-        with:
-          bun-version: 1.1.1
       - name: Set node version
         uses: actions/setup-node@v4
         with:

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.19.1
+22.6.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,7 +8,6 @@ You will need to have the following installed:
 - git
 - node
 - yarn
-- [bun](https://bun.sh/)
 
 ## Using fnm as a Node version manager
 

diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -62,7 +62,7 @@
   "devDependencies": {
     "@devtools-ds/object-inspector": "^1.1.2",
     "@storybook/icons": "^1.2.5",
-    "@types/node": "^18.0.0",
+    "@types/node": "^22.0.0",
     "formik": "^2.2.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.21",
-    "@types/node": "^18.0.0",
+    "@types/node": "^22.0.0",
     "glob": "^10.0.0",
     "slash": "^5.0.0",
     "typescript": "^5.3.2",

diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@storybook/core-webpack": "workspace:*",
-    "@types/node": "^18.0.0",
+    "@types/node": "^22.0.0",
     "@types/semver": "^7.3.4",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",

diff --git a/code/core/package.json b/code/core/package.json
@@ -265,13 +265,12 @@
     "!src/**/*"
   ],
   "scripts": {
-    "check": "bun ./scripts/check.ts",
-    "prep": "bun ./scripts/prep.ts"
+    "check": "jiti ./scripts/check.ts",
+    "prep": "jiti ./scripts/prep.ts"
   },
   "dependencies": {
     "@storybook/csf": "^0.1.11",
     "@types/express": "^4.17.21",
-    "@types/node": "^18.0.0",
     "browser-assert": "^1.2.1",
     "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0",
     "esbuild-register": "^3.5.0",
@@ -314,8 +313,7 @@
     "@types/fs-extra": "^11.0.1",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash": "^4.14.167",
-    "@types/mock-fs": "^4.13.1",
-    "@types/node": "^18.0.0",
+    "@types/node": "^22.0.0",
     "@types/npmlog": "^7.0.0",
     "@types/picomatch": "^2.3.0",
     "@types/prettier": "^3.0.0",
@@ -375,8 +373,8 @@
     "leven": "^4.0.0",
     "lodash": "^4.17.21",
     "markdown-to-jsx": "^7.4.5",
+    "memfs": "^4.11.1",
     "memoizerific": "^1.11.3",
-    "mock-fs": "^5.2.0",
     "nanoid": "^4.0.2",
     "npmlog": "^7.0.0",
     "open": "^8.4.0",