diff --git a/packages/addon-options/.storybook/addons.js b/addons/actions/.storybook/addons.js similarity index 51% rename from packages/addon-options/.storybook/addons.js rename to addons/actions/.storybook/addons.js index 552bb5995b63..265874180027 100644 --- a/packages/addon-options/.storybook/addons.js +++ b/addons/actions/.storybook/addons.js @@ -1,6 +1,6 @@ // Uncomment to register defaults -// import '@storybook/storybook/addons'; +// import '@storybook/addons'; // Use the line below to register this addon -// import '@storybook/storybook-addon-hello/register'; +// import '@storybook/addon-actions/register'; import '../register'; diff --git a/packages/addon-actions/.storybook/config.js b/addons/actions/.storybook/config.js similarity index 100% rename from packages/addon-actions/.storybook/config.js rename to addons/actions/.storybook/config.js diff --git a/packages/addon-actions/.storybook/stories.js b/addons/actions/.storybook/stories.js similarity index 100% rename from packages/addon-actions/.storybook/stories.js rename to addons/actions/.storybook/stories.js diff --git a/packages/addon-actions/CHANGELOG.md b/addons/actions/CHANGELOG.md similarity index 100% rename from packages/addon-actions/CHANGELOG.md rename to addons/actions/CHANGELOG.md diff --git a/packages/addon-actions/README.md b/addons/actions/README.md similarity index 92% rename from packages/addon-actions/README.md rename to addons/actions/README.md index 80729daa33f4..cc245f726130 100644 --- a/packages/addon-actions/README.md +++ b/addons/actions/README.md @@ -14,7 +14,7 @@ Import the `action` function and use it to create actions handlers. When creatin ```js import { storiesOf, action } from '@storybook/storybook' -// or import { action } from '@storybook/storybook-addon-actions' +// or import { action } from '@storybook/addon-actions' storiesOf('Button', module) .add('default view', () => ( @@ -31,7 +31,7 @@ If you wish to process action data before sending them over to the logger, you c `decorateAction` takes an array of decorator functions. Each decorator function is passed an array of arguments, and should return a new arguments array to use. `decorateAction` returns a function that can be used like `action` but will log the modified arguments instead of the original arguments. ```js -import { action, decorateAction } from '@storybook/storybook-addon-actions' +import { action, decorateAction } from '@storybook/addon-actions' const firstArgAction = decorateAction([ args => args.slice(0, 1) diff --git a/packages/addon-actions/docs/screenshot.png b/addons/actions/docs/screenshot.png similarity index 100% rename from packages/addon-actions/docs/screenshot.png rename to addons/actions/docs/screenshot.png diff --git a/packages/addon-actions/package.json b/addons/actions/package.json similarity index 86% rename from packages/addon-actions/package.json rename to addons/actions/package.json index 2f1db6dc9a31..554ec9268ac6 100644 --- a/packages/addon-actions/package.json +++ b/addons/actions/package.json @@ -22,8 +22,8 @@ "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-actions", "devDependencies": { "@storybook/storybook": "*", - "@storybook/storybook-addons": "*", - "@storybook/storybook-ui": "*", + "@storybook/addons": "*", + "@storybook/ui": "*", "react": "^15.5.4", "react-dom": "^15.5.4", "react-test-renderer": "^15.5.4", @@ -36,7 +36,7 @@ "react-inspector": "^1.1.0" }, "peerDependencies": { - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "react": "*", "react-dom": "*" } diff --git a/packages/addon-actions/register.js b/addons/actions/register.js similarity index 100% rename from packages/addon-actions/register.js rename to addons/actions/register.js diff --git a/packages/addon-actions/src/components/ActionLogger/index.js b/addons/actions/src/components/ActionLogger/index.js similarity index 100% rename from packages/addon-actions/src/components/ActionLogger/index.js rename to addons/actions/src/components/ActionLogger/index.js diff --git a/packages/addon-actions/src/components/ActionLogger/style.js b/addons/actions/src/components/ActionLogger/style.js similarity index 100% rename from packages/addon-actions/src/components/ActionLogger/style.js rename to addons/actions/src/components/ActionLogger/style.js diff --git a/packages/addon-actions/src/containers/ActionLogger/index.js b/addons/actions/src/containers/ActionLogger/index.js similarity index 100% rename from packages/addon-actions/src/containers/ActionLogger/index.js rename to addons/actions/src/containers/ActionLogger/index.js diff --git a/packages/addon-actions/src/index.js b/addons/actions/src/index.js similarity index 100% rename from packages/addon-actions/src/index.js rename to addons/actions/src/index.js diff --git a/packages/addon-actions/src/manager.js b/addons/actions/src/manager.js similarity index 87% rename from packages/addon-actions/src/manager.js rename to addons/actions/src/manager.js index 912dafaeb120..40b57852a912 100644 --- a/packages/addon-actions/src/manager.js +++ b/addons/actions/src/manager.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import ActionLogger from './containers/ActionLogger'; import { ADDON_ID, PANEL_ID } from './'; diff --git a/packages/addon-actions/src/preview.js b/addons/actions/src/preview.js similarity index 96% rename from packages/addon-actions/src/preview.js rename to addons/actions/src/preview.js index 2308322c55d5..e3b58189af73 100644 --- a/packages/addon-actions/src/preview.js +++ b/addons/actions/src/preview.js @@ -1,4 +1,4 @@ -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import stringify from 'json-stringify-safe'; import { EVENT_ID } from './'; diff --git a/packages/addon-comments/.scripts/get_gh_pages_url.js b/addons/comments/.scripts/get_gh_pages_url.js similarity index 100% rename from packages/addon-comments/.scripts/get_gh_pages_url.js rename to addons/comments/.scripts/get_gh_pages_url.js diff --git a/packages/addon-comments/.scripts/mocha_runner.js b/addons/comments/.scripts/mocha_runner.js similarity index 100% rename from packages/addon-comments/.scripts/mocha_runner.js rename to addons/comments/.scripts/mocha_runner.js diff --git a/packages/addon-comments/.scripts/publish_storybook.sh b/addons/comments/.scripts/publish_storybook.sh similarity index 100% rename from packages/addon-comments/.scripts/publish_storybook.sh rename to addons/comments/.scripts/publish_storybook.sh diff --git a/packages/addon-comments/.scripts/user/prepublish.sh b/addons/comments/.scripts/user/prepublish.sh similarity index 100% rename from packages/addon-comments/.scripts/user/prepublish.sh rename to addons/comments/.scripts/user/prepublish.sh diff --git a/packages/addon-comments/.scripts/user/pretest.js b/addons/comments/.scripts/user/pretest.js similarity index 100% rename from packages/addon-comments/.scripts/user/pretest.js rename to addons/comments/.scripts/user/pretest.js diff --git a/packages/addon-comments/.storybook/addons.js b/addons/comments/.storybook/addons.js similarity index 54% rename from packages/addon-comments/.storybook/addons.js rename to addons/comments/.storybook/addons.js index f352dba9597c..646fd34a6aa8 100644 --- a/packages/addon-comments/.storybook/addons.js +++ b/addons/comments/.storybook/addons.js @@ -1,9 +1,9 @@ // Uncomment to register defaults -// import '@storybook/storybook/addons'; +// import '@storybook/addons'; // Use the line below to register this addon -// import '@storybook/storybook-addon-comments/register'; -import '@storybook/storybook-addon-actions/register'; +// import '@storybook/addon-comments/register'; +import '@storybook/addon-actions/register'; import '@storybook/storybook-database-cloud/register'; import { init } from '../src/manager'; init(); diff --git a/packages/addon-comments/.storybook/config.js b/addons/comments/.storybook/config.js similarity index 100% rename from packages/addon-comments/.storybook/config.js rename to addons/comments/.storybook/config.js diff --git a/packages/addon-comments/CHANGELOG.md b/addons/comments/CHANGELOG.md similarity index 100% rename from packages/addon-comments/CHANGELOG.md rename to addons/comments/CHANGELOG.md diff --git a/packages/addon-comments/LICENSE b/addons/comments/LICENSE similarity index 100% rename from packages/addon-comments/LICENSE rename to addons/comments/LICENSE diff --git a/packages/addon-comments/README.md b/addons/comments/README.md similarity index 77% rename from packages/addon-comments/README.md rename to addons/comments/README.md index 4a2f58747af7..49fb9aab2ac0 100644 --- a/packages/addon-comments/README.md +++ b/addons/comments/README.md @@ -9,11 +9,11 @@ This Storybook addon allows you to add comments for your stories. This addon wor First, install the addon ```shell -npm install -D @storybook/storybook-addon-comments +npm install -D @storybook/addon-comments ``` Add this line to your `addons.js` file (create this file inside your storybook config directory if needed). ```js -import '@storybook/storybook-addon-comments/register'; +import '@storybook/addon-comments/register'; ``` diff --git a/packages/addon-comments/docs/screenshot.png b/addons/comments/docs/screenshot.png similarity index 100% rename from packages/addon-comments/docs/screenshot.png rename to addons/comments/docs/screenshot.png diff --git a/packages/addon-comments/manager.js b/addons/comments/manager.js similarity index 100% rename from packages/addon-comments/manager.js rename to addons/comments/manager.js diff --git a/packages/addon-comments/package.json b/addons/comments/package.json similarity index 90% rename from packages/addon-comments/package.json rename to addons/comments/package.json index fa3860d95c4b..45f204b45cb4 100644 --- a/packages/addon-comments/package.json +++ b/addons/comments/package.json @@ -34,11 +34,11 @@ "react-textarea-autosize": "^4.0.5" }, "devDependencies": { - "@storybook/storybook": "*", - "@storybook/storybook-addons": "*", + "@storybook/react": "*", + "@storybook/addons": "*", "@storybook/storybook-database-cloud": "*", "@storybook/storybook-deployer": "*", - "@storybook/storybook-ui": "*", + "@storybook/ui": "*", "git-url-parse": "^6.0.1", "react": "^15.5.4", "react-dom": "^15.5.4", @@ -46,7 +46,7 @@ "shelljs": "^0.7.4" }, "peerDependencies": { - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "react": "*", "react-dom": "*" } diff --git a/packages/addon-comments/preview.js b/addons/comments/preview.js similarity index 100% rename from packages/addon-comments/preview.js rename to addons/comments/preview.js diff --git a/packages/addon-comments/register.js b/addons/comments/register.js similarity index 100% rename from packages/addon-comments/register.js rename to addons/comments/register.js diff --git a/packages/addon-comments/src/index.js b/addons/comments/src/index.js similarity index 100% rename from packages/addon-comments/src/index.js rename to addons/comments/src/index.js diff --git a/packages/addon-comments/src/manager/components/CommentForm/index.js b/addons/comments/src/manager/components/CommentForm/index.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentForm/index.js rename to addons/comments/src/manager/components/CommentForm/index.js diff --git a/packages/addon-comments/src/manager/components/CommentForm/style.js b/addons/comments/src/manager/components/CommentForm/style.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentForm/style.js rename to addons/comments/src/manager/components/CommentForm/style.js diff --git a/packages/addon-comments/src/manager/components/CommentItem/index.js b/addons/comments/src/manager/components/CommentItem/index.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentItem/index.js rename to addons/comments/src/manager/components/CommentItem/index.js diff --git a/packages/addon-comments/src/manager/components/CommentItem/style.css.js b/addons/comments/src/manager/components/CommentItem/style.css.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentItem/style.css.js rename to addons/comments/src/manager/components/CommentItem/style.css.js diff --git a/packages/addon-comments/src/manager/components/CommentItem/style.js b/addons/comments/src/manager/components/CommentItem/style.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentItem/style.js rename to addons/comments/src/manager/components/CommentItem/style.js diff --git a/packages/addon-comments/src/manager/components/CommentList/index.js b/addons/comments/src/manager/components/CommentList/index.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentList/index.js rename to addons/comments/src/manager/components/CommentList/index.js diff --git a/packages/addon-comments/src/manager/components/CommentList/style.js b/addons/comments/src/manager/components/CommentList/style.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentList/style.js rename to addons/comments/src/manager/components/CommentList/style.js diff --git a/packages/addon-comments/src/manager/components/CommentsPanel/index.js b/addons/comments/src/manager/components/CommentsPanel/index.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentsPanel/index.js rename to addons/comments/src/manager/components/CommentsPanel/index.js diff --git a/packages/addon-comments/src/manager/components/CommentsPanel/style.js b/addons/comments/src/manager/components/CommentsPanel/style.js similarity index 100% rename from packages/addon-comments/src/manager/components/CommentsPanel/style.js rename to addons/comments/src/manager/components/CommentsPanel/style.js diff --git a/packages/addon-comments/src/manager/containers/CommentsPanel/dataStore.js b/addons/comments/src/manager/containers/CommentsPanel/dataStore.js similarity index 100% rename from packages/addon-comments/src/manager/containers/CommentsPanel/dataStore.js rename to addons/comments/src/manager/containers/CommentsPanel/dataStore.js diff --git a/packages/addon-comments/src/manager/containers/CommentsPanel/dataStore.test.js b/addons/comments/src/manager/containers/CommentsPanel/dataStore.test.js similarity index 100% rename from packages/addon-comments/src/manager/containers/CommentsPanel/dataStore.test.js rename to addons/comments/src/manager/containers/CommentsPanel/dataStore.test.js diff --git a/packages/addon-comments/src/manager/containers/CommentsPanel/index.js b/addons/comments/src/manager/containers/CommentsPanel/index.js similarity index 98% rename from packages/addon-comments/src/manager/containers/CommentsPanel/index.js rename to addons/comments/src/manager/containers/CommentsPanel/index.js index cf43005a5198..7b7391435eab 100644 --- a/packages/addon-comments/src/manager/containers/CommentsPanel/index.js +++ b/addons/comments/src/manager/containers/CommentsPanel/index.js @@ -1,6 +1,6 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import CommentsPanel from '../../components/CommentsPanel/'; import DataStore from './dataStore'; diff --git a/packages/addon-comments/src/manager/index.js b/addons/comments/src/manager/index.js similarity index 88% rename from packages/addon-comments/src/manager/index.js rename to addons/comments/src/manager/index.js index 0d4617404025..0eacbd23ea90 100644 --- a/packages/addon-comments/src/manager/index.js +++ b/addons/comments/src/manager/index.js @@ -1,7 +1,7 @@ /* eslint import/prefer-default-export:0 */ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import CommentsPanel from './containers/CommentsPanel'; import { ADDON_ID, PANEL_ID } from '../shared'; diff --git a/packages/addon-comments/src/preview/index.js b/addons/comments/src/preview/index.js similarity index 100% rename from packages/addon-comments/src/preview/index.js rename to addons/comments/src/preview/index.js diff --git a/packages/addon-comments/src/shared/index.js b/addons/comments/src/shared/index.js similarity index 100% rename from packages/addon-comments/src/shared/index.js rename to addons/comments/src/shared/index.js diff --git a/packages/addon-comments/src/stories/index.js b/addons/comments/src/stories/index.js similarity index 100% rename from packages/addon-comments/src/stories/index.js rename to addons/comments/src/stories/index.js diff --git a/packages/decorator-centered/CHANGELOG.md b/addons/decorator-centered/CHANGELOG.md similarity index 100% rename from packages/decorator-centered/CHANGELOG.md rename to addons/decorator-centered/CHANGELOG.md diff --git a/packages/decorator-centered/LICENSE b/addons/decorator-centered/LICENSE similarity index 100% rename from packages/decorator-centered/LICENSE rename to addons/decorator-centered/LICENSE diff --git a/packages/decorator-centered/README.md b/addons/decorator-centered/README.md similarity index 100% rename from packages/decorator-centered/README.md rename to addons/decorator-centered/README.md diff --git a/packages/decorator-centered/example/index.html b/addons/decorator-centered/example/index.html similarity index 100% rename from packages/decorator-centered/example/index.html rename to addons/decorator-centered/example/index.html diff --git a/packages/decorator-centered/example/index.js b/addons/decorator-centered/example/index.js similarity index 100% rename from packages/decorator-centered/example/index.js rename to addons/decorator-centered/example/index.js diff --git a/packages/decorator-centered/example/style.css b/addons/decorator-centered/example/style.css similarity index 100% rename from packages/decorator-centered/example/style.css rename to addons/decorator-centered/example/style.css diff --git a/packages/decorator-centered/package.json b/addons/decorator-centered/package.json similarity index 85% rename from packages/decorator-centered/package.json rename to addons/decorator-centered/package.json index a38820eedbbc..dff9c0cb850e 100644 --- a/packages/decorator-centered/package.json +++ b/addons/decorator-centered/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/react-storybook-decorator-centered", + "name": "@storybook/decorator-centered", "version": "1.1.2", "description": "React Storybook decorator to center components", "main": "build/index.js", diff --git a/packages/decorator-centered/src/index.js b/addons/decorator-centered/src/index.js similarity index 100% rename from packages/decorator-centered/src/index.js rename to addons/decorator-centered/src/index.js diff --git a/packages/addon-graphql/.storybook/config.js b/addons/graphql/.storybook/config.js similarity index 100% rename from packages/addon-graphql/.storybook/config.js rename to addons/graphql/.storybook/config.js diff --git a/packages/addon-graphql/.storybook/stories.js b/addons/graphql/.storybook/stories.js similarity index 100% rename from packages/addon-graphql/.storybook/stories.js rename to addons/graphql/.storybook/stories.js diff --git a/packages/addon-graphql/CHANGELOG.md b/addons/graphql/CHANGELOG.md similarity index 100% rename from packages/addon-graphql/CHANGELOG.md rename to addons/graphql/CHANGELOG.md diff --git a/packages/addon-graphql/README.md b/addons/graphql/README.md similarity index 89% rename from packages/addon-graphql/README.md rename to addons/graphql/README.md index bbd44ac609ec..6ddb194ebb8d 100644 --- a/packages/addon-graphql/README.md +++ b/addons/graphql/README.md @@ -9,14 +9,14 @@ The GraphiQL addon can be used to display the GraphiQL IDE with example queries. First, install the addon ```shell -npm install -D @storybook/storybook-addon-graphql +npm install -D @storybook/addon-graphql ``` Import the `setupGraphiQL` function and use it to create the graphiql helper with a base url. ```js import { storiesOf } from '@storybook/storybook' -import { setupGraphiQL } from '@storybook/storybook-addon-graphql' +import { setupGraphiQL } from '@storybook/addon-graphql' // setup the graphiql helper which can be used with the add method later const graphiql = setupGraphiQL({ url: 'http://localhost:3000/graphql' }); @@ -37,7 +37,7 @@ The `setupGraphiQL` function also accepts a fetcher parameter which can be used ```js import { storiesOf } from '@storybook/storybook' -import { setupGraphiQL } from '@storybook/storybook-addon-graphql' +import { setupGraphiQL } from '@storybook/addon-graphql' const fetcher = function (params) { const options = { diff --git a/packages/addon-graphql/demo/data.json b/addons/graphql/demo/data.json similarity index 100% rename from packages/addon-graphql/demo/data.json rename to addons/graphql/demo/data.json diff --git a/packages/addon-graphql/demo/index.js b/addons/graphql/demo/index.js similarity index 100% rename from packages/addon-graphql/demo/index.js rename to addons/graphql/demo/index.js diff --git a/packages/addon-graphql/demo/package.json b/addons/graphql/demo/package.json similarity index 100% rename from packages/addon-graphql/demo/package.json rename to addons/graphql/demo/package.json diff --git a/packages/addon-graphql/docs/screenshot.png b/addons/graphql/docs/screenshot.png similarity index 100% rename from packages/addon-graphql/docs/screenshot.png rename to addons/graphql/docs/screenshot.png diff --git a/packages/addon-graphql/package.json b/addons/graphql/package.json similarity index 92% rename from packages/addon-graphql/package.json rename to addons/graphql/package.json index dd44a52a89ef..a4db76af84c8 100644 --- a/packages/addon-graphql/package.json +++ b/addons/graphql/package.json @@ -27,7 +27,7 @@ "shelljs": "^0.7.3" }, "peerDependencies": { - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "react": "*" }, "dependencies": { diff --git a/packages/addon-graphql/src/components/FullScreen/index.js b/addons/graphql/src/components/FullScreen/index.js similarity index 100% rename from packages/addon-graphql/src/components/FullScreen/index.js rename to addons/graphql/src/components/FullScreen/index.js diff --git a/packages/addon-graphql/src/components/FullScreen/style.js b/addons/graphql/src/components/FullScreen/style.js similarity index 100% rename from packages/addon-graphql/src/components/FullScreen/style.js rename to addons/graphql/src/components/FullScreen/style.js diff --git a/packages/addon-graphql/src/index.js b/addons/graphql/src/index.js similarity index 100% rename from packages/addon-graphql/src/index.js rename to addons/graphql/src/index.js diff --git a/packages/addon-graphql/src/preview.js b/addons/graphql/src/preview.js similarity index 100% rename from packages/addon-graphql/src/preview.js rename to addons/graphql/src/preview.js diff --git a/packages/addon-info/.scripts/get_gh_pages_url.js b/addons/info/.scripts/get_gh_pages_url.js similarity index 100% rename from packages/addon-info/.scripts/get_gh_pages_url.js rename to addons/info/.scripts/get_gh_pages_url.js diff --git a/packages/addon-info/.scripts/mocha_runner.js b/addons/info/.scripts/mocha_runner.js similarity index 100% rename from packages/addon-info/.scripts/mocha_runner.js rename to addons/info/.scripts/mocha_runner.js diff --git a/packages/addon-info/.scripts/publish_storybook.sh b/addons/info/.scripts/publish_storybook.sh similarity index 100% rename from packages/addon-info/.scripts/publish_storybook.sh rename to addons/info/.scripts/publish_storybook.sh diff --git a/packages/addon-info/.scripts/user/prepublish.sh b/addons/info/.scripts/user/prepublish.sh similarity index 100% rename from packages/addon-info/.scripts/user/prepublish.sh rename to addons/info/.scripts/user/prepublish.sh diff --git a/packages/addon-info/.scripts/user/pretest.js b/addons/info/.scripts/user/pretest.js similarity index 100% rename from packages/addon-info/.scripts/user/pretest.js rename to addons/info/.scripts/user/pretest.js diff --git a/packages/addon-info/.storybook/addons.js b/addons/info/.storybook/addons.js similarity index 58% rename from packages/addon-info/.storybook/addons.js rename to addons/info/.storybook/addons.js index 6545e300f0ff..2ef4c5c7ca24 100644 --- a/packages/addon-info/.storybook/addons.js +++ b/addons/info/.storybook/addons.js @@ -1,2 +1,2 @@ -import '@storybook/storybook/addons'; +import '@storybook/addons'; import 'react-storybook-addon-backgrounds/register'; diff --git a/packages/addon-info/.storybook/config.js b/addons/info/.storybook/config.js similarity index 100% rename from packages/addon-info/.storybook/config.js rename to addons/info/.storybook/config.js diff --git a/packages/addon-info/.storybook/user/modify_webpack_config.js b/addons/info/.storybook/user/modify_webpack_config.js similarity index 100% rename from packages/addon-info/.storybook/user/modify_webpack_config.js rename to addons/info/.storybook/user/modify_webpack_config.js diff --git a/packages/addon-info/.storybook/webpack.config.js b/addons/info/.storybook/webpack.config.js similarity index 100% rename from packages/addon-info/.storybook/webpack.config.js rename to addons/info/.storybook/webpack.config.js diff --git a/packages/addon-info/CHANGELOG.md b/addons/info/CHANGELOG.md similarity index 100% rename from packages/addon-info/CHANGELOG.md rename to addons/info/CHANGELOG.md diff --git a/packages/addon-info/LICENSE b/addons/info/LICENSE similarity index 100% rename from packages/addon-info/LICENSE rename to addons/info/LICENSE diff --git a/packages/addon-info/README.md b/addons/info/README.md similarity index 100% rename from packages/addon-info/README.md rename to addons/info/README.md diff --git a/packages/addon-info/docs/home-screenshot.png b/addons/info/docs/home-screenshot.png similarity index 100% rename from packages/addon-info/docs/home-screenshot.png rename to addons/info/docs/home-screenshot.png diff --git a/packages/addon-info/example/Button.js b/addons/info/example/Button.js similarity index 100% rename from packages/addon-info/example/Button.js rename to addons/info/example/Button.js diff --git a/packages/addon-info/example/story.js b/addons/info/example/story.js similarity index 100% rename from packages/addon-info/example/story.js rename to addons/info/example/story.js diff --git a/packages/addon-info/package.json b/addons/info/package.json similarity index 100% rename from packages/addon-info/package.json rename to addons/info/package.json diff --git a/packages/addon-info/src/components/Node.js b/addons/info/src/components/Node.js similarity index 100% rename from packages/addon-info/src/components/Node.js rename to addons/info/src/components/Node.js diff --git a/packages/addon-info/src/components/PropTable.js b/addons/info/src/components/PropTable.js similarity index 100% rename from packages/addon-info/src/components/PropTable.js rename to addons/info/src/components/PropTable.js diff --git a/packages/addon-info/src/components/PropVal.js b/addons/info/src/components/PropVal.js similarity index 100% rename from packages/addon-info/src/components/PropVal.js rename to addons/info/src/components/PropVal.js diff --git a/packages/addon-info/src/components/Props.js b/addons/info/src/components/Props.js similarity index 100% rename from packages/addon-info/src/components/Props.js rename to addons/info/src/components/Props.js diff --git a/packages/addon-info/src/components/Story.js b/addons/info/src/components/Story.js similarity index 100% rename from packages/addon-info/src/components/Story.js rename to addons/info/src/components/Story.js diff --git a/packages/addon-info/src/components/markdown/code.js b/addons/info/src/components/markdown/code.js similarity index 100% rename from packages/addon-info/src/components/markdown/code.js rename to addons/info/src/components/markdown/code.js diff --git a/packages/addon-info/src/components/markdown/htags.js b/addons/info/src/components/markdown/htags.js similarity index 100% rename from packages/addon-info/src/components/markdown/htags.js rename to addons/info/src/components/markdown/htags.js diff --git a/packages/addon-info/src/components/markdown/index.js b/addons/info/src/components/markdown/index.js similarity index 100% rename from packages/addon-info/src/components/markdown/index.js rename to addons/info/src/components/markdown/index.js diff --git a/packages/addon-info/src/components/markdown/text.js b/addons/info/src/components/markdown/text.js similarity index 100% rename from packages/addon-info/src/components/markdown/text.js rename to addons/info/src/components/markdown/text.js diff --git a/packages/addon-info/src/components/theme.js b/addons/info/src/components/theme.js similarity index 100% rename from packages/addon-info/src/components/theme.js rename to addons/info/src/components/theme.js diff --git a/packages/addon-info/src/index.js b/addons/info/src/index.js similarity index 100% rename from packages/addon-info/src/index.js rename to addons/info/src/index.js diff --git a/packages/addon-knobs/.npmignore b/addons/knobs/.npmignore similarity index 100% rename from packages/addon-knobs/.npmignore rename to addons/knobs/.npmignore diff --git a/packages/addon-knobs/.scripts/get_gh_pages_url.js b/addons/knobs/.scripts/get_gh_pages_url.js similarity index 100% rename from packages/addon-knobs/.scripts/get_gh_pages_url.js rename to addons/knobs/.scripts/get_gh_pages_url.js diff --git a/packages/addon-knobs/.scripts/publish_storybook.sh b/addons/knobs/.scripts/publish_storybook.sh similarity index 100% rename from packages/addon-knobs/.scripts/publish_storybook.sh rename to addons/knobs/.scripts/publish_storybook.sh diff --git a/packages/addon-knobs/.scripts/user/prepublish.sh b/addons/knobs/.scripts/user/prepublish.sh similarity index 100% rename from packages/addon-knobs/.scripts/user/prepublish.sh rename to addons/knobs/.scripts/user/prepublish.sh diff --git a/packages/addon-knobs/.scripts/user/pretest.js b/addons/knobs/.scripts/user/pretest.js similarity index 100% rename from packages/addon-knobs/.scripts/user/pretest.js rename to addons/knobs/.scripts/user/pretest.js diff --git a/addons/knobs/.storybook/addons.js b/addons/knobs/.storybook/addons.js new file mode 100644 index 000000000000..c208fc7340a5 --- /dev/null +++ b/addons/knobs/.storybook/addons.js @@ -0,0 +1,2 @@ +import '../src/register'; +import '@storybook/addons' diff --git a/packages/addon-knobs/.storybook/config.js b/addons/knobs/.storybook/config.js similarity index 100% rename from packages/addon-knobs/.storybook/config.js rename to addons/knobs/.storybook/config.js diff --git a/packages/addon-knobs/.storybook/user/modify_webpack_config.js b/addons/knobs/.storybook/user/modify_webpack_config.js similarity index 100% rename from packages/addon-knobs/.storybook/user/modify_webpack_config.js rename to addons/knobs/.storybook/user/modify_webpack_config.js diff --git a/packages/addon-knobs/.storybook/webpack.config.js b/addons/knobs/.storybook/webpack.config.js similarity index 100% rename from packages/addon-knobs/.storybook/webpack.config.js rename to addons/knobs/.storybook/webpack.config.js diff --git a/packages/addon-knobs/CHANGELOG.md b/addons/knobs/CHANGELOG.md similarity index 100% rename from packages/addon-knobs/CHANGELOG.md rename to addons/knobs/CHANGELOG.md diff --git a/packages/addon-knobs/LICENSE b/addons/knobs/LICENSE similarity index 100% rename from packages/addon-knobs/LICENSE rename to addons/knobs/LICENSE diff --git a/packages/addon-knobs/README.md b/addons/knobs/README.md similarity index 93% rename from packages/addon-knobs/README.md rename to addons/knobs/README.md index afc0a2e64602..2ef2ee057414 100644 --- a/packages/addon-knobs/README.md +++ b/addons/knobs/README.md @@ -14,16 +14,16 @@ This is how Knobs look like: First of all, you need to install knobs into your project as a dev dependency. ```js -npm i -D @storybook/storybook-addon-knobs +npm i -D @storybook/addon-knobs ``` Then, configure it as an addon by adding it to your `addons.js` file (located in the Storybook config directory). ```js // To get our default addons (actions and links) -import '@storybook/storybook/addons'; +import '@storybook/addons'; // To add the knobs addon -import '@storybook/storybook-addon-knobs/register' +import '@storybook/addon-knobs/register' ``` Now, write your stories with knobs. @@ -31,7 +31,7 @@ Now, write your stories with knobs. ```js import React from 'react'; import { storiesOf } from '@storybook/storybook'; -import { withKnobs, text, boolean, number } from '@storybook/storybook-addon-knobs'; +import { withKnobs, text, boolean, number } from '@storybook/addon-knobs'; const stories = storiesOf('Storybook Knobs', module); @@ -71,11 +71,11 @@ You can see your Knobs in a Storybook panel as shown below. ## Available Knobs -These are the knobs available for you to use. You can import these Knobs from the `@storybook/storybook-addon-knobs` module. +These are the knobs available for you to use. You can import these Knobs from the `@storybook/addon-knobs` module. Here's how to import the **text** Knob. ```js -import { text } from '@storybook/storybook-addon-knobs'; +import { text } from '@storybook/addon-knobs'; ``` Just like that, you can import any other following Knobs: diff --git a/packages/addon-knobs/docs/demo.gif b/addons/knobs/docs/demo.gif similarity index 100% rename from packages/addon-knobs/docs/demo.gif rename to addons/knobs/docs/demo.gif diff --git a/packages/addon-knobs/docs/demo.png b/addons/knobs/docs/demo.png similarity index 100% rename from packages/addon-knobs/docs/demo.png rename to addons/knobs/docs/demo.png diff --git a/packages/addon-knobs/docs/storybook-knobs-example.png b/addons/knobs/docs/storybook-knobs-example.png similarity index 100% rename from packages/addon-knobs/docs/storybook-knobs-example.png rename to addons/knobs/docs/storybook-knobs-example.png diff --git a/packages/addon-knobs/example/stories/index.js b/addons/knobs/example/stories/index.js similarity index 100% rename from packages/addon-knobs/example/stories/index.js rename to addons/knobs/example/stories/index.js diff --git a/packages/addon-knobs/example/typescript/index.tsx b/addons/knobs/example/typescript/index.tsx similarity index 100% rename from packages/addon-knobs/example/typescript/index.tsx rename to addons/knobs/example/typescript/index.tsx diff --git a/packages/addon-knobs/package.json b/addons/knobs/package.json similarity index 93% rename from packages/addon-knobs/package.json rename to addons/knobs/package.json index af0d223eb816..c228091175e6 100644 --- a/packages/addon-knobs/package.json +++ b/addons/knobs/package.json @@ -26,7 +26,7 @@ "typescript-definition-tester": "^0.0.5" }, "peerDependencies": { - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "react": "*", "react-dom": "*" }, diff --git a/packages/addon-knobs/register.js b/addons/knobs/register.js similarity index 100% rename from packages/addon-knobs/register.js rename to addons/knobs/register.js diff --git a/packages/addon-knobs/src/KnobManager.js b/addons/knobs/src/KnobManager.js similarity index 100% rename from packages/addon-knobs/src/KnobManager.js rename to addons/knobs/src/KnobManager.js diff --git a/packages/addon-knobs/src/KnobManager.test.js b/addons/knobs/src/KnobManager.test.js similarity index 100% rename from packages/addon-knobs/src/KnobManager.test.js rename to addons/knobs/src/KnobManager.test.js diff --git a/packages/addon-knobs/src/KnobStore.js b/addons/knobs/src/KnobStore.js similarity index 100% rename from packages/addon-knobs/src/KnobStore.js rename to addons/knobs/src/KnobStore.js diff --git a/packages/addon-knobs/src/components/Panel.js b/addons/knobs/src/components/Panel.js similarity index 100% rename from packages/addon-knobs/src/components/Panel.js rename to addons/knobs/src/components/Panel.js diff --git a/packages/addon-knobs/src/components/PropField.js b/addons/knobs/src/components/PropField.js similarity index 100% rename from packages/addon-knobs/src/components/PropField.js rename to addons/knobs/src/components/PropField.js diff --git a/packages/addon-knobs/src/components/PropForm.js b/addons/knobs/src/components/PropForm.js similarity index 100% rename from packages/addon-knobs/src/components/PropForm.js rename to addons/knobs/src/components/PropForm.js diff --git a/packages/addon-knobs/src/components/WrapStory.js b/addons/knobs/src/components/WrapStory.js similarity index 100% rename from packages/addon-knobs/src/components/WrapStory.js rename to addons/knobs/src/components/WrapStory.js diff --git a/packages/addon-knobs/src/components/__tests__/Array.js b/addons/knobs/src/components/__tests__/Array.js similarity index 100% rename from packages/addon-knobs/src/components/__tests__/Array.js rename to addons/knobs/src/components/__tests__/Array.js diff --git a/packages/addon-knobs/src/components/__tests__/Panel.js b/addons/knobs/src/components/__tests__/Panel.js similarity index 100% rename from packages/addon-knobs/src/components/__tests__/Panel.js rename to addons/knobs/src/components/__tests__/Panel.js diff --git a/packages/addon-knobs/src/components/types/Array.js b/addons/knobs/src/components/types/Array.js similarity index 100% rename from packages/addon-knobs/src/components/types/Array.js rename to addons/knobs/src/components/types/Array.js diff --git a/packages/addon-knobs/src/components/types/Boolean.js b/addons/knobs/src/components/types/Boolean.js similarity index 100% rename from packages/addon-knobs/src/components/types/Boolean.js rename to addons/knobs/src/components/types/Boolean.js diff --git a/packages/addon-knobs/src/components/types/Color.js b/addons/knobs/src/components/types/Color.js similarity index 100% rename from packages/addon-knobs/src/components/types/Color.js rename to addons/knobs/src/components/types/Color.js diff --git a/packages/addon-knobs/src/components/types/Date/index.js b/addons/knobs/src/components/types/Date/index.js similarity index 100% rename from packages/addon-knobs/src/components/types/Date/index.js rename to addons/knobs/src/components/types/Date/index.js diff --git a/packages/addon-knobs/src/components/types/Date/styles.js b/addons/knobs/src/components/types/Date/styles.js similarity index 100% rename from packages/addon-knobs/src/components/types/Date/styles.js rename to addons/knobs/src/components/types/Date/styles.js diff --git a/packages/addon-knobs/src/components/types/Number.js b/addons/knobs/src/components/types/Number.js similarity index 100% rename from packages/addon-knobs/src/components/types/Number.js rename to addons/knobs/src/components/types/Number.js diff --git a/packages/addon-knobs/src/components/types/Object.js b/addons/knobs/src/components/types/Object.js similarity index 100% rename from packages/addon-knobs/src/components/types/Object.js rename to addons/knobs/src/components/types/Object.js diff --git a/packages/addon-knobs/src/components/types/Select.js b/addons/knobs/src/components/types/Select.js similarity index 100% rename from packages/addon-knobs/src/components/types/Select.js rename to addons/knobs/src/components/types/Select.js diff --git a/packages/addon-knobs/src/components/types/Text.js b/addons/knobs/src/components/types/Text.js similarity index 100% rename from packages/addon-knobs/src/components/types/Text.js rename to addons/knobs/src/components/types/Text.js diff --git a/packages/addon-knobs/src/components/types/index.js b/addons/knobs/src/components/types/index.js similarity index 100% rename from packages/addon-knobs/src/components/types/index.js rename to addons/knobs/src/components/types/index.js diff --git a/packages/addon-knobs/src/index.js b/addons/knobs/src/index.js similarity index 96% rename from packages/addon-knobs/src/index.js rename to addons/knobs/src/index.js index 5cea73a36c6d..1928354167e6 100644 --- a/packages/addon-knobs/src/index.js +++ b/addons/knobs/src/index.js @@ -1,4 +1,4 @@ -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import KnobManager from './KnobManager'; const manager = new KnobManager(); diff --git a/packages/addon-knobs/src/register.js b/addons/knobs/src/register.js similarity index 86% rename from packages/addon-knobs/src/register.js rename to addons/knobs/src/register.js index f432dc2de787..b208cef4109d 100644 --- a/packages/addon-knobs/src/register.js +++ b/addons/knobs/src/register.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import Panel from './components/Panel'; addons.register('storybooks/storybook-addon-knobs', api => { diff --git a/packages/addon-knobs/src/typescript.test.js b/addons/knobs/src/typescript.test.js similarity index 100% rename from packages/addon-knobs/src/typescript.test.js rename to addons/knobs/src/typescript.test.js diff --git a/packages/addon-knobs/storybook-addon-knobs.d.ts b/addons/knobs/storybook-addon-knobs.d.ts similarity index 100% rename from packages/addon-knobs/storybook-addon-knobs.d.ts rename to addons/knobs/storybook-addon-knobs.d.ts diff --git a/packages/addon-knobs/tsconfig.json b/addons/knobs/tsconfig.json similarity index 100% rename from packages/addon-knobs/tsconfig.json rename to addons/knobs/tsconfig.json diff --git a/packages/addon-notes/.scripts/get_gh_pages_url.js b/addons/notes/.scripts/get_gh_pages_url.js similarity index 100% rename from packages/addon-notes/.scripts/get_gh_pages_url.js rename to addons/notes/.scripts/get_gh_pages_url.js diff --git a/packages/addon-notes/.scripts/mocha_runner.js b/addons/notes/.scripts/mocha_runner.js similarity index 100% rename from packages/addon-notes/.scripts/mocha_runner.js rename to addons/notes/.scripts/mocha_runner.js diff --git a/packages/addon-notes/.scripts/publish_storybook.sh b/addons/notes/.scripts/publish_storybook.sh similarity index 100% rename from packages/addon-notes/.scripts/publish_storybook.sh rename to addons/notes/.scripts/publish_storybook.sh diff --git a/packages/addon-notes/.scripts/user/prepublish.sh b/addons/notes/.scripts/user/prepublish.sh similarity index 100% rename from packages/addon-notes/.scripts/user/prepublish.sh rename to addons/notes/.scripts/user/prepublish.sh diff --git a/packages/addon-notes/.scripts/user/pretest.js b/addons/notes/.scripts/user/pretest.js similarity index 100% rename from packages/addon-notes/.scripts/user/pretest.js rename to addons/notes/.scripts/user/pretest.js diff --git a/packages/addon-notes/.storybook/config.js b/addons/notes/.storybook/config.js similarity index 100% rename from packages/addon-notes/.storybook/config.js rename to addons/notes/.storybook/config.js diff --git a/packages/addon-notes/CHANGELOG.md b/addons/notes/CHANGELOG.md similarity index 100% rename from packages/addon-notes/CHANGELOG.md rename to addons/notes/CHANGELOG.md diff --git a/packages/addon-notes/README.md b/addons/notes/README.md similarity index 82% rename from packages/addon-notes/README.md rename to addons/notes/README.md index 378084357c16..6a2cc079c58b 100644 --- a/packages/addon-notes/README.md +++ b/addons/notes/README.md @@ -8,7 +8,7 @@ This [Storybook](https://getstorybook.io) addon allows you to write notes for yo **note: addons require @storybook/storybook 2.x or greater* ```sh -npm i --save-dev @storybook/storybook-addon-notes +npm i --save-dev @storybook/addon-notes ``` Then create a file called `addons.js` in your storybook config. @@ -16,8 +16,8 @@ Then create a file called `addons.js` in your storybook config. Add following content to it: ```js -import '@storybook/storybook/addons'; -import '@storybook/storybook-addon-notes/register'; +import '@storybook/addons'; +import '@storybook/addon-notes/register'; ``` Then write your stories like this: @@ -26,7 +26,7 @@ Then write your stories like this: import React from 'react'; import { storiesOf, action } from '@storybook/storybook'; import Button from './Button'; -import { WithNotes } from '@storybook/storybook-addon-notes'; +import { WithNotes } from '@storybook/addon-notes'; storiesOf('Button', module) .add('with text', () => ( diff --git a/packages/addon-notes/docs/demo.png b/addons/notes/docs/demo.png similarity index 100% rename from packages/addon-notes/docs/demo.png rename to addons/notes/docs/demo.png diff --git a/packages/addon-notes/package.json b/addons/notes/package.json similarity index 86% rename from packages/addon-notes/package.json rename to addons/notes/package.json index 50e62d04d051..ca51d6bffad6 100644 --- a/packages/addon-notes/package.json +++ b/addons/notes/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-addon-notes", + "name": "@storybook/addon-notes", "version": "1.0.1", "description": "Write notes for your Storybook stories.", "repository": { @@ -21,7 +21,7 @@ }, "peerDependencies": { "react": "*", - "@storybook/storybook-addons": "*" + "@storybook/addons": "*" }, "dependencies": { "babel-runtime": "^6.5.0" diff --git a/packages/addon-notes/register.js b/addons/notes/register.js similarity index 100% rename from packages/addon-notes/register.js rename to addons/notes/register.js diff --git a/packages/addon-notes/src/index.js b/addons/notes/src/index.js similarity index 89% rename from packages/addon-notes/src/index.js rename to addons/notes/src/index.js index 6b0244602000..9b39fd8ca5ed 100644 --- a/packages/addon-notes/src/index.js +++ b/addons/notes/src/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; export class WithNotes extends React.Component { render() { diff --git a/packages/addon-notes/src/register.js b/addons/notes/src/register.js similarity index 97% rename from packages/addon-notes/src/register.js rename to addons/notes/src/register.js index 12ba047663a2..4198ae45d10e 100644 --- a/packages/addon-notes/src/register.js +++ b/addons/notes/src/register.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; const styles = { notesPanel: { diff --git a/packages/addon-notes/src/stories/index.js b/addons/notes/src/stories/index.js similarity index 100% rename from packages/addon-notes/src/stories/index.js rename to addons/notes/src/stories/index.js diff --git a/packages/addon-notes/src/tests/index.js b/addons/notes/src/tests/index.js similarity index 100% rename from packages/addon-notes/src/tests/index.js rename to addons/notes/src/tests/index.js diff --git a/packages/addon-actions/.storybook/addons.js b/addons/options/.storybook/addons.js similarity index 51% rename from packages/addon-actions/.storybook/addons.js rename to addons/options/.storybook/addons.js index 399e8e1e07a8..ac570a1d0be5 100644 --- a/packages/addon-actions/.storybook/addons.js +++ b/addons/options/.storybook/addons.js @@ -1,6 +1,6 @@ // Uncomment to register defaults -// import '@storybook/storybook/addons'; +// import '@storybook/addons'; // Use the line below to register this addon -// import '@storybook/storybook-addon-actions/register'; +// import '@storybook/addon-hello/register'; import '../register'; diff --git a/packages/addon-options/.storybook/config.js b/addons/options/.storybook/config.js similarity index 100% rename from packages/addon-options/.storybook/config.js rename to addons/options/.storybook/config.js diff --git a/packages/addon-options/.storybook/stories.js b/addons/options/.storybook/stories.js similarity index 100% rename from packages/addon-options/.storybook/stories.js rename to addons/options/.storybook/stories.js diff --git a/packages/addon-options/CHANGELOG.md b/addons/options/CHANGELOG.md similarity index 100% rename from packages/addon-options/CHANGELOG.md rename to addons/options/CHANGELOG.md diff --git a/packages/addon-options/README.md b/addons/options/README.md similarity index 84% rename from packages/addon-options/README.md rename to addons/options/README.md index d3a081ac9d23..72e4547cac52 100644 --- a/packages/addon-options/README.md +++ b/addons/options/README.md @@ -9,20 +9,20 @@ The Options addon can be used to set configure the Storybook UI. This addon work First, install the addon ```shell -npm install -D @storybook/storybook-addon-options +npm install -D @storybook/addon-options ``` Add this line to your `addons.js` file (create this file inside your storybook config directory if needed). ```js -import '@storybook/storybook-addon-options/register'; +import '@storybook/addon-options/register'; ``` Import and use the `setOptions` function in your config.js file. ```js import * as storybook from '@storybook/storybook'; -import { setOptions } from '@storybook/storybook-addon-options'; +import { setOptions } from '@storybook/addon-options'; setOptions({ name: 'CUSTOM-OPTIONS', diff --git a/packages/addon-options/docs/screenshot.png b/addons/options/docs/screenshot.png similarity index 100% rename from packages/addon-options/docs/screenshot.png rename to addons/options/docs/screenshot.png diff --git a/packages/addon-options/manager.js b/addons/options/manager.js similarity index 100% rename from packages/addon-options/manager.js rename to addons/options/manager.js diff --git a/packages/addon-options/package.json b/addons/options/package.json similarity index 84% rename from packages/addon-options/package.json rename to addons/options/package.json index 94753afedbcc..cddc1a926cc7 100644 --- a/packages/addon-options/package.json +++ b/addons/options/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-addon-options", + "name": "@storybook/addon-options", "version": "1.0.2", "description": "Options addon for storybook", "main": "preview.js", @@ -21,7 +21,7 @@ "homepage": "https://github.com/storybooks/storybook/tree/master/packages/addon-options", "devDependencies": { "@storybook/storybook": "*", - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "@storybook/storybook-ui": "*", "react": "^15.5.4", "react-dom": "^15.5.4", @@ -29,7 +29,7 @@ "shelljs": "^0.7.7" }, "peerDependencies": { - "@storybook/storybook-addons": "*", + "@storybook/addons": "*", "react": "*", "react-dom": "*" }, diff --git a/packages/addon-options/preview.js b/addons/options/preview.js similarity index 100% rename from packages/addon-options/preview.js rename to addons/options/preview.js diff --git a/packages/addon-options/register.js b/addons/options/register.js similarity index 100% rename from packages/addon-options/register.js rename to addons/options/register.js diff --git a/packages/addon-options/src/manager/index.js b/addons/options/src/manager/index.js similarity index 89% rename from packages/addon-options/src/manager/index.js rename to addons/options/src/manager/index.js index 233ded0b90c1..ae8ec0478d05 100644 --- a/packages/addon-options/src/manager/index.js +++ b/addons/options/src/manager/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import { ADDON_ID, EVENT_ID } from '../shared'; // init function will be executed once when the storybook loads for the diff --git a/packages/addon-options/src/preview/index.js b/addons/options/src/preview/index.js similarity index 90% rename from packages/addon-options/src/preview/index.js rename to addons/options/src/preview/index.js index e37c102ac4e4..90411bdae6e1 100644 --- a/packages/addon-options/src/preview/index.js +++ b/addons/options/src/preview/index.js @@ -1,4 +1,4 @@ -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import { EVENT_ID } from '../shared'; // init function will be executed once when the storybook loads for the diff --git a/packages/addon-options/src/shared/index.js b/addons/options/src/shared/index.js similarity index 100% rename from packages/addon-options/src/shared/index.js rename to addons/options/src/shared/index.js diff --git a/packages/addon-options/storybook-addon-options.d.ts b/addons/options/storybook-addon-options.d.ts similarity index 100% rename from packages/addon-options/storybook-addon-options.d.ts rename to addons/options/storybook-addon-options.d.ts diff --git a/packages/react-native-storybook/.babelrc b/app/react-native/.babelrc similarity index 100% rename from packages/react-native-storybook/.babelrc rename to app/react-native/.babelrc diff --git a/packages/react-native-storybook/.npmignore b/app/react-native/.npmignore similarity index 100% rename from packages/react-native-storybook/.npmignore rename to app/react-native/.npmignore diff --git a/packages/react-native-storybook/CHANGELOG.md b/app/react-native/CHANGELOG.md similarity index 100% rename from packages/react-native-storybook/CHANGELOG.md rename to app/react-native/CHANGELOG.md diff --git a/packages/react-native-storybook/LICENSE b/app/react-native/LICENSE similarity index 100% rename from packages/react-native-storybook/LICENSE rename to app/react-native/LICENSE diff --git a/packages/react-native-storybook/addons.js b/app/react-native/addons.js similarity index 100% rename from packages/react-native-storybook/addons.js rename to app/react-native/addons.js diff --git a/packages/react-native-storybook/docs/assets/readme/screenshot.png b/app/react-native/docs/assets/readme/screenshot.png similarity index 100% rename from packages/react-native-storybook/docs/assets/readme/screenshot.png rename to app/react-native/docs/assets/readme/screenshot.png diff --git a/packages/react-native-storybook/docs/manual-setup.md b/app/react-native/docs/manual-setup.md similarity index 100% rename from packages/react-native-storybook/docs/manual-setup.md rename to app/react-native/docs/manual-setup.md diff --git a/packages/react-native-storybook/docs/using-devices.md b/app/react-native/docs/using-devices.md similarity index 100% rename from packages/react-native-storybook/docs/using-devices.md rename to app/react-native/docs/using-devices.md diff --git a/packages/react-native-storybook/package.json b/app/react-native/package.json similarity index 85% rename from packages/react-native-storybook/package.json rename to app/react-native/package.json index c4ada33fcc10..6282526a425d 100644 --- a/packages/react-native-storybook/package.json +++ b/app/react-native/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/react-native-storybook", + "name": "@storybook/react-native", "version": "2.3.0", "description": "A better way to develop React Native Components for your app", "main": "dist/index.js", @@ -34,11 +34,11 @@ "react-native": "^0.43.3" }, "dependencies": { - "@storybook/storybook-addon-actions": "*", - "@storybook/storybook-addon-links": "*", - "@storybook/storybook-addons": "*", - "@storybook/storybook-channel-websocket": "*", - "@storybook/storybook-ui": "*", + "@storybook/addon-actions": "*", + "@storybook/addon-links": "*", + "@storybook/addons": "*", + "@storybook/channel-websocket": "*", + "@storybook/ui": "*", "autoprefixer": "^6.7.7", "babel-core": "^6.24.1", "babel-loader": "^6.4.1", diff --git a/packages/react-native-storybook/readme.md b/app/react-native/readme.md similarity index 100% rename from packages/react-native-storybook/readme.md rename to app/react-native/readme.md diff --git a/packages/react-native-storybook/src/bin/storybook-build.js b/app/react-native/src/bin/storybook-build.js similarity index 100% rename from packages/react-native-storybook/src/bin/storybook-build.js rename to app/react-native/src/bin/storybook-build.js diff --git a/packages/react-native-storybook/src/bin/storybook-start.js b/app/react-native/src/bin/storybook-start.js similarity index 100% rename from packages/react-native-storybook/src/bin/storybook-start.js rename to app/react-native/src/bin/storybook-start.js diff --git a/packages/react-native-storybook/src/bin/storybook.js b/app/react-native/src/bin/storybook.js similarity index 100% rename from packages/react-native-storybook/src/bin/storybook.js rename to app/react-native/src/bin/storybook.js diff --git a/packages/react-native-storybook/src/index.js b/app/react-native/src/index.js similarity index 80% rename from packages/react-native-storybook/src/index.js rename to app/react-native/src/index.js index df64f00509bb..18162fa0ac70 100644 --- a/packages/react-native-storybook/src/index.js +++ b/app/react-native/src/index.js @@ -10,5 +10,5 @@ export const getStorybook = preview.getStorybook.bind(preview); export const getStorybookUI = preview.getStorybookUI.bind(preview); // NOTE export these to keep backwards compatibility -export { action } from '@storybook/storybook-addon-actions'; -export { linkTo } from '@storybook/storybook-addon-links'; +export { action } from '@storybook/addon-actions'; +export { linkTo } from '@storybook/addon-links'; diff --git a/packages/react-native-storybook/src/manager/index.js b/app/react-native/src/manager/index.js similarity index 76% rename from packages/react-native-storybook/src/manager/index.js rename to app/react-native/src/manager/index.js index 5a226ea8a080..02ef419adaa1 100644 --- a/packages/react-native-storybook/src/manager/index.js +++ b/app/react-native/src/manager/index.js @@ -1,4 +1,4 @@ -import renderStorybookUI from '@storybook/storybook-ui'; +import renderStorybookUI from '@storybook/ui'; import Provider from './provider'; const rootEl = document.getElementById('root'); diff --git a/packages/react-native-storybook/src/manager/provider.js b/app/react-native/src/manager/provider.js similarity index 90% rename from packages/react-native-storybook/src/manager/provider.js rename to app/react-native/src/manager/provider.js index c242b3b9f985..663a5f38c276 100644 --- a/packages/react-native-storybook/src/manager/provider.js +++ b/app/react-native/src/manager/provider.js @@ -1,7 +1,7 @@ import React from 'react'; -import { Provider } from '@storybook/storybook-ui'; -import createChannel from '@storybook/storybook-channel-websocket'; -import addons from '@storybook/storybook-addons'; +import { Provider } from '@storybook/ui'; +import createChannel from '@storybook/channel-websocket'; +import addons from '@storybook/addons'; import uuid from 'uuid'; export default class ReactProvider extends Provider { diff --git a/packages/react-native-storybook/src/preview/components/StoryView/index.js b/app/react-native/src/preview/components/StoryView/index.js similarity index 100% rename from packages/react-native-storybook/src/preview/components/StoryView/index.js rename to app/react-native/src/preview/components/StoryView/index.js diff --git a/packages/react-native-storybook/src/preview/components/StoryView/style.js b/app/react-native/src/preview/components/StoryView/style.js similarity index 100% rename from packages/react-native-storybook/src/preview/components/StoryView/style.js rename to app/react-native/src/preview/components/StoryView/style.js diff --git a/packages/react-native-storybook/src/preview/index.js b/app/react-native/src/preview/index.js similarity index 95% rename from packages/react-native-storybook/src/preview/index.js rename to app/react-native/src/preview/index.js index 9a10e0718c94..a5891d04ec69 100644 --- a/packages/react-native-storybook/src/preview/index.js +++ b/app/react-native/src/preview/index.js @@ -1,6 +1,6 @@ import React from 'react'; -import addons from '@storybook/storybook-addons'; -import createChannel from '@storybook/storybook-channel-websocket'; +import addons from '@storybook/addons'; +import createChannel from '@storybook/channel-websocket'; import { EventEmitter } from 'events'; import StoryStore from './story_store'; import StoryKindApi from './story_kind'; diff --git a/packages/react-native-storybook/src/preview/story_kind.js b/app/react-native/src/preview/story_kind.js similarity index 100% rename from packages/react-native-storybook/src/preview/story_kind.js rename to app/react-native/src/preview/story_kind.js diff --git a/packages/react-native-storybook/src/preview/story_store.js b/app/react-native/src/preview/story_store.js similarity index 100% rename from packages/react-native-storybook/src/preview/story_store.js rename to app/react-native/src/preview/story_store.js diff --git a/app/react-native/src/server/addons.js b/app/react-native/src/server/addons.js new file mode 100644 index 000000000000..6aed412d04af --- /dev/null +++ b/app/react-native/src/server/addons.js @@ -0,0 +1,2 @@ +import '@storybook/addon-actions/register'; +import '@storybook/addon-links/register'; diff --git a/packages/react-native-storybook/src/server/config.js b/app/react-native/src/server/config.js similarity index 100% rename from packages/react-native-storybook/src/server/config.js rename to app/react-native/src/server/config.js diff --git a/packages/react-native-storybook/src/server/config/babel.js b/app/react-native/src/server/config/babel.js similarity index 100% rename from packages/react-native-storybook/src/server/config/babel.js rename to app/react-native/src/server/config/babel.js diff --git a/packages/react-native-storybook/src/server/config/babel.prod.js b/app/react-native/src/server/config/babel.prod.js similarity index 100% rename from packages/react-native-storybook/src/server/config/babel.prod.js rename to app/react-native/src/server/config/babel.prod.js diff --git a/packages/react-native-storybook/src/server/config/defaults/webpack.config.js b/app/react-native/src/server/config/defaults/webpack.config.js similarity index 100% rename from packages/react-native-storybook/src/server/config/defaults/webpack.config.js rename to app/react-native/src/server/config/defaults/webpack.config.js diff --git a/packages/react-native-storybook/src/server/config/utils.js b/app/react-native/src/server/config/utils.js similarity index 100% rename from packages/react-native-storybook/src/server/config/utils.js rename to app/react-native/src/server/config/utils.js diff --git a/packages/react-native-storybook/src/server/config/webpack.config.js b/app/react-native/src/server/config/webpack.config.js similarity index 100% rename from packages/react-native-storybook/src/server/config/webpack.config.js rename to app/react-native/src/server/config/webpack.config.js diff --git a/packages/react-native-storybook/src/server/config/webpack.config.prod.js b/app/react-native/src/server/config/webpack.config.prod.js similarity index 100% rename from packages/react-native-storybook/src/server/config/webpack.config.prod.js rename to app/react-native/src/server/config/webpack.config.prod.js diff --git a/packages/react-native-storybook/src/server/index.html.js b/app/react-native/src/server/index.html.js similarity index 100% rename from packages/react-native-storybook/src/server/index.html.js rename to app/react-native/src/server/index.html.js diff --git a/packages/react-native-storybook/src/server/index.js b/app/react-native/src/server/index.js similarity index 100% rename from packages/react-native-storybook/src/server/index.js rename to app/react-native/src/server/index.js diff --git a/packages/react-native-storybook/src/server/middleware.js b/app/react-native/src/server/middleware.js similarity index 100% rename from packages/react-native-storybook/src/server/middleware.js rename to app/react-native/src/server/middleware.js diff --git a/packages/react-storybook/.babelrc b/app/react/.babelrc similarity index 100% rename from packages/react-storybook/.babelrc rename to app/react/.babelrc diff --git a/packages/react-storybook/.npmignore b/app/react/.npmignore similarity index 100% rename from packages/react-storybook/.npmignore rename to app/react/.npmignore diff --git a/packages/react-storybook/CHANGELOG.md b/app/react/CHANGELOG.md similarity index 100% rename from packages/react-storybook/CHANGELOG.md rename to app/react/CHANGELOG.md diff --git a/packages/react-storybook/CODE_OF_CONDUCT.md b/app/react/CODE_OF_CONDUCT.md similarity index 100% rename from packages/react-storybook/CODE_OF_CONDUCT.md rename to app/react/CODE_OF_CONDUCT.md diff --git a/packages/getstorybook/LICENSE b/app/react/LICENSE similarity index 100% rename from packages/getstorybook/LICENSE rename to app/react/LICENSE diff --git a/packages/react-storybook/README.md b/app/react/README.md similarity index 100% rename from packages/react-storybook/README.md rename to app/react/README.md diff --git a/packages/react-storybook/ROADMAP.md b/app/react/ROADMAP.md similarity index 100% rename from packages/react-storybook/ROADMAP.md rename to app/react/ROADMAP.md diff --git a/packages/react-storybook/addons.js b/app/react/addons.js similarity index 100% rename from packages/react-storybook/addons.js rename to app/react/addons.js diff --git a/packages/react-storybook/config/storybook.d.ts b/app/react/config/storybook.d.ts similarity index 100% rename from packages/react-storybook/config/storybook.d.ts rename to app/react/config/storybook.d.ts diff --git a/packages/react-storybook/demo/.gitignore b/app/react/demo/.gitignore similarity index 100% rename from packages/react-storybook/demo/.gitignore rename to app/react/demo/.gitignore diff --git a/packages/getstorybook/generators/REACT_SCRIPTS/template/.storybook/config.js b/app/react/demo/.storybook/config.js similarity index 100% rename from packages/getstorybook/generators/REACT_SCRIPTS/template/.storybook/config.js rename to app/react/demo/.storybook/config.js diff --git a/packages/react-storybook/demo/README.md b/app/react/demo/README.md similarity index 100% rename from packages/react-storybook/demo/README.md rename to app/react/demo/README.md diff --git a/packages/react-storybook/demo/package.json b/app/react/demo/package.json similarity index 100% rename from packages/react-storybook/demo/package.json rename to app/react/demo/package.json diff --git a/packages/react-storybook/demo/public/favicon.ico b/app/react/demo/public/favicon.ico similarity index 100% rename from packages/react-storybook/demo/public/favicon.ico rename to app/react/demo/public/favicon.ico diff --git a/packages/react-storybook/demo/public/index.html b/app/react/demo/public/index.html similarity index 100% rename from packages/react-storybook/demo/public/index.html rename to app/react/demo/public/index.html diff --git a/packages/react-storybook/demo/src/App.css b/app/react/demo/src/App.css similarity index 100% rename from packages/react-storybook/demo/src/App.css rename to app/react/demo/src/App.css diff --git a/packages/react-storybook/demo/src/App.js b/app/react/demo/src/App.js similarity index 100% rename from packages/react-storybook/demo/src/App.js rename to app/react/demo/src/App.js diff --git a/packages/react-storybook/demo/src/App.test.js b/app/react/demo/src/App.test.js similarity index 100% rename from packages/react-storybook/demo/src/App.test.js rename to app/react/demo/src/App.test.js diff --git a/packages/react-storybook/demo/src/index.css b/app/react/demo/src/index.css similarity index 100% rename from packages/react-storybook/demo/src/index.css rename to app/react/demo/src/index.css diff --git a/packages/react-storybook/demo/src/index.js b/app/react/demo/src/index.js similarity index 100% rename from packages/react-storybook/demo/src/index.js rename to app/react/demo/src/index.js diff --git a/packages/react-storybook/demo/src/logo.svg b/app/react/demo/src/logo.svg similarity index 100% rename from packages/react-storybook/demo/src/logo.svg rename to app/react/demo/src/logo.svg diff --git a/packages/getstorybook/generators/REACT/template/stories/Button.js b/app/react/demo/src/stories/Button.js similarity index 100% rename from packages/getstorybook/generators/REACT/template/stories/Button.js rename to app/react/demo/src/stories/Button.js diff --git a/packages/react-storybook/demo/src/stories/Welcome.js b/app/react/demo/src/stories/Welcome.js similarity index 100% rename from packages/react-storybook/demo/src/stories/Welcome.js rename to app/react/demo/src/stories/Welcome.js diff --git a/packages/getstorybook/generators/REACT/template/stories/index.js b/app/react/demo/src/stories/index.js similarity index 100% rename from packages/getstorybook/generators/REACT/template/stories/index.js rename to app/react/demo/src/stories/index.js diff --git a/packages/react-storybook/docs/demo.gif b/app/react/docs/demo.gif similarity index 100% rename from packages/react-storybook/docs/demo.gif rename to app/react/docs/demo.gif diff --git a/packages/react-storybook/docs/react_storybook_screenshot.png b/app/react/docs/react_storybook_screenshot.png similarity index 100% rename from packages/react-storybook/docs/react_storybook_screenshot.png rename to app/react/docs/react_storybook_screenshot.png diff --git a/packages/react-storybook/docs/storybooks_io_logo.png b/app/react/docs/storybooks_io_logo.png similarity index 100% rename from packages/react-storybook/docs/storybooks_io_logo.png rename to app/react/docs/storybooks_io_logo.png diff --git a/packages/react-storybook/package.json b/app/react/package.json similarity index 89% rename from packages/react-storybook/package.json rename to app/react/package.json index aa5d5bff5efd..db043916df4f 100644 --- a/packages/react-storybook/package.json +++ b/app/react/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook", + "name": "@storybook/react", "version": "2.35.3", "description": "React Storybook: Isolate React Component Development with Hot Reloading.", "license": "MIT", @@ -19,11 +19,11 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/storybook-addon-actions": "*", - "@storybook/storybook-addon-links": "*", - "@storybook/storybook-addons": "*", - "@storybook/storybook-channel-postmsg": "*", - "@storybook/storybook-ui": "*", + "@storybook/addon-actions": "*", + "@storybook/addon-links": "*", + "@storybook/addons": "*", + "@storybook/channel-postmsg": "*", + "@storybook/ui": "*", "airbnb-js-shims": "^1.1.1", "autoprefixer": "^6.7.7", "babel-core": "^6.24.1", diff --git a/packages/react-storybook/scripts/mocha_runner.js b/app/react/scripts/mocha_runner.js similarity index 100% rename from packages/react-storybook/scripts/mocha_runner.js rename to app/react/scripts/mocha_runner.js diff --git a/packages/react-storybook/scripts/publish.sh b/app/react/scripts/publish.sh similarity index 100% rename from packages/react-storybook/scripts/publish.sh rename to app/react/scripts/publish.sh diff --git a/packages/react-storybook/src/client/index.js b/app/react/src/client/index.js similarity index 73% rename from packages/react-storybook/src/client/index.js rename to app/react/src/client/index.js index 6ea64f4b6e57..766232068c84 100644 --- a/packages/react-storybook/src/client/index.js +++ b/app/react/src/client/index.js @@ -7,5 +7,5 @@ export const configure = previewApi.configure; export const getStorybook = previewApi.getStorybook; // NOTE export these to keep backwards compatibility -export { action } from '@storybook/storybook-addon-actions'; -export { linkTo } from '@storybook/storybook-addon-links'; +export { action } from '@storybook/addon-actions'; +export { linkTo } from '@storybook/addon-links'; diff --git a/packages/react-storybook/src/client/manager/index.js b/app/react/src/client/manager/index.js similarity index 72% rename from packages/react-storybook/src/client/manager/index.js rename to app/react/src/client/manager/index.js index 26332a9a1a03..24082de7ca54 100644 --- a/packages/react-storybook/src/client/manager/index.js +++ b/app/react/src/client/manager/index.js @@ -1,6 +1,6 @@ /* global document */ -import renderStorybookUI from '@storybook/storybook-ui'; +import renderStorybookUI from '@storybook/ui'; import Provider from './provider'; const rootEl = document.getElementById('root'); diff --git a/packages/react-storybook/src/client/manager/preview.js b/app/react/src/client/manager/preview.js similarity index 100% rename from packages/react-storybook/src/client/manager/preview.js rename to app/react/src/client/manager/preview.js diff --git a/packages/react-storybook/src/client/manager/provider.js b/app/react/src/client/manager/provider.js similarity index 87% rename from packages/react-storybook/src/client/manager/provider.js rename to app/react/src/client/manager/provider.js index e1baa8b93d43..664e779cc75c 100644 --- a/packages/react-storybook/src/client/manager/provider.js +++ b/app/react/src/client/manager/provider.js @@ -2,9 +2,9 @@ import qs from 'qs'; import React from 'react'; -import { Provider } from '@storybook/storybook-ui'; -import addons from '@storybook/storybook-addons'; -import createChannel from '@storybook/storybook-channel-postmsg'; +import { Provider } from '@storybook/ui'; +import addons from '@storybook/addons'; +import createChannel from '@storybook/channel-postmsg'; import Preview from './preview'; export default class ReactProvider extends Provider { diff --git a/packages/react-storybook/src/client/preview/actions.js b/app/react/src/client/preview/actions.js similarity index 100% rename from packages/react-storybook/src/client/preview/actions.js rename to app/react/src/client/preview/actions.js diff --git a/packages/react-storybook/src/client/preview/client_api.js b/app/react/src/client/preview/client_api.js similarity index 100% rename from packages/react-storybook/src/client/preview/client_api.js rename to app/react/src/client/preview/client_api.js diff --git a/packages/react-storybook/src/client/preview/client_api.test.js b/app/react/src/client/preview/client_api.test.js similarity index 100% rename from packages/react-storybook/src/client/preview/client_api.test.js rename to app/react/src/client/preview/client_api.test.js diff --git a/packages/react-storybook/src/client/preview/config_api.js b/app/react/src/client/preview/config_api.js similarity index 100% rename from packages/react-storybook/src/client/preview/config_api.js rename to app/react/src/client/preview/config_api.js diff --git a/packages/react-storybook/src/client/preview/error_display.js b/app/react/src/client/preview/error_display.js similarity index 100% rename from packages/react-storybook/src/client/preview/error_display.js rename to app/react/src/client/preview/error_display.js diff --git a/packages/react-storybook/src/client/preview/index.js b/app/react/src/client/preview/index.js similarity index 93% rename from packages/react-storybook/src/client/preview/index.js rename to app/react/src/client/preview/index.js index aacdaae1b808..6eff068a5002 100644 --- a/packages/react-storybook/src/client/preview/index.js +++ b/app/react/src/client/preview/index.js @@ -1,8 +1,8 @@ /* global window */ import { createStore } from 'redux'; -import addons from '@storybook/storybook-addons'; -import createChannel from '@storybook/storybook-channel-postmsg'; +import addons from '@storybook/addons'; +import createChannel from '@storybook/channel-postmsg'; import qs from 'qs'; import StoryStore from './story_store'; import ClientApi from './client_api'; diff --git a/packages/react-storybook/src/client/preview/init.js b/app/react/src/client/preview/init.js similarity index 88% rename from packages/react-storybook/src/client/preview/init.js rename to app/react/src/client/preview/init.js index baa6e8048b8e..a8de2d28f168 100644 --- a/packages/react-storybook/src/client/preview/init.js +++ b/app/react/src/client/preview/init.js @@ -1,4 +1,4 @@ -import keyEvents from '@storybook/storybook-ui/dist/libs/key_events'; +import keyEvents from '@storybook/ui/dist/libs/key_events'; import { selectStory } from './actions'; export default function(context) { diff --git a/packages/react-storybook/src/client/preview/reducer.js b/app/react/src/client/preview/reducer.js similarity index 100% rename from packages/react-storybook/src/client/preview/reducer.js rename to app/react/src/client/preview/reducer.js diff --git a/packages/react-storybook/src/client/preview/render.js b/app/react/src/client/preview/render.js similarity index 100% rename from packages/react-storybook/src/client/preview/render.js rename to app/react/src/client/preview/render.js diff --git a/packages/react-storybook/src/client/preview/story_store.js b/app/react/src/client/preview/story_store.js similarity index 100% rename from packages/react-storybook/src/client/preview/story_store.js rename to app/react/src/client/preview/story_store.js diff --git a/app/react/src/server/addons.js b/app/react/src/server/addons.js new file mode 100644 index 000000000000..6aed412d04af --- /dev/null +++ b/app/react/src/server/addons.js @@ -0,0 +1,2 @@ +import '@storybook/addon-actions/register'; +import '@storybook/addon-links/register'; diff --git a/packages/react-storybook/src/server/babel_config.js b/app/react/src/server/babel_config.js similarity index 100% rename from packages/react-storybook/src/server/babel_config.js rename to app/react/src/server/babel_config.js diff --git a/packages/react-storybook/src/server/build.js b/app/react/src/server/build.js similarity index 100% rename from packages/react-storybook/src/server/build.js rename to app/react/src/server/build.js diff --git a/packages/react-storybook/src/server/config.js b/app/react/src/server/config.js similarity index 100% rename from packages/react-storybook/src/server/config.js rename to app/react/src/server/config.js diff --git a/packages/react-storybook/src/server/config/WatchMissingNodeModulesPlugin.js b/app/react/src/server/config/WatchMissingNodeModulesPlugin.js similarity index 100% rename from packages/react-storybook/src/server/config/WatchMissingNodeModulesPlugin.js rename to app/react/src/server/config/WatchMissingNodeModulesPlugin.js diff --git a/packages/react-storybook/src/server/config/babel.js b/app/react/src/server/config/babel.js similarity index 100% rename from packages/react-storybook/src/server/config/babel.js rename to app/react/src/server/config/babel.js diff --git a/packages/react-storybook/src/server/config/babel.prod.js b/app/react/src/server/config/babel.prod.js similarity index 100% rename from packages/react-storybook/src/server/config/babel.prod.js rename to app/react/src/server/config/babel.prod.js diff --git a/packages/react-storybook/src/server/config/defaults/webpack.config.js b/app/react/src/server/config/defaults/webpack.config.js similarity index 100% rename from packages/react-storybook/src/server/config/defaults/webpack.config.js rename to app/react/src/server/config/defaults/webpack.config.js diff --git a/packages/react-storybook/src/server/config/globals.js b/app/react/src/server/config/globals.js similarity index 100% rename from packages/react-storybook/src/server/config/globals.js rename to app/react/src/server/config/globals.js diff --git a/packages/react-storybook/src/server/config/polyfills.js b/app/react/src/server/config/polyfills.js similarity index 100% rename from packages/react-storybook/src/server/config/polyfills.js rename to app/react/src/server/config/polyfills.js diff --git a/packages/react-storybook/src/server/config/utils.js b/app/react/src/server/config/utils.js similarity index 100% rename from packages/react-storybook/src/server/config/utils.js rename to app/react/src/server/config/utils.js diff --git a/packages/react-storybook/src/server/config/webpack.config.js b/app/react/src/server/config/webpack.config.js similarity index 100% rename from packages/react-storybook/src/server/config/webpack.config.js rename to app/react/src/server/config/webpack.config.js diff --git a/packages/react-storybook/src/server/config/webpack.config.prod.js b/app/react/src/server/config/webpack.config.prod.js similarity index 100% rename from packages/react-storybook/src/server/config/webpack.config.prod.js rename to app/react/src/server/config/webpack.config.prod.js diff --git a/packages/react-storybook/src/server/iframe.html.js b/app/react/src/server/iframe.html.js similarity index 100% rename from packages/react-storybook/src/server/iframe.html.js rename to app/react/src/server/iframe.html.js diff --git a/packages/react-storybook/src/server/index.html.js b/app/react/src/server/index.html.js similarity index 100% rename from packages/react-storybook/src/server/index.html.js rename to app/react/src/server/index.html.js diff --git a/packages/react-storybook/src/server/index.js b/app/react/src/server/index.js similarity index 100% rename from packages/react-storybook/src/server/index.js rename to app/react/src/server/index.js diff --git a/packages/react-storybook/src/server/middleware.js b/app/react/src/server/middleware.js similarity index 100% rename from packages/react-storybook/src/server/middleware.js rename to app/react/src/server/middleware.js diff --git a/packages/react-storybook/src/server/public/favicon.ico b/app/react/src/server/public/favicon.ico similarity index 100% rename from packages/react-storybook/src/server/public/favicon.ico rename to app/react/src/server/public/favicon.ico diff --git a/packages/react-storybook/src/server/track_usage.js b/app/react/src/server/track_usage.js similarity index 100% rename from packages/react-storybook/src/server/track_usage.js rename to app/react/src/server/track_usage.js diff --git a/packages/react-storybook/src/server/utils.js b/app/react/src/server/utils.js similarity index 100% rename from packages/react-storybook/src/server/utils.js rename to app/react/src/server/utils.js diff --git a/packages/react-storybook/src/server/utils.test.js b/app/react/src/server/utils.test.js similarity index 100% rename from packages/react-storybook/src/server/utils.test.js rename to app/react/src/server/utils.test.js diff --git a/examples/test-cra/package.json b/examples/test-cra/package.json index baaf33cecf6b..a929ed279ecc 100644 --- a/examples/test-cra/package.json +++ b/examples/test-cra/package.json @@ -16,11 +16,11 @@ }, "devDependencies": { "@storybook/storybook": "file:../../packages/react-storybook", - "@storybook/storybook-addon-actions": "file:../../packages/addon-actions", - "@storybook/storybook-addons": "file:../../packages/addons", - "@storybook/storybook-channel": "file:../../packages/channel", - "@storybook/storybook-channel-postmsg": "file:../../packages/channel-postmessage", - "@storybook/storybook-ui": "file:../../packages/storybook-ui", + "@storybook/addon-actions": "file:../../packages/addon-actions", + "@storybook/addons": "file:../../packages/addons", + "@storybook/channels": "file:../../packages/channel", + "@storybook/channel-postmsg": "file:../../packages/channel-postmessage", + "@storybook/ui": "file:../../packages/storybook-ui", "react-scripts": "0.9.5" }, "private": true diff --git a/lerna.json b/lerna.json index 7636f0f1f8cb..82b9c4046fd0 100644 --- a/lerna.json +++ b/lerna.json @@ -9,7 +9,9 @@ } }, "packages": [ - "packages/*", + "app/*", + "lib/*", + "addons/*", "examples/*" ] } diff --git a/packages/addons/CHANGELOG.md b/lib/addons/CHANGELOG.md similarity index 100% rename from packages/addons/CHANGELOG.md rename to lib/addons/CHANGELOG.md diff --git a/packages/addons/LICENSE b/lib/addons/LICENSE similarity index 100% rename from packages/addons/LICENSE rename to lib/addons/LICENSE diff --git a/packages/addons/README.md b/lib/addons/README.md similarity index 100% rename from packages/addons/README.md rename to lib/addons/README.md diff --git a/packages/addons/package.json b/lib/addons/package.json similarity index 100% rename from packages/addons/package.json rename to lib/addons/package.json diff --git a/packages/addons/src/index.js b/lib/addons/src/index.js similarity index 100% rename from packages/addons/src/index.js rename to lib/addons/src/index.js diff --git a/packages/channel-postmessage/CHANGELOG.md b/lib/channel-postmessage/CHANGELOG.md similarity index 100% rename from packages/channel-postmessage/CHANGELOG.md rename to lib/channel-postmessage/CHANGELOG.md diff --git a/packages/channel-postmessage/README.md b/lib/channel-postmessage/README.md similarity index 81% rename from packages/channel-postmessage/README.md rename to lib/channel-postmessage/README.md index e98e8ff91812..32fc6f1baebd 100644 --- a/packages/channel-postmessage/README.md +++ b/lib/channel-postmessage/README.md @@ -3,6 +3,6 @@ Post Message channel for storybook Storybooks. This channel can be used when the Storybook Renderer runs inside an iframe or a child window. A channel can be created using the `createChannel` function. ```js -import createChannel from '@storybook/storybook-channel-postmsg' +import createChannel from '@storybook/channel-postmsg' const channel = createChannel({ key: 'postmsg-key' }) ``` diff --git a/packages/channel-postmessage/package.json b/lib/channel-postmessage/package.json similarity index 72% rename from packages/channel-postmessage/package.json rename to lib/channel-postmessage/package.json index c601f04bd26b..4091e10c05b2 100644 --- a/packages/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-channel-postmsg", + "name": "@storybook/channel-postmsg", "version": "2.0.1", "description": "", "main": "dist/index.js", @@ -11,7 +11,7 @@ "shelljs": "^0.7.7" }, "dependencies": { - "@storybook/storybook-channel": "*", + "@storybook/channels": "*", "json-stringify-safe": "^5.0.1" } } diff --git a/packages/channel-postmessage/src/index.js b/lib/channel-postmessage/src/index.js similarity index 97% rename from packages/channel-postmessage/src/index.js rename to lib/channel-postmessage/src/index.js index 95497f928888..7f33c58535fe 100644 --- a/packages/channel-postmessage/src/index.js +++ b/lib/channel-postmessage/src/index.js @@ -1,4 +1,4 @@ -import Channel from '@storybook/storybook-channel'; +import Channel from '@storybook/channels'; import stringify from 'json-stringify-safe'; export const KEY = 'storybook-channel'; diff --git a/packages/channel-websocket/CHANGELOG.md b/lib/channel-websocket/CHANGELOG.md similarity index 100% rename from packages/channel-websocket/CHANGELOG.md rename to lib/channel-websocket/CHANGELOG.md diff --git a/packages/channel-websocket/README.md b/lib/channel-websocket/README.md similarity index 82% rename from packages/channel-websocket/README.md rename to lib/channel-websocket/README.md index da488a1d9de0..77db2dd634da 100644 --- a/packages/channel-websocket/README.md +++ b/lib/channel-websocket/README.md @@ -3,6 +3,6 @@ Websocket channel for storybook Storybooks. This channel can be used when the Storybook Renderer should communicate with the Storybook Manager over the network. A channel can be created using the `createChannel` function. ```js -import createChannel from '@storybook/storybook-channel-websocket' +import createChannel from '@storybook/channel-websocket' const channel = createChannel({ url: 'ws://localhost:9001' }) ``` diff --git a/packages/channel-websocket/package.json b/lib/channel-websocket/package.json similarity index 68% rename from packages/channel-websocket/package.json rename to lib/channel-websocket/package.json index 5a8b9c7ad709..8f3838964326 100644 --- a/packages/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-channel-websocket", + "name": "@storybook/channel-websocket", "version": "1.0.1", "description": "", "main": "dist/index.js", @@ -11,6 +11,6 @@ "shelljs": "^0.7.3" }, "dependencies": { - "@storybook/storybook-channel": "^1.0.1" + "@storybook/channels": "^1.0.1" } } diff --git a/packages/channel-websocket/src/index.js b/lib/channel-websocket/src/index.js similarity index 96% rename from packages/channel-websocket/src/index.js rename to lib/channel-websocket/src/index.js index 93252b6f1e0f..c969ca63078f 100644 --- a/packages/channel-websocket/src/index.js +++ b/lib/channel-websocket/src/index.js @@ -1,4 +1,4 @@ -import Channel from '@storybook/storybook-channel'; +import Channel from '@storybook/channels'; export default function createChannel({ url }) { const transport = new WebsocketTransport({ url }); diff --git a/packages/channel/CHANGELOG.md b/lib/channels/CHANGELOG.md similarity index 100% rename from packages/channel/CHANGELOG.md rename to lib/channels/CHANGELOG.md diff --git a/packages/channel/README.md b/lib/channels/README.md similarity index 82% rename from packages/channel/README.md rename to lib/channels/README.md index c6f776eac3d4..c547e34462d7 100644 --- a/packages/channel/README.md +++ b/lib/channels/README.md @@ -27,9 +27,9 @@ Transport { } ``` -Currently, channels are baked into storybook implementations and therefore this module is not designed to be used directly by addon developers. When developing addons, use the `getChannel` method exported by `@storybook/storybook-addons` module. For this to work, Storybook implementations should use the `setChannel` method before loading addons. +Currently, channels are baked into storybook implementations and therefore this module is not designed to be used directly by addon developers. When developing addons, use the `getChannel` method exported by `@storybook/addons` module. For this to work, Storybook implementations should use the `setChannel` method before loading addons. ```js -import addons from '@storybook/storybook-addons' +import addons from '@storybook/addons' const channel = addons.getChannel() ``` diff --git a/packages/channel/package.json b/lib/channels/package.json similarity index 79% rename from packages/channel/package.json rename to lib/channels/package.json index e22bfb274ed5..f67822f6803c 100644 --- a/packages/channel/package.json +++ b/lib/channels/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-channel", + "name": "@storybook/channels", "version": "1.1.0", "description": "", "main": "dist/index.js", diff --git a/packages/channel/src/index.js b/lib/channels/src/index.js similarity index 100% rename from packages/channel/src/index.js rename to lib/channels/src/index.js diff --git a/packages/channel/src/index.test.js b/lib/channels/src/index.test.js similarity index 100% rename from packages/channel/src/index.test.js rename to lib/channels/src/index.test.js diff --git a/packages/getstorybook/CHANGELOG.md b/lib/cli/CHANGELOG.md similarity index 100% rename from packages/getstorybook/CHANGELOG.md rename to lib/cli/CHANGELOG.md diff --git a/packages/react-storybook/LICENSE b/lib/cli/LICENSE similarity index 100% rename from packages/react-storybook/LICENSE rename to lib/cli/LICENSE diff --git a/packages/getstorybook/README.md b/lib/cli/README.md similarity index 100% rename from packages/getstorybook/README.md rename to lib/cli/README.md diff --git a/packages/getstorybook/bin/generate.js b/lib/cli/bin/generate.js similarity index 100% rename from packages/getstorybook/bin/generate.js rename to lib/cli/bin/generate.js diff --git a/packages/getstorybook/docs/getstorybook.png b/lib/cli/docs/getstorybook.png similarity index 100% rename from packages/getstorybook/docs/getstorybook.png rename to lib/cli/docs/getstorybook.png diff --git a/packages/getstorybook/generators/METEOR/index.js b/lib/cli/generators/METEOR/index.js similarity index 100% rename from packages/getstorybook/generators/METEOR/index.js rename to lib/cli/generators/METEOR/index.js diff --git a/packages/getstorybook/generators/METEOR/template/.stories/Button.js b/lib/cli/generators/METEOR/template/.stories/Button.js similarity index 100% rename from packages/getstorybook/generators/METEOR/template/.stories/Button.js rename to lib/cli/generators/METEOR/template/.stories/Button.js diff --git a/packages/getstorybook/generators/METEOR/template/.stories/Welcome.js b/lib/cli/generators/METEOR/template/.stories/Welcome.js similarity index 100% rename from packages/getstorybook/generators/METEOR/template/.stories/Welcome.js rename to lib/cli/generators/METEOR/template/.stories/Welcome.js diff --git a/packages/getstorybook/generators/METEOR/template/.stories/index.js b/lib/cli/generators/METEOR/template/.stories/index.js similarity index 100% rename from packages/getstorybook/generators/METEOR/template/.stories/index.js rename to lib/cli/generators/METEOR/template/.stories/index.js diff --git a/packages/getstorybook/generators/METEOR/template/.storybook/config.js b/lib/cli/generators/METEOR/template/.storybook/config.js similarity index 100% rename from packages/getstorybook/generators/METEOR/template/.storybook/config.js rename to lib/cli/generators/METEOR/template/.storybook/config.js diff --git a/packages/getstorybook/generators/REACT/index.js b/lib/cli/generators/REACT/index.js similarity index 100% rename from packages/getstorybook/generators/REACT/index.js rename to lib/cli/generators/REACT/index.js diff --git a/packages/getstorybook/generators/REACT/template/.storybook/config.js b/lib/cli/generators/REACT/template/.storybook/config.js similarity index 100% rename from packages/getstorybook/generators/REACT/template/.storybook/config.js rename to lib/cli/generators/REACT/template/.storybook/config.js diff --git a/packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/Button.js b/lib/cli/generators/REACT/template/stories/Button.js similarity index 100% rename from packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/Button.js rename to lib/cli/generators/REACT/template/stories/Button.js diff --git a/packages/getstorybook/generators/REACT/template/stories/Welcome.js b/lib/cli/generators/REACT/template/stories/Welcome.js similarity index 100% rename from packages/getstorybook/generators/REACT/template/stories/Welcome.js rename to lib/cli/generators/REACT/template/stories/Welcome.js diff --git a/packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/index.js b/lib/cli/generators/REACT/template/stories/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/index.js rename to lib/cli/generators/REACT/template/stories/index.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/index.js b/lib/cli/generators/REACT_NATIVE/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/index.js rename to lib/cli/generators/REACT_NATIVE/index.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/addons.js b/lib/cli/generators/REACT_NATIVE/template/storybook/addons.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/addons.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/addons.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/index.android.js b/lib/cli/generators/REACT_NATIVE/template/storybook/index.android.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/index.android.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/index.android.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/index.ios.js b/lib/cli/generators/REACT_NATIVE/template/storybook/index.ios.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/index.ios.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/index.ios.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.android.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/Button/index.ios.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/index.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/CenterView/style.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/style.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/CenterView/style.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/CenterView/style.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/Welcome/index.js diff --git a/packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/index.js b/lib/cli/generators/REACT_NATIVE/template/storybook/stories/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_NATIVE/template/storybook/stories/index.js rename to lib/cli/generators/REACT_NATIVE/template/storybook/stories/index.js diff --git a/packages/getstorybook/generators/REACT_SCRIPTS/index.js b/lib/cli/generators/REACT_SCRIPTS/index.js similarity index 100% rename from packages/getstorybook/generators/REACT_SCRIPTS/index.js rename to lib/cli/generators/REACT_SCRIPTS/index.js diff --git a/packages/react-storybook/demo/.storybook/config.js b/lib/cli/generators/REACT_SCRIPTS/template/.storybook/config.js similarity index 100% rename from packages/react-storybook/demo/.storybook/config.js rename to lib/cli/generators/REACT_SCRIPTS/template/.storybook/config.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/template/stories/Button.js b/lib/cli/generators/REACT_SCRIPTS/template/src/stories/Button.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/template/stories/Button.js rename to lib/cli/generators/REACT_SCRIPTS/template/src/stories/Button.js diff --git a/packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/Welcome.js b/lib/cli/generators/REACT_SCRIPTS/template/src/stories/Welcome.js similarity index 100% rename from packages/getstorybook/generators/REACT_SCRIPTS/template/src/stories/Welcome.js rename to lib/cli/generators/REACT_SCRIPTS/template/src/stories/Welcome.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/template/stories/index.js b/lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/template/stories/index.js rename to lib/cli/generators/REACT_SCRIPTS/template/src/stories/index.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/index.js b/lib/cli/generators/WEBPACK_REACT/index.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/index.js rename to lib/cli/generators/WEBPACK_REACT/index.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/template/.storybook/config.js b/lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/template/.storybook/config.js rename to lib/cli/generators/WEBPACK_REACT/template/.storybook/config.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/template/.storybook/webpack.config.js b/lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/template/.storybook/webpack.config.js rename to lib/cli/generators/WEBPACK_REACT/template/.storybook/webpack.config.js diff --git a/packages/react-storybook/demo/src/stories/Button.js b/lib/cli/generators/WEBPACK_REACT/template/stories/Button.js similarity index 100% rename from packages/react-storybook/demo/src/stories/Button.js rename to lib/cli/generators/WEBPACK_REACT/template/stories/Button.js diff --git a/packages/getstorybook/generators/WEBPACK_REACT/template/stories/Welcome.js b/lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js similarity index 100% rename from packages/getstorybook/generators/WEBPACK_REACT/template/stories/Welcome.js rename to lib/cli/generators/WEBPACK_REACT/template/stories/Welcome.js diff --git a/packages/react-storybook/demo/src/stories/index.js b/lib/cli/generators/WEBPACK_REACT/template/stories/index.js similarity index 100% rename from packages/react-storybook/demo/src/stories/index.js rename to lib/cli/generators/WEBPACK_REACT/template/stories/index.js diff --git a/packages/getstorybook/lib/detect.js b/lib/cli/lib/detect.js similarity index 100% rename from packages/getstorybook/lib/detect.js rename to lib/cli/lib/detect.js diff --git a/packages/getstorybook/lib/has_yarn.js b/lib/cli/lib/has_yarn.js similarity index 100% rename from packages/getstorybook/lib/has_yarn.js rename to lib/cli/lib/has_yarn.js diff --git a/packages/getstorybook/lib/helpers.js b/lib/cli/lib/helpers.js similarity index 100% rename from packages/getstorybook/lib/helpers.js rename to lib/cli/lib/helpers.js diff --git a/packages/getstorybook/lib/project_types.js b/lib/cli/lib/project_types.js similarity index 100% rename from packages/getstorybook/lib/project_types.js rename to lib/cli/lib/project_types.js diff --git a/packages/getstorybook/package.json b/lib/cli/package.json similarity index 96% rename from packages/getstorybook/package.json rename to lib/cli/package.json index b2e2a77ed696..cdd96b314743 100644 --- a/packages/getstorybook/package.json +++ b/lib/cli/package.json @@ -1,5 +1,5 @@ { - "name": "getstorybook", + "name": "@storybook/cli", "version": "1.7.0", "description": "Easiest way to add Storybook support to your project.", "bin": { diff --git a/packages/codemod/README.md b/lib/codemod/README.md similarity index 100% rename from packages/codemod/README.md rename to lib/codemod/README.md diff --git a/packages/codemod/package.json b/lib/codemod/package.json similarity index 100% rename from packages/codemod/package.json rename to lib/codemod/package.json diff --git a/packages/codemod/src/index.js b/lib/codemod/src/index.js similarity index 100% rename from packages/codemod/src/index.js rename to lib/codemod/src/index.js diff --git a/packages/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js similarity index 100% rename from packages/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js rename to lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.input.js diff --git a/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js new file mode 100644 index 000000000000..028a462b5697 --- /dev/null +++ b/lib/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js @@ -0,0 +1,5 @@ +/* eslint-disable */ +import '@storybook/addon-knobs/register'; +import '@storybook/addon-options/register'; +import '@storybook/addons'; +import { storiesOf } from '@storybook/storybook'; diff --git a/packages/codemod/src/transforms/__tests__/update-organisation-name.test.js b/lib/codemod/src/transforms/__tests__/update-organisation-name.test.js similarity index 100% rename from packages/codemod/src/transforms/__tests__/update-organisation-name.test.js rename to lib/codemod/src/transforms/__tests__/update-organisation-name.test.js diff --git a/packages/codemod/src/transforms/update-organisation-name.js b/lib/codemod/src/transforms/update-organisation-name.js similarity index 100% rename from packages/codemod/src/transforms/update-organisation-name.js rename to lib/codemod/src/transforms/update-organisation-name.js diff --git a/packages/storyshots/.babelrc b/lib/storyshots/.babelrc similarity index 100% rename from packages/storyshots/.babelrc rename to lib/storyshots/.babelrc diff --git a/packages/storybook-ui/.npmignore b/lib/storyshots/.npmignore similarity index 100% rename from packages/storybook-ui/.npmignore rename to lib/storyshots/.npmignore diff --git a/packages/storyshots/.storybook/config.js b/lib/storyshots/.storybook/config.js similarity index 100% rename from packages/storyshots/.storybook/config.js rename to lib/storyshots/.storybook/config.js diff --git a/packages/storyshots/CHANGELOG.md b/lib/storyshots/CHANGELOG.md similarity index 100% rename from packages/storyshots/CHANGELOG.md rename to lib/storyshots/CHANGELOG.md diff --git a/packages/storyshots/LICENSE b/lib/storyshots/LICENSE similarity index 100% rename from packages/storyshots/LICENSE rename to lib/storyshots/LICENSE diff --git a/packages/storyshots/README.md b/lib/storyshots/README.md similarity index 100% rename from packages/storyshots/README.md rename to lib/storyshots/README.md diff --git a/packages/storyshots/docs/storyshots-fail.png b/lib/storyshots/docs/storyshots-fail.png similarity index 100% rename from packages/storyshots/docs/storyshots-fail.png rename to lib/storyshots/docs/storyshots-fail.png diff --git a/packages/storyshots/docs/storyshots.png b/lib/storyshots/docs/storyshots.png similarity index 100% rename from packages/storyshots/docs/storyshots.png rename to lib/storyshots/docs/storyshots.png diff --git a/packages/storyshots/package.json b/lib/storyshots/package.json similarity index 91% rename from packages/storyshots/package.json rename to lib/storyshots/package.json index f10f82419048..484efa5076d3 100644 --- a/packages/storyshots/package.json +++ b/lib/storyshots/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "@storybook/storybook": "*", - "@storybook/storybook-addons": "*", - "@storybook/storybook-channel": "*", + "@storybook/addons": "*", + "@storybook/channels": "*", "babel-runtime": "^6.20.0", "prop-types": "^15.5.7", "read-pkg-up": "^2.0.0" diff --git a/packages/storyshots/src/index.js b/lib/storyshots/src/index.js similarity index 98% rename from packages/storyshots/src/index.js rename to lib/storyshots/src/index.js index c2d3b1414a24..c08dffc2e738 100644 --- a/packages/storyshots/src/index.js +++ b/lib/storyshots/src/index.js @@ -1,7 +1,7 @@ import renderer from 'react-test-renderer'; import path from 'path'; import readPkgUp from 'read-pkg-up'; -import addons from '@storybook/storybook-addons'; +import addons from '@storybook/addons'; import runWithRequireContext from './require_context'; import createChannel from './storybook-channel-mock'; const { describe, it, expect } = global; diff --git a/packages/storyshots/src/require_context.js b/lib/storyshots/src/require_context.js similarity index 100% rename from packages/storyshots/src/require_context.js rename to lib/storyshots/src/require_context.js diff --git a/packages/storyshots/src/storybook-channel-mock.js b/lib/storyshots/src/storybook-channel-mock.js similarity index 75% rename from packages/storyshots/src/storybook-channel-mock.js rename to lib/storyshots/src/storybook-channel-mock.js index c6e739158e39..7358fc7e4bef 100644 --- a/packages/storyshots/src/storybook-channel-mock.js +++ b/lib/storyshots/src/storybook-channel-mock.js @@ -1,4 +1,4 @@ -import Channel from '@storybook/storybook-channel'; +import Channel from '@storybook/channels'; export default function createChannel() { const transport = { diff --git a/packages/storyshots/stories/directly_required/Button.js b/lib/storyshots/stories/directly_required/Button.js similarity index 100% rename from packages/storyshots/stories/directly_required/Button.js rename to lib/storyshots/stories/directly_required/Button.js diff --git a/packages/storyshots/stories/directly_required/index.js b/lib/storyshots/stories/directly_required/index.js similarity index 100% rename from packages/storyshots/stories/directly_required/index.js rename to lib/storyshots/stories/directly_required/index.js diff --git a/packages/storyshots/stories/required_with_context/Button.js b/lib/storyshots/stories/required_with_context/Button.js similarity index 100% rename from packages/storyshots/stories/required_with_context/Button.js rename to lib/storyshots/stories/required_with_context/Button.js diff --git a/packages/storyshots/stories/required_with_context/Button.stories.js b/lib/storyshots/stories/required_with_context/Button.stories.js similarity index 100% rename from packages/storyshots/stories/required_with_context/Button.stories.js rename to lib/storyshots/stories/required_with_context/Button.stories.js diff --git a/packages/storyshots/stories/required_with_context/Welcome.js b/lib/storyshots/stories/required_with_context/Welcome.js similarity index 100% rename from packages/storyshots/stories/required_with_context/Welcome.js rename to lib/storyshots/stories/required_with_context/Welcome.js diff --git a/packages/storyshots/stories/required_with_context/Welcome.stories.js b/lib/storyshots/stories/required_with_context/Welcome.stories.js similarity index 100% rename from packages/storyshots/stories/required_with_context/Welcome.stories.js rename to lib/storyshots/stories/required_with_context/Welcome.stories.js diff --git a/packages/storyshots/.npmignore b/lib/ui/.npmignore similarity index 100% rename from packages/storyshots/.npmignore rename to lib/ui/.npmignore diff --git a/packages/storybook-ui/CHANGELOG.md b/lib/ui/CHANGELOG.md similarity index 100% rename from packages/storybook-ui/CHANGELOG.md rename to lib/ui/CHANGELOG.md diff --git a/packages/storybook-ui/LICENSE b/lib/ui/LICENSE similarity index 100% rename from packages/storybook-ui/LICENSE rename to lib/ui/LICENSE diff --git a/packages/storybook-ui/README.md b/lib/ui/README.md similarity index 95% rename from packages/storybook-ui/README.md rename to lib/ui/README.md index c58c0980b3b5..08dceab6f929 100644 --- a/packages/storybook-ui/README.md +++ b/lib/ui/README.md @@ -6,17 +6,17 @@ This is the core UI of [react-storybook](https://github.com/storybooks/storybook ## Usage -First you need to install `@storybook/storybook-ui` into your app. +First you need to install `@storybook/ui` into your app. ```sh -npm i --save @storybook/storybook-ui +npm i --save @storybook/ui ``` Then you need to create a Provider class like this: ```js // provider.js -import { Provider } from '@storybook/storybook-ui'; +import { Provider } from '@storybook/ui'; import React from 'react'; export default class MyProvider extends Provider { @@ -40,7 +40,7 @@ Then you need to initialize the UI like this: ```js import Provider from './provider'; -import renderStorybookUI from '@storybook/storybook-ui'; +import renderStorybookUI from '@storybook/ui'; const roolEl = document.getElementById('root'); renderStorybookUI(roolEl, new Provider()); diff --git a/packages/storybook-ui/docs/simple-ui.png b/lib/ui/docs/simple-ui.png similarity index 100% rename from packages/storybook-ui/docs/simple-ui.png rename to lib/ui/docs/simple-ui.png diff --git a/packages/storybook-ui/docs/storybook-ui-demo.png b/lib/ui/docs/storybook-ui-demo.png similarity index 100% rename from packages/storybook-ui/docs/storybook-ui-demo.png rename to lib/ui/docs/storybook-ui-demo.png diff --git a/packages/storybook-ui/example/README.md b/lib/ui/example/README.md similarity index 100% rename from packages/storybook-ui/example/README.md rename to lib/ui/example/README.md diff --git a/packages/storybook-ui/example/client/index.js b/lib/ui/example/client/index.js similarity index 100% rename from packages/storybook-ui/example/client/index.js rename to lib/ui/example/client/index.js diff --git a/packages/storybook-ui/example/client/preview.js b/lib/ui/example/client/preview.js similarity index 100% rename from packages/storybook-ui/example/client/preview.js rename to lib/ui/example/client/preview.js diff --git a/packages/storybook-ui/example/client/provider.js b/lib/ui/example/client/provider.js similarity index 100% rename from packages/storybook-ui/example/client/provider.js rename to lib/ui/example/client/provider.js diff --git a/packages/storybook-ui/example/index.html b/lib/ui/example/index.html similarity index 100% rename from packages/storybook-ui/example/index.html rename to lib/ui/example/index.html diff --git a/packages/storybook-ui/example/package.json b/lib/ui/example/package.json similarity index 100% rename from packages/storybook-ui/example/package.json rename to lib/ui/example/package.json diff --git a/packages/storybook-ui/example/server.js b/lib/ui/example/server.js similarity index 100% rename from packages/storybook-ui/example/server.js rename to lib/ui/example/server.js diff --git a/packages/storybook-ui/example/webpack.config.js b/lib/ui/example/webpack.config.js similarity index 100% rename from packages/storybook-ui/example/webpack.config.js rename to lib/ui/example/webpack.config.js diff --git a/packages/storybook-ui/package.json b/lib/ui/package.json similarity index 96% rename from packages/storybook-ui/package.json rename to lib/ui/package.json index 8957511bee2e..02e058f825c8 100644 --- a/packages/storybook-ui/package.json +++ b/lib/ui/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/storybook-ui", + "name": "@storybook/ui", "version": "3.10.1", "description": "Core Storybook UI", "repository": { diff --git a/packages/storybook-ui/src/__tests__/index.js b/lib/ui/src/__tests__/index.js similarity index 100% rename from packages/storybook-ui/src/__tests__/index.js rename to lib/ui/src/__tests__/index.js diff --git a/packages/storybook-ui/src/compose.js b/lib/ui/src/compose.js similarity index 100% rename from packages/storybook-ui/src/compose.js rename to lib/ui/src/compose.js diff --git a/packages/storybook-ui/src/context.js b/lib/ui/src/context.js similarity index 100% rename from packages/storybook-ui/src/context.js rename to lib/ui/src/context.js diff --git a/packages/storybook-ui/src/index.js b/lib/ui/src/index.js similarity index 100% rename from packages/storybook-ui/src/index.js rename to lib/ui/src/index.js diff --git a/packages/storybook-ui/src/libs/key_events.js b/lib/ui/src/libs/key_events.js similarity index 100% rename from packages/storybook-ui/src/libs/key_events.js rename to lib/ui/src/libs/key_events.js diff --git a/packages/storybook-ui/src/modules/api/actions/api.js b/lib/ui/src/modules/api/actions/api.js similarity index 100% rename from packages/storybook-ui/src/modules/api/actions/api.js rename to lib/ui/src/modules/api/actions/api.js diff --git a/packages/storybook-ui/src/modules/api/actions/api.test.js b/lib/ui/src/modules/api/actions/api.test.js similarity index 100% rename from packages/storybook-ui/src/modules/api/actions/api.test.js rename to lib/ui/src/modules/api/actions/api.test.js diff --git a/packages/storybook-ui/src/modules/api/actions/index.js b/lib/ui/src/modules/api/actions/index.js similarity index 100% rename from packages/storybook-ui/src/modules/api/actions/index.js rename to lib/ui/src/modules/api/actions/index.js diff --git a/packages/storybook-ui/src/modules/api/configs/init_api.js b/lib/ui/src/modules/api/configs/init_api.js similarity index 100% rename from packages/storybook-ui/src/modules/api/configs/init_api.js rename to lib/ui/src/modules/api/configs/init_api.js diff --git a/packages/storybook-ui/src/modules/api/configs/init_api.test.js b/lib/ui/src/modules/api/configs/init_api.test.js similarity index 100% rename from packages/storybook-ui/src/modules/api/configs/init_api.test.js rename to lib/ui/src/modules/api/configs/init_api.test.js diff --git a/packages/storybook-ui/src/modules/api/index.js b/lib/ui/src/modules/api/index.js similarity index 100% rename from packages/storybook-ui/src/modules/api/index.js rename to lib/ui/src/modules/api/index.js diff --git a/packages/storybook-ui/src/modules/shortcuts/actions/index.js b/lib/ui/src/modules/shortcuts/actions/index.js similarity index 100% rename from packages/storybook-ui/src/modules/shortcuts/actions/index.js rename to lib/ui/src/modules/shortcuts/actions/index.js diff --git a/packages/storybook-ui/src/modules/shortcuts/actions/shortcuts.js b/lib/ui/src/modules/shortcuts/actions/shortcuts.js similarity index 100% rename from packages/storybook-ui/src/modules/shortcuts/actions/shortcuts.js rename to lib/ui/src/modules/shortcuts/actions/shortcuts.js diff --git a/packages/storybook-ui/src/modules/shortcuts/actions/shortcuts.test.js b/lib/ui/src/modules/shortcuts/actions/shortcuts.test.js similarity index 100% rename from packages/storybook-ui/src/modules/shortcuts/actions/shortcuts.test.js rename to lib/ui/src/modules/shortcuts/actions/shortcuts.test.js diff --git a/packages/storybook-ui/src/modules/shortcuts/index.js b/lib/ui/src/modules/shortcuts/index.js similarity index 100% rename from packages/storybook-ui/src/modules/shortcuts/index.js rename to lib/ui/src/modules/shortcuts/index.js diff --git a/packages/storybook-ui/src/modules/ui/actions/index.js b/lib/ui/src/modules/ui/actions/index.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/actions/index.js rename to lib/ui/src/modules/ui/actions/index.js diff --git a/packages/storybook-ui/src/modules/ui/actions/ui.js b/lib/ui/src/modules/ui/actions/ui.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/actions/ui.js rename to lib/ui/src/modules/ui/actions/ui.js diff --git a/packages/storybook-ui/src/modules/ui/actions/ui.test.js b/lib/ui/src/modules/ui/actions/ui.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/actions/ui.test.js rename to lib/ui/src/modules/ui/actions/ui.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/down_panel/index.js b/lib/ui/src/modules/ui/components/down_panel/index.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/down_panel/index.js rename to lib/ui/src/modules/ui/components/down_panel/index.js diff --git a/packages/storybook-ui/src/modules/ui/components/down_panel/index.test.js b/lib/ui/src/modules/ui/components/down_panel/index.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/down_panel/index.test.js rename to lib/ui/src/modules/ui/components/down_panel/index.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/down_panel/style.js b/lib/ui/src/modules/ui/components/down_panel/style.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/down_panel/style.js rename to lib/ui/src/modules/ui/components/down_panel/style.js diff --git a/packages/storybook-ui/src/modules/ui/components/layout/dimensions.js b/lib/ui/src/modules/ui/components/layout/dimensions.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/layout/dimensions.js rename to lib/ui/src/modules/ui/components/layout/dimensions.js diff --git a/packages/storybook-ui/src/modules/ui/components/layout/index.js b/lib/ui/src/modules/ui/components/layout/index.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/layout/index.js rename to lib/ui/src/modules/ui/components/layout/index.js diff --git a/packages/storybook-ui/src/modules/ui/components/layout/index.test.js b/lib/ui/src/modules/ui/components/layout/index.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/layout/index.test.js rename to lib/ui/src/modules/ui/components/layout/index.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/layout/usplit.js b/lib/ui/src/modules/ui/components/layout/usplit.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/layout/usplit.js rename to lib/ui/src/modules/ui/components/layout/usplit.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/header.js b/lib/ui/src/modules/ui/components/left_panel/header.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/header.js rename to lib/ui/src/modules/ui/components/left_panel/header.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/header.test.js b/lib/ui/src/modules/ui/components/left_panel/header.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/header.test.js rename to lib/ui/src/modules/ui/components/left_panel/header.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/index.js b/lib/ui/src/modules/ui/components/left_panel/index.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/index.js rename to lib/ui/src/modules/ui/components/left_panel/index.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/index.test.js b/lib/ui/src/modules/ui/components/left_panel/index.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/index.test.js rename to lib/ui/src/modules/ui/components/left_panel/index.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/stories.js b/lib/ui/src/modules/ui/components/left_panel/stories.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/stories.js rename to lib/ui/src/modules/ui/components/left_panel/stories.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/stories.test.js b/lib/ui/src/modules/ui/components/left_panel/stories.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/stories.test.js rename to lib/ui/src/modules/ui/components/left_panel/stories.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/text_filter.js b/lib/ui/src/modules/ui/components/left_panel/text_filter.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/text_filter.js rename to lib/ui/src/modules/ui/components/left_panel/text_filter.js diff --git a/packages/storybook-ui/src/modules/ui/components/left_panel/text_filter.test.js b/lib/ui/src/modules/ui/components/left_panel/text_filter.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/left_panel/text_filter.test.js rename to lib/ui/src/modules/ui/components/left_panel/text_filter.test.js diff --git a/packages/storybook-ui/src/modules/ui/components/search_box.js b/lib/ui/src/modules/ui/components/search_box.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/search_box.js rename to lib/ui/src/modules/ui/components/search_box.js diff --git a/packages/storybook-ui/src/modules/ui/components/shortcuts_help.js b/lib/ui/src/modules/ui/components/shortcuts_help.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/shortcuts_help.js rename to lib/ui/src/modules/ui/components/shortcuts_help.js diff --git a/packages/storybook-ui/src/modules/ui/components/theme.js b/lib/ui/src/modules/ui/components/theme.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/components/theme.js rename to lib/ui/src/modules/ui/components/theme.js diff --git a/packages/storybook-ui/src/modules/ui/configs/handle_keyevents.js b/lib/ui/src/modules/ui/configs/handle_keyevents.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/handle_keyevents.js rename to lib/ui/src/modules/ui/configs/handle_keyevents.js diff --git a/packages/storybook-ui/src/modules/ui/configs/handle_keyevents.test.js b/lib/ui/src/modules/ui/configs/handle_keyevents.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/handle_keyevents.test.js rename to lib/ui/src/modules/ui/configs/handle_keyevents.test.js diff --git a/packages/storybook-ui/src/modules/ui/configs/handle_routing.js b/lib/ui/src/modules/ui/configs/handle_routing.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/handle_routing.js rename to lib/ui/src/modules/ui/configs/handle_routing.js diff --git a/packages/storybook-ui/src/modules/ui/configs/handle_routing.test.js b/lib/ui/src/modules/ui/configs/handle_routing.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/handle_routing.test.js rename to lib/ui/src/modules/ui/configs/handle_routing.test.js diff --git a/packages/storybook-ui/src/modules/ui/configs/init_panels.js b/lib/ui/src/modules/ui/configs/init_panels.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/init_panels.js rename to lib/ui/src/modules/ui/configs/init_panels.js diff --git a/packages/storybook-ui/src/modules/ui/configs/init_panels.test.js b/lib/ui/src/modules/ui/configs/init_panels.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/configs/init_panels.test.js rename to lib/ui/src/modules/ui/configs/init_panels.test.js diff --git a/packages/storybook-ui/src/modules/ui/containers/down_panel.js b/lib/ui/src/modules/ui/containers/down_panel.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/down_panel.js rename to lib/ui/src/modules/ui/containers/down_panel.js diff --git a/packages/storybook-ui/src/modules/ui/containers/down_panel.test.js b/lib/ui/src/modules/ui/containers/down_panel.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/down_panel.test.js rename to lib/ui/src/modules/ui/containers/down_panel.test.js diff --git a/packages/storybook-ui/src/modules/ui/containers/layout.js b/lib/ui/src/modules/ui/containers/layout.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/layout.js rename to lib/ui/src/modules/ui/containers/layout.js diff --git a/packages/storybook-ui/src/modules/ui/containers/layout.test.js b/lib/ui/src/modules/ui/containers/layout.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/layout.test.js rename to lib/ui/src/modules/ui/containers/layout.test.js diff --git a/packages/storybook-ui/src/modules/ui/containers/left_panel.js b/lib/ui/src/modules/ui/containers/left_panel.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/left_panel.js rename to lib/ui/src/modules/ui/containers/left_panel.js diff --git a/packages/storybook-ui/src/modules/ui/containers/left_panel.test.js b/lib/ui/src/modules/ui/containers/left_panel.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/left_panel.test.js rename to lib/ui/src/modules/ui/containers/left_panel.test.js diff --git a/packages/storybook-ui/src/modules/ui/containers/search_box.js b/lib/ui/src/modules/ui/containers/search_box.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/search_box.js rename to lib/ui/src/modules/ui/containers/search_box.js diff --git a/packages/storybook-ui/src/modules/ui/containers/shortcuts_help.js b/lib/ui/src/modules/ui/containers/shortcuts_help.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/shortcuts_help.js rename to lib/ui/src/modules/ui/containers/shortcuts_help.js diff --git a/packages/storybook-ui/src/modules/ui/containers/shortcuts_help.test.js b/lib/ui/src/modules/ui/containers/shortcuts_help.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/containers/shortcuts_help.test.js rename to lib/ui/src/modules/ui/containers/shortcuts_help.test.js diff --git a/packages/storybook-ui/src/modules/ui/index.js b/lib/ui/src/modules/ui/index.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/index.js rename to lib/ui/src/modules/ui/index.js diff --git a/packages/storybook-ui/src/modules/ui/libs/filters.js b/lib/ui/src/modules/ui/libs/filters.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/libs/filters.js rename to lib/ui/src/modules/ui/libs/filters.js diff --git a/packages/storybook-ui/src/modules/ui/libs/filters.test.js b/lib/ui/src/modules/ui/libs/filters.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/libs/filters.test.js rename to lib/ui/src/modules/ui/libs/filters.test.js diff --git a/packages/storybook-ui/src/modules/ui/libs/gen_podda_loader.js b/lib/ui/src/modules/ui/libs/gen_podda_loader.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/libs/gen_podda_loader.js rename to lib/ui/src/modules/ui/libs/gen_podda_loader.js diff --git a/packages/storybook-ui/src/modules/ui/libs/gen_podda_loader.test.js b/lib/ui/src/modules/ui/libs/gen_podda_loader.test.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/libs/gen_podda_loader.test.js rename to lib/ui/src/modules/ui/libs/gen_podda_loader.test.js diff --git a/packages/storybook-ui/src/modules/ui/routes.js b/lib/ui/src/modules/ui/routes.js similarity index 100% rename from packages/storybook-ui/src/modules/ui/routes.js rename to lib/ui/src/modules/ui/routes.js diff --git a/packages/addon-knobs/.storybook/addons.js b/packages/addon-knobs/.storybook/addons.js deleted file mode 100644 index 955eef289197..000000000000 --- a/packages/addon-knobs/.storybook/addons.js +++ /dev/null @@ -1,2 +0,0 @@ -import '../src/register'; -import '@storybook/storybook/addons' diff --git a/packages/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js b/packages/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js deleted file mode 100644 index efc7a34c91e1..000000000000 --- a/packages/codemod/src/transforms/__testfixtures__/update-organisation-name/update-organisation-name.output.js +++ /dev/null @@ -1,5 +0,0 @@ -/* eslint-disable */ -import '@storybook/storybook-addon-knobs/register'; -import '@storybook/storybook-addon-options/register'; -import '@storybook/storybook/addons'; -import { storiesOf } from '@storybook/storybook'; \ No newline at end of file diff --git a/packages/react-native-storybook/src/server/addons.js b/packages/react-native-storybook/src/server/addons.js deleted file mode 100644 index 06b309cde7b7..000000000000 --- a/packages/react-native-storybook/src/server/addons.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@storybook/storybook-addon-actions/register'; -import '@storybook/storybook-addon-links/register'; diff --git a/packages/react-storybook/src/server/addons.js b/packages/react-storybook/src/server/addons.js deleted file mode 100644 index 06b309cde7b7..000000000000 --- a/packages/react-storybook/src/server/addons.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@storybook/storybook-addon-actions/register'; -import '@storybook/storybook-addon-links/register';