Skip to content

Commit d1dd80f

Browse files
committed
fix(storybook): Apply workaround in #12003 also for Webpack Storybook
1 parent 0cc8121 commit d1dd80f

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

packages/cli-packages/storybook-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@redwoodjs/telemetry": "7.7.4",
2626
"chalk": "4.1.2",
2727
"execa": "5.1.1",
28-
"semver": "7.6.3",
28+
"semver": "7.6.2",
2929
"storybook": "7.6.17",
3030
"storybook-framework-redwoodjs-vite": "7.7.4",
3131
"terminal-link": "2.1.1",

packages/cli-packages/storybook/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929
"@storybook/react-webpack5": "7.6.17",
3030
"chalk": "4.1.2",
3131
"execa": "5.1.1",
32+
"semver": "7.6.2",
3233
"storybook": "7.6.17",
3334
"terminal-link": "2.1.1",
3435
"yargs": "17.7.2"
3536
},
3637
"devDependencies": {
3738
"@redwoodjs/framework-tools": "7.7.4",
39+
"@types/semver": "^7",
3840
"@types/yargs": "17.0.32",
3941
"tsx": "4.15.2",
4042
"typescript": "5.4.5"

packages/cli-packages/storybook/src/commands/storybookHandler.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import fs from 'node:fs'
22
import path from 'node:path'
3+
import process from 'node:process'
34

45
import type { ExecaError } from 'execa'
56
import execa from 'execa'
7+
import semver from 'semver'
68

79
import { BundlerEnum, getConfig, getPaths } from '@redwoodjs/project-config'
810
// Allow import of untyped package
@@ -26,8 +28,8 @@ export async function handler({
2628
if (getConfig().web.bundler === BundlerEnum.VITE) {
2729
console.log(
2830
c.bold(
29-
`\nIt looks like you're using vite, please try:\n\n yarn rw storybook-vite\n\nThis will run storybook using vite which should be a much nicer experience for you.\nYou can find out more at: https://community.redwoodjs.com/t/7212\n\n`,
30-
),
31+
`\nIt looks like you're using vite, please try:\n\n yarn rw storybook-vite\n\nThis will run storybook using vite which should be a much nicer experience for you.\nYou can find out more at: https://community.redwoodjs.com/t/7212\n\n`
32+
)
3133
)
3234
}
3335

@@ -105,8 +107,18 @@ export async function handler({
105107
.join(' ')}`
106108
}
107109

110+
const env: Record<string, string> = {}
111+
112+
if (
113+
semver.parse(process.version) !== null &&
114+
semver.lt(process.version, '22.0.0') &&
115+
semver.gte(process.version, '20.19.0')
116+
) {
117+
env.NODE_OPTIONS = '--no-experimental-require-module'
118+
}
119+
108120
try {
109-
await execa.command(command, execaOptions)
121+
await execa.command(command, { ...execaOptions, env })
110122
} catch (e) {
111123
if ((e as ExecaError).signal !== 'SIGINT') {
112124
console.log(c.error((e as Error).message))

yarn.lock

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8046,7 +8046,7 @@ __metadata:
80468046
"@types/yargs": "npm:17.0.32"
80478047
chalk: "npm:4.1.2"
80488048
execa: "npm:5.1.1"
8049-
semver: "npm:7.6.3"
8049+
semver: "npm:7.6.2"
80508050
storybook: "npm:7.6.17"
80518051
storybook-framework-redwoodjs-vite: "npm:7.7.4"
80528052
terminal-link: "npm:2.1.1"
@@ -8068,9 +8068,11 @@ __metadata:
80688068
"@storybook/addon-docs": "npm:7.6.17"
80698069
"@storybook/addon-essentials": "npm:7.6.17"
80708070
"@storybook/react-webpack5": "npm:7.6.17"
8071+
"@types/semver": "npm:^7"
80718072
"@types/yargs": "npm:17.0.32"
80728073
chalk: "npm:4.1.2"
80738074
execa: "npm:5.1.1"
8075+
semver: "npm:7.6.2"
80748076
storybook: "npm:7.6.17"
80758077
terminal-link: "npm:2.1.1"
80768078
tsx: "npm:4.15.2"
@@ -11428,20 +11430,13 @@ __metadata:
1142811430
languageName: node
1142911431
linkType: hard
1143011432

11431-
"@types/semver@npm:^7":
11433+
"@types/semver@npm:^7, @types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4":
1143211434
version: 7.7.0
1143311435
resolution: "@types/semver@npm:7.7.0"
1143411436
checksum: 10c0/6b5f65f647474338abbd6ee91a6bbab434662ddb8fe39464edcbcfc96484d388baad9eb506dff217b6fc1727a88894930eb1f308617161ac0f376fe06be4e1ee
1143511437
languageName: node
1143611438
linkType: hard
1143711439

11438-
"@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4":
11439-
version: 7.5.8
11440-
resolution: "@types/semver@npm:7.5.8"
11441-
checksum: 10c0/8663ff927234d1c5fcc04b33062cb2b9fcfbe0f5f351ed26c4d1e1581657deebd506b41ff7fdf89e787e3d33ce05854bc01686379b89e9c49b564c4cfa988efa
11442-
languageName: node
11443-
linkType: hard
11444-
1144511440
"@types/send@npm:*":
1144611441
version: 0.17.1
1144711442
resolution: "@types/send@npm:0.17.1"
@@ -30076,15 +30071,6 @@ __metadata:
3007630071
languageName: node
3007730072
linkType: hard
3007830073

30079-
"semver@npm:7.6.3":
30080-
version: 7.6.3
30081-
resolution: "semver@npm:7.6.3"
30082-
bin:
30083-
semver: bin/semver.js
30084-
checksum: 10c0/88f33e148b210c153873cb08cfe1e281d518aaa9a666d4d148add6560db5cd3c582f3a08ccb91f38d5f379ead256da9931234ed122057f40bb5766e65e58adaf
30085-
languageName: node
30086-
linkType: hard
30087-
3008830074
"semver@npm:^6.0.0, semver@npm:^6.2.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
3008930075
version: 6.3.1
3009030076
resolution: "semver@npm:6.3.1"

0 commit comments

Comments
 (0)