Skip to content

Commit 5ee0d84

Browse files
authored
Merge pull request #27 from storybookjs/yann/next-15-support
feat: Add Next.js 15 support
2 parents 0df676e + 30e0711 commit 5ee0d84

File tree

11 files changed

+7322
-3484
lines changed

11 files changed

+7322
-3484
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
hoist-workspace-packages=false

example/.storybook/main.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import type { StorybookConfig } from "@storybook/experimental-nextjs-vite";
33
const config: StorybookConfig = {
44
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
55
addons: [
6-
"@storybook/addon-onboarding",
7-
"@storybook/addon-links",
86
"@storybook/addon-essentials",
97
"@chromatic-com/storybook",
108
"@storybook/experimental-addon-test",

example/package.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,28 @@
1515
"inspect": "serve .storybook/.vite-inspect"
1616
},
1717
"dependencies": {
18-
"next": "14.2.5",
19-
"react": "^18",
20-
"react-dom": "^18",
18+
"next": "^15.0.3",
19+
"react": "19.0.0-rc-66855b96-20241106",
20+
"react-dom": "19.0.0-rc-66855b96-20241106",
2121
"styled-jsx": "^5.1.6"
2222
},
2323
"devDependencies": {
2424
"@chromatic-com/storybook": "^3.2.2",
25-
"@storybook/addon-actions": "^8.4.1",
26-
"@storybook/addon-essentials": "^8.4.1",
27-
"@storybook/addon-links": "^8.4.1",
28-
"@storybook/addon-onboarding": "^8.4.1",
29-
"@storybook/addon-toolbars": "^8.4.1",
30-
"@storybook/blocks": "^8.4.1",
31-
"@storybook/experimental-addon-test": "^8.4.1",
32-
"@storybook/experimental-nextjs-vite": "^8.4.1",
33-
"@storybook/react": "^8.4.1",
34-
"@storybook/test": "^8.4.1",
25+
"@storybook/addon-actions": "0.0.0-pr-29640-sha-3521df0d",
26+
"@storybook/addon-essentials": "0.0.0-pr-29640-sha-3521df0d",
27+
"@storybook/addon-toolbars": "0.0.0-pr-29640-sha-3521df0d",
28+
"@storybook/blocks": "0.0.0-pr-29640-sha-3521df0d",
29+
"@storybook/experimental-addon-test": "0.0.0-pr-29640-sha-3521df0d",
30+
"@storybook/experimental-nextjs-vite": "0.0.0-pr-29640-sha-3521df0d",
31+
"@storybook/react": "0.0.0-pr-29640-sha-3521df0d",
32+
"@storybook/test": "0.0.0-pr-29640-sha-3521df0d",
33+
"@storybook/nextjs": "0.0.0-pr-29640-sha-3521df0d",
3534
"@testing-library/dom": "^10.3.2",
3635
"@testing-library/jest-dom": "^6.4.6",
3736
"@testing-library/react": "^16.0.0",
3837
"@types/node": "^20",
39-
"@types/react": "^18",
40-
"@types/react-dom": "^18",
38+
"@types/react": "^18.3.12",
39+
"@types/react-dom": "^18.3.1",
4140
"@vitest/browser": "^2.1.4",
4241
"autoprefixer": "^10.4.19",
4342
"bootstrap": "^5.3.3",
@@ -47,7 +46,7 @@
4746
"playwright": "^1.45.3",
4847
"postcss": "^8.4.38",
4948
"serve": "^14.2.3",
50-
"storybook": "^8.4.1",
49+
"storybook": "0.0.0-pr-29640-sha-3521df0d",
5150
"tailwindcss": "^3.4.4",
5251
"typescript": "^5",
5352
"vite-plugin-inspect": "^0.8.5",

package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"./browser/mocks/legacy-image": "./dist/plugins/next-image/alias/next-legacy-image.js",
4040
"./browser/mocks/image-default-loader": "./dist/plugins/next-image/alias/image-default-loader.js",
4141
"./browser/mocks/image-context": "./dist/plugins/next-image/alias/image-context.js",
42+
"./browser/mocks/draft-mode.compat": "./dist/plugins/next-mocks/compatibility/draft-mode.compat.js",
4243
"./node/mocks/cache": "./dist/plugins/next-mocks/alias/cache/index.cjs",
4344
"./node/mocks/navigation": "./dist/plugins/next-mocks/alias/navigation/index.cjs",
4445
"./node/mocks/headers": "./dist/plugins/next-mocks/alias/headers/index.cjs",
@@ -48,7 +49,8 @@
4849
"./node/mocks/image": "./dist/plugins/next-image/alias/next-image.cjs",
4950
"./node/mocks/legacy-image": "./dist/plugins/next-image/alias/next-legacy-image.cjs",
5051
"./node/mocks/image-default-loader": "./dist/plugins/next-image/alias/image-default-loader.cjs",
51-
"./node/mocks/image-context": "./dist/plugins/next-image/alias/image-context.cjs"
52+
"./node/mocks/image-context": "./dist/plugins/next-image/alias/image-context.cjs",
53+
"./node/mocks/draft-mode.compat": "./dist/plugins/next-mocks/compatibility/draft-mode.compat.cjs"
5254
},
5355
"scripts": {
5456
"prepublishOnly": "pnpm build",
@@ -60,7 +62,7 @@
6062
},
6163
"peerDependencies": {
6264
"@storybook/test": "^8.3.0",
63-
"next": "^14.1.0",
65+
"next": "^14.1.0 || ^15.0.0",
6466
"storybook": "^8.3.0",
6567
"vite": "^5.0.0"
6668
},
@@ -69,11 +71,13 @@
6971
"@storybook/test": "^8.3.0",
7072
"@types/node": "^18",
7173
"@types/react": "^18",
74+
"@types/semver": "^7.5.8",
7275
"auto": "^11.2.0",
7376
"lefthook": "^1.6.16",
74-
"next": "^14.2.5",
75-
"react": "^18",
77+
"next": "^15.0.3",
78+
"react": "19.0.0-rc-66855b96-20241106",
7679
"rollup": "^4.18.0",
80+
"semver": "^7.6.3",
7781
"sharp": "^0.33.4",
7882
"storybook": "^8.3.0",
7983
"tsup": "^8.1.0",
@@ -83,7 +87,7 @@
8387
},
8488
"packageManager": "[email protected]",
8589
"dependencies": {
86-
"@next/env": "^14.2.5",
90+
"@next/env": "^15.0.3",
8791
"image-size": "^1.1.1",
8892
"magic-string": "^0.30.11",
8993
"module-alias": "^2.2.3",

0 commit comments

Comments
 (0)