Commit2fe97e5

authored

Merge pull request#32802 from mrginglymus/no-semver-react

React: Simplify version detection

2 parents950fdaa +ca35a93 commit2fe97e5Copy full SHA for 2fe97e5

File tree

-7

lines changed

-7

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@`
`61`	`61`	`"@types/escodegen":"^0.0.6",`
`62`	`62`	`"@types/estree":"^1.0.6",`
`63`	`63`	`"@types/node":"^22.0.0",`
`64`		`-"@types/semver":"^7.3.4",`
`65`	`64`	`"acorn":"^7.4.1",`
`66`	`65`	`"acorn-jsx":"^5.3.1",`
`67`	`66`	`"acorn-walk":"^7.2.0",`
`@@ -73,7 +72,6 @@`
`73`	`72`	`"prop-types":"^15.7.2",`
`74`	`73`	`"react-element-to-jsx-string":"npm:@7rulnik/react-element-to-jsx-string@15.0.1",`
`75`	`74`	`"require-from-string":"^2.0.2",`
`76`		`-"semver":"^7.3.7",`
`77`	`75`	`"ts-dedent":"^2.0.0",`
`78`	`76`	`"type-fest":"~2.19"`
`79`	`77`	`},`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import * as React from 'react';`
`2`	`2`
`3`	`3`	`import{global}from'@storybook/global';`
`4`	`4`
`5`		`-importsemverfrom'semver';`
`6`	`5`	`import{configure}from'storybook/test';`
`7`	`6`
`8`	`7`	`import{getAct,getReactActEnvironment,setReactActEnvironment}from'./act-compat';`
`@@ -19,8 +18,11 @@ export const decorators: Decorator[] = [`
`19`	`18`	`returnstory();`
`20`	`19`	`}`
`21`	`20`
`22`		`-constmajor=semver.major(React.version);`
`23`		`-constminor=semver.minor(React.version);`
	`21`	`+const[major,minor]=React.version.split('.').map((part)=>parseInt(part,10));`
	`22`	`+`
	`23`	`+if(!Number.isInteger(major)\|\|!Number.isInteger(minor)){`
	`24`	`+thrownewError('Unable to parse React version');`
	`25`	`+}`
`24`	`26`	`if(major<18\|\|(major===18&&minor<3)){`
`25`	`27`	`thrownewError('React Server Components require React >= 18.3');`
`26`	`28`	`}`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6819,7 +6819,6 @@ __metadata:`
`6819`	`6819`	`"@types/escodegen": "npm:^0.0.6"`
`6820`	`6820`	`"@types/estree": "npm:^1.0.6"`
`6821`	`6821`	`"@types/node": "npm:^22.0.0"`
`6822`		`- "@types/semver": "npm:^7.3.4"`
`6823`	`6822`	`acorn: "npm:^7.4.1"`
`6824`	`6823`	`acorn-jsx: "npm:^5.3.1"`
`6825`	`6824`	`acorn-walk: "npm:^7.2.0"`
`@@ -6831,7 +6830,6 @@ __metadata:`
`6831`	`6830`	`prop-types: "npm:^15.7.2"`
`6832`	`6831`	`react-element-to-jsx-string: "npm:@7rulnik/react-element-to-jsx-string@15.0.1"`
`6833`	`6832`	`require-from-string: "npm:^2.0.2"`
`6834`		`- semver: "npm:^7.3.7"`
`6835`	`6833`	`ts-dedent: "npm:^2.0.0"`
`6836`	`6834`	`type-fest: "npm:~2.19"`
`6837`	`6835`	`peerDependencies:`

Comments

(0)