Merge branch 'next' into pr/mrginglymus/32837

Author: ndelangen

code/core/package.json

@@ -231,7 +231,7 @@
  "@rolldown/pluginutils": "1.0.0-beta.18",
  "@storybook/docs-mdx": "4.0.0-next.1",
  "@tanstack/react-virtual": "^3.3.0",
- "@testing-library/dom": "10.4.0",
+ "@testing-library/dom": "^10.4.1",
  "@testing-library/react": "^14.0.0",
  "@types/cross-spawn": "^6.0.6",
  "@types/detect-port": "^1.3.0",

code/package.json

@@ -96,6 +96,7 @@
  "@types/node": "^22.0.0",
  "@types/react": "^18.0.0",
  "@vitest/expect@npm:3.2.4": "patch:@vitest/expect@npm%3A3.2.4#~/.yarn/patches/@vitest-expect-npm-3.2.4-97c526d5cc.patch",
+ "aria-query@5.3.0": "^5.3.0",
  "esbuild": "^0.25.3",
  "playwright": "1.52.0",
  "playwright-core": "1.52.0",

code/renderers/react/package.json

@@ -61,7 +61,6 @@
  "@types/escodegen": "^0.0.6",
  "@types/estree": "^1.0.6",
  "@types/node": "^22.0.0",
- "@types/semver": "^7.3.4",
  "acorn": "^7.4.1",
  "acorn-jsx": "^5.3.1",
  "acorn-walk": "^7.2.0",
@@ -73,7 +72,6 @@
  "prop-types": "^15.7.2",
  "react-element-to-jsx-string": "npm:@7rulnik/react-element-to-jsx-string@15.0.1",
  "require-from-string": "^2.0.2",
- "semver": "^7.3.7",
  "ts-dedent": "^2.0.0",
  "type-fest": "~2.19"
  },

code/renderers/react/src/entry-preview.tsx

@@ -2,7 +2,6 @@ import * as React from 'react';
 
 import { global } from '@storybook/global';
 
-import semver from 'semver';
 import { configure } from 'storybook/test';
 
 import { getAct, getReactActEnvironment, setReactActEnvironment } from './act-compat';
@@ -19,8 +18,11 @@ export const decorators: Decorator[] = [
  return story();
  }
 
- const major = semver.major(React.version);
- const minor = semver.minor(React.version);
+ const [major, minor] = React.version.split('.').map((part) => parseInt(part, 10));
+
+ if (!Number.isInteger(major) || !Number.isInteger(minor)) {
+ throw new Error('Unable to parse React version');
+ }
  if (major < 18 || (major === 18 && minor < 3)) {
  throw new Error('React Server Components require React >= 18.3');
  }

code/yarn.lock

@@ -6819,7 +6819,6 @@ __metadata:
  "@types/escodegen": "npm:^0.0.6"
  "@types/estree": "npm:^1.0.6"
  "@types/node": "npm:^22.0.0"
- "@types/semver": "npm:^7.3.4"
  acorn: "npm:^7.4.1"
  acorn-jsx: "npm:^5.3.1"
  acorn-walk: "npm:^7.2.0"
@@ -6831,7 +6830,6 @@ __metadata:
  prop-types: "npm:^15.7.2"
  react-element-to-jsx-string: "npm:@7rulnik/react-element-to-jsx-string@15.0.1"
  require-from-string: "npm:^2.0.2"
- semver: "npm:^7.3.7"
  ts-dedent: "npm:^2.0.0"
  type-fest: "npm:~2.19"
  peerDependencies:
@@ -7207,23 +7205,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"@testing-library/dom@npm:10.4.0":
- version: 10.4.0
- resolution: "@testing-library/dom@npm:10.4.0"
- dependencies:
- "@babel/code-frame": "npm:^7.10.4"
- "@babel/runtime": "npm:^7.12.5"
- "@types/aria-query": "npm:^5.0.1"
- aria-query: "npm:5.3.0"
- chalk: "npm:^4.1.0"
- dom-accessibility-api: "npm:^0.5.9"
- lz-string: "npm:^1.5.0"
- pretty-format: "npm:^27.0.2"
- checksum: 10c0/0352487720ecd433400671e773df0b84b8268fb3fe8e527cdfd7c11b1365b398b4e0eddba6e7e0c85e8d615f48257753283fccec41f6b986fd6c85f15eb5f84f
- languageName: node
- linkType: hard
-
-"@testing-library/dom@npm:9.x.x || 10.x.x, @testing-library/dom@npm:^10.4.0":
+"@testing-library/dom@npm:9.x.x || 10.x.x, @testing-library/dom@npm:^10.4.0, @testing-library/dom@npm:^10.4.1":
  version: 10.4.1
  resolution: "@testing-library/dom@npm:10.4.1"
  dependencies:
@@ -9715,16 +9697,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"aria-query@npm:5.3.0":
- version: 5.3.0
- resolution: "aria-query@npm:5.3.0"
- dependencies:
- dequal: "npm:^2.0.3"
- checksum: 10c0/2bff0d4eba5852a9dd578ecf47eaef0e82cc52569b48469b0aac2db5145db0b17b7a58d9e01237706d1e14b7a1b0ac9b78e9c97027ad97679dd8f91b85da1469
- languageName: node
- linkType: hard
-
-"aria-query@npm:^5.0.0, aria-query@npm:^5.3.1, aria-query@npm:^5.3.2":
+"aria-query@npm:^5.0.0, aria-query@npm:^5.3.0, aria-query@npm:^5.3.1, aria-query@npm:^5.3.2":
  version: 5.3.2
  resolution: "aria-query@npm:5.3.2"
  checksum: 10c0/003c7e3e2cff5540bf7a7893775fc614de82b0c5dde8ae823d47b7a28a9d4da1f7ed85f340bdb93d5649caa927755f0e31ecc7ab63edfdfc00c8ef07e505e03e
@@ -12579,7 +12552,7 @@ __metadata:
  languageName: node
  linkType: hard
 
-"dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3":
+"dequal@npm:^2.0.0, dequal@npm:^2.0.2":
  version: 2.0.3
  resolution: "dequal@npm:2.0.3"
  checksum: 10c0/f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888
@@ -24504,7 +24477,7 @@ __metadata:
  "@storybook/global": "npm:^5.0.0"
  "@storybook/icons": "npm:^1.6.0"
  "@tanstack/react-virtual": "npm:^3.3.0"
- "@testing-library/dom": "npm:10.4.0"
+ "@testing-library/dom": "npm:^10.4.1"
  "@testing-library/jest-dom": "npm:^6.6.3"
  "@testing-library/react": "npm:^14.0.0"
  "@testing-library/user-event": "npm:^14.6.1"