Merge pull request #28815 from storybookjs/version-non-patch-from-8.3…

….0-alpha.4
storybookjs · Aug 13, 2024 · c51eb57 · c51eb57
2 parents 70079f4 + c65379c
commit c51eb57
Show file tree

Hide file tree

Showing 1,880 changed files with 20,897 additions and 6,492 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"
@@ -238,15 +246,15 @@ jobs:
           name: Run tests
           command: |
             cd scripts
-            yarn test --coverage
+            yarn test --coverage --coverage.all=false
       - store_test_results:
           path: scripts/junit.xml
       - report-workflow-on-failure
       - cancel-workflow-on-failure
   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"
@@ -256,7 +264,7 @@ jobs:
           name: Test
           command: |
             cd code
-            yarn test --coverage
+            yarn test --coverage --coverage.all=false
       - store_test_results:
           path: code/junit.xml
       - persist_to_workspace:
@@ -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,18 +356,16 @@ 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:
           name: Starting Event Collector
-          command: node --loader esbuild-register/loader -r esbuild-register ./event-log-collector.ts
+          command: yarn jiti ./event-log-collector.ts
           working_directory: scripts
           background: true
       - run:
@@ -373,7 +379,7 @@ jobs:
             TEMPLATE=$(yarn get-template --cadence << pipeline.parameters.workflow >> --task build)
             if [[ $TEMPLATE != bench/* ]]
             then
-              node --loader esbuild-register/loader -r esbuild-register ./event-log-checker.ts build $TEMPLATE
+              yarn jiti ./event-log-checker.ts build $TEMPLATE
             fi
           working_directory: scripts
       - report-workflow-on-failure:
@@ -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
@@ -602,6 +608,23 @@ jobs:
                   IN_STORYBOOK_SANDBOX: true
                   STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
                   STORYBOOK_DISABLE_TELEMETRY: true
+      - when:
+          condition:
+            equal: ["react-vite-ts", << parameters.template >>]
+          steps:
+            - run:
+                name: Storybook init from empty directory (--skip-install)
+                command: |
+                  cd code
+                  yarn local-registry --open &
+                  cd ../../
+                  mkdir empty-<< parameters.template >>-no-install
+                  cd empty-<< parameters.template >>-no-install
+                  npx storybook init --yes --skip-install
+                environment:
+                  IN_STORYBOOK_SANDBOX: true
+                  STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
+                  STORYBOOK_DISABLE_TELEMETRY: true
       - report-workflow-on-failure
   test-portable-stories:
     parameters:

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,4 +2,6 @@
 c0896915fb7fb9a8dd416b9aebca17abd909d1c1
 a41c227037e7e7249b8b376f838f4f8bcc3e3e59
 13c46e6c0b7f3dd8cf4ba42d1cfd6714f4777d54
-0a4522a3f84773f39daec4820c49b8a92e9f9d11
+0a4522a3f84773f39daec4820c49b8a92e9f9d11
+e12039c0593ba021ce27cb7245b6067677f27625
+513bb66bb9729ece57581b6eb50e5b338c47c0b9
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/.vscode/settings.json b/.vscode/settings.json
@@ -24,14 +24,7 @@
   "eslint.options": {
     "cache": true,
     "cacheLocation": ".cache/eslint",
-    "extensions": [
-      ".js",
-      ".jsx",
-      ".mjs",
-      ".json",
-      ".ts",
-      ".tsx"
-    ]
+    "extensions": [".js", ".jsx", ".mjs", ".json", ".ts", ".tsx"]
   },
   "eslint.useESLintClass": true,
   "eslint.validate": [
@@ -42,10 +35,7 @@
     "typescript",
     "typescriptreact"
   ],
-  "eslint.workingDirectories": [
-    "./code",
-    "./scripts"
-  ],
+  "eslint.workingDirectories": ["./code", "./scripts"],
   "files.associations": {
     "*.js": "javascriptreact"
   },
@@ -59,5 +49,6 @@
   "typescript.preferences.preferTypeOnlyAutoImports": true,
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferGoToSourceDefinition": true,
-  "typescript.tsdk": "./code/node_modules/typescript/lib"
-}
+  "typescript.tsdk": "./code/node_modules/typescript/lib",
+  "vitest.workspaceConfig": "./code/vitest.workspace.ts"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 8.2.8
+
+- CLI: Parse more Yarn Berry errors - [#28816](https://github.com/storybookjs/storybook/pull/28816), thanks @yannbf!
+- Fix: Invariant failed: Expected package.json#version to be defined in the "undefined" package - [#28752](https://github.com/storybookjs/storybook/pull/28752), thanks @abcdmku!
+
 ## 8.2.7
 
 - CPC: Fix type usage in renderers - [#28745](https://github.com/storybookjs/storybook/pull/28745), thanks @ndelangen!

diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,17 @@
+## 8.3.0-alpha.5
+
+- Builder-Vite: Add null character prefix to virtual file IDs - [#28863](https://github.com/storybookjs/storybook/pull/28863), thanks @valentinpalkovic!
+- CLI: Fix `init --skip-install` - [#28853](https://github.com/storybookjs/storybook/pull/28853), thanks @ndelangen!
+- CLI: Parse more Yarn Berry errors - [#28816](https://github.com/storybookjs/storybook/pull/28816), thanks @yannbf!
+- Core: Make sure CJS build always has lowest prio - [#28829](https://github.com/storybookjs/storybook/pull/28829), thanks @kasperpeulen!
+- Maintenance: Add `node:`-prefix to node core-modules - [#28860](https://github.com/storybookjs/storybook/pull/28860), thanks @ndelangen!
+- Next.js: Add @storybook/nextjs-vite package - [#28800](https://github.com/storybookjs/storybook/pull/28800), thanks @valentinpalkovic!
+- React: Bundle in `lodash` - [#28609](https://github.com/storybookjs/storybook/pull/28609), thanks @ndelangen!
+- Telemetry: Add globals stats - [#28822](https://github.com/storybookjs/storybook/pull/28822), thanks @shilman!
+- Telemetry: Add portable stories - [#26764](https://github.com/storybookjs/storybook/pull/26764), thanks @shilman!
+- Telemetry: Disable save-from-controls logs for example stories - [#28870](https://github.com/storybookjs/storybook/pull/28870), thanks @shilman!
+- Test: Upgrade Vitest to v2 - [#28788](https://github.com/storybookjs/storybook/pull/28788), thanks @yannbf!
+
 ## 8.3.0-alpha.4
 
 - CSF: Allow overridding globals at the story level - [#26654](https://github.com/storybookjs/storybook/pull/26654), thanks @tmeasday!

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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@