diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json index 7abe59e3cbaf..b7894dae6ebe 100644 --- a/examples/cra-ts-essentials/package.json +++ b/examples/cra-ts-essentials/package.json @@ -36,7 +36,7 @@ "devDependencies": { "@storybook/addon-essentials": "6.0.0-beta.12", "@storybook/addons": "6.0.0-beta.12", - "@storybook/preset-create-react-app": "^2.1.1", + "@storybook/preset-create-react-app": "^3.0.0", "@storybook/react": "6.0.0-beta.12" }, "storybook": { diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json index 32f3953a43f4..0ae8d7ad669e 100644 --- a/examples/cra-ts-kitchen-sink/package.json +++ b/examples/cra-ts-kitchen-sink/package.json @@ -40,7 +40,7 @@ "@storybook/addon-knobs": "6.0.0-beta.12", "@storybook/addon-links": "6.0.0-beta.12", "@storybook/addons": "6.0.0-beta.12", - "@storybook/preset-create-react-app": "^2.1.1", + "@storybook/preset-create-react-app": "^3.0.0", "@storybook/react": "6.0.0-beta.12", "@types/enzyme": "^3.9.0", "enzyme": "^3.9.0", diff --git a/lib/core/src/server/preview/base-webpack.config.js b/lib/core/src/server/preview/base-webpack.config.js index 409af775a73f..b8c5c75704bc 100644 --- a/lib/core/src/server/preview/base-webpack.config.js +++ b/lib/core/src/server/preview/base-webpack.config.js @@ -4,7 +4,11 @@ import path from 'path'; import { logger } from '@storybook/node-logger'; export async function createDefaultWebpackConfig(storybookBaseConfig, options) { - if (options.presetsList.some(({ name }) => name === '@storybook/preset-create-react-app')) { + if ( + options.presetsList.some( + (preset) => (preset.name || preset) === '@storybook/preset-create-react-app' + ) + ) { return storybookBaseConfig; } diff --git a/yarn.lock b/yarn.lock index 269c54c59bae..e3a88569613b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4047,16 +4047,18 @@ pretty-hrtime "^1.0.3" regenerator-runtime "^0.13.3" -"@storybook/preset-create-react-app@^2.1.1": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-2.1.2.tgz#7fd563768c5a4441ce8550e117cc435722e772fe" - integrity sha512-bynFJDAVDzyfu+NEPXYMNUBRxm6ib4FgPBWComW+f+ULVWDjv8Mmq5qKMI/vPhixXAvffYRt9HB49V0f8kFxiw== +"@storybook/preset-create-react-app@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@storybook/preset-create-react-app/-/preset-create-react-app-3.0.0.tgz#3c75c63f796ffe79293fe7f971a240307ecefb89" + integrity sha512-l0yA+HvmjdmTW4c+/dm0n7/CfVaNQKmwRnVuUVF0UAKXEX51wZ/0oX3zALOSUYW9CctOEnJwPETllbepBUEdOg== dependencies: "@storybook/node-logger" "*" - "@types/babel__core" "^7.1.6" - "@types/webpack" "^4.41.7" + "@types/babel__core" "^7.1.7" + "@types/webpack" "^4.41.13" + babel-plugin-react-docgen "^4.1.0" pnp-webpack-plugin "^1.6.4" - semver "^7.1.3" + react-docgen-typescript-loader "^3.7.2" + semver "^7.3.2" "@storybook/preset-scss@^1.0.2": version "1.0.2" @@ -4394,7 +4396,7 @@ resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.7.tgz#667eb1640e8039436028055737d2b9986ee336e3" integrity sha512-dBtBbrc+qTHy1WdfHYjBwRln4+LWqASWakLHsWHR2NWHIFkv4W3O070IGoGLEBrJBvct3r0L1BUPuvURi7kYUQ== -"@types/babel__core@^7.1.0", "@types/babel__core@^7.1.6", "@types/babel__core@^7.1.7": +"@types/babel__core@^7.1.0", "@types/babel__core@^7.1.7": version "7.1.7" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw== @@ -5113,7 +5115,7 @@ "@types/source-list-map" "*" source-map "^0.6.1" -"@types/webpack@^4.41.12", "@types/webpack@^4.41.7", "@types/webpack@^4.41.8", "@types/webpack@^4.41.9": +"@types/webpack@^4.41.12", "@types/webpack@^4.41.13", "@types/webpack@^4.41.8", "@types/webpack@^4.41.9": version "4.41.13" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.13.tgz#988d114c8913d039b8a0e0502a7fe4f1f84f3d5e" integrity sha512-RYmIHOWSxnTTa765N6jJBVE45pd2SYNblEYshVDduLw6RhocazNmRzE5/ytvBD8IkDMH6DI+bcrqxh8NILimBA==