From 56f96a6ccb42ba3f373886d25c6316763bedec67 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Thu, 22 Jun 2017 19:35:04 +0200 Subject: [PATCH 01/30] remove typings for @storybook/addon-knobs, references https://github.com/DefinitelyTyped/DefinitelyTyped/issues/17399 --- addons/knobs/package.json | 1 - addons/knobs/storybook-addon-knobs.d.ts | 46 ------------------------- 2 files changed, 47 deletions(-) delete mode 100644 addons/knobs/storybook-addon-knobs.d.ts diff --git a/addons/knobs/package.json b/addons/knobs/package.json index df474f9e00f..ccbecb4eb19 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -4,7 +4,6 @@ "description": "Storybook Addon Prop Editor Component", "license": "MIT", "main": "dist/index.js", - "typings": "./storybook-addon-knobs.d.ts", "repository": { "type": "git", "url": "https://github.com/storybooks/storybook.git" diff --git a/addons/knobs/storybook-addon-knobs.d.ts b/addons/knobs/storybook-addon-knobs.d.ts deleted file mode 100644 index 37d0f8e751d..00000000000 --- a/addons/knobs/storybook-addon-knobs.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import * as React from 'react'; - -interface KnobOption { - value: T, - type: 'text' | 'boolean' | 'number' | 'color' | 'object' | 'select' | 'date', -} - -interface StoryContext { - kind: string, - story: string, -} - -interface NumberOptions { - range: boolean, - min: number, - max: number, - step: number, -} - -export function knob(name: string, options: KnobOption): T; - -export function text(name: string, value: string | null): string; - -export function boolean(name: string, value: boolean): boolean; - -export function number(name: string, value: number, options?: NumberOptions): number; - -export function color(name: string, value: string): string; - -export function object(name: string, value: T): T; - -export function select(name: string, options: { [s: string]: T }, value: string): T; -export function select(name: string, options: string[], value: string): string; - -export function date(name: string, value?: Date): Date; - -interface IWrapStoryProps { - context?: Object; - storyFn?: Function; - channel?: Object; - knobStore?: Object; - initialContent?: Object; -} - -export function withKnobs(storyFn: Function, context: StoryContext): React.ReactElement; -export function withKnobsOptions(options: Object): (storyFn: Function, context: StoryContext) => React.ReactElement; From e9a2ec81eae31a0fee252201b6bb01ee2d90b66f Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Fri, 23 Jun 2017 00:55:51 +0200 Subject: [PATCH 02/30] remove typings for @storybook/addon-links, references https://github.com/DefinitelyTyped/DefinitelyTyped/issues/17406 --- addons/links/package.json | 1 - addons/links/storybook-addon-links.d.ts | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 addons/links/storybook-addon-links.d.ts diff --git a/addons/links/package.json b/addons/links/package.json index 0df5bfed2db..2aff6b5ff39 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -11,7 +11,6 @@ }, "license": "MIT", "main": "dist/index.js", - "typings": "./storybook-addon-links.d.ts", "repository": { "type": "git", "url": "https://github.com/storybooks/storybook.git" diff --git a/addons/links/storybook-addon-links.d.ts b/addons/links/storybook-addon-links.d.ts deleted file mode 100644 index d1b3a01bf2e..00000000000 --- a/addons/links/storybook-addon-links.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import * as React from 'react'; - -export function linkTo(book: string, kind?: string): React.MouseEventHandler; From 64e9c1edb8e4fc71aab23f066bef37d04c0409b5 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Fri, 23 Jun 2017 01:11:09 +0200 Subject: [PATCH 03/30] remove typings for @storybook/addon-options, references https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17408 --- addons/options/package.json | 1 - addons/options/storybook-addon-options.d.ts | 12 ------------ 2 files changed, 13 deletions(-) delete mode 100644 addons/options/storybook-addon-options.d.ts diff --git a/addons/options/package.json b/addons/options/package.json index 00e9326bffd..f49d2e675b3 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -11,7 +11,6 @@ }, "license": "MIT", "main": "preview.js", - "typings": "./storybook-addon-options.d.ts", "repository": { "type": "git", "url": "https://github.com/storybooks/storybook.git" diff --git a/addons/options/storybook-addon-options.d.ts b/addons/options/storybook-addon-options.d.ts deleted file mode 100644 index 5efbcead76e..00000000000 --- a/addons/options/storybook-addon-options.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -interface Options { - name?: string; - url?: string; - goFullScreen?: boolean; - showLeftPanel?: boolean; - showDownPanel?: boolean; - showSearchBox?: boolean; - downPanelInRight?: boolean; - sortStoriesByKind?: boolean; -} - -export function setOptions(options: Options): void; From f4b3df3057785257a3b769c1ee805e522d012467 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Fri, 23 Jun 2017 01:26:20 +0200 Subject: [PATCH 04/30] remove typings for @storybook/addon-notes, references https://github.com/DefinitelyTyped/DefinitelyTyped/pull/17409 --- addons/notes/storybook-addon-notes.d.ts | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 addons/notes/storybook-addon-notes.d.ts diff --git a/addons/notes/storybook-addon-notes.d.ts b/addons/notes/storybook-addon-notes.d.ts deleted file mode 100644 index fdfdaa91808..00000000000 --- a/addons/notes/storybook-addon-notes.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as React from 'react'; - -export interface WithNotesProps extends React.HTMLProps { - notes?: string; -} - -export const WithNotes: React.StatelessComponent; From d8fb7943622d86c0c6aa6e6736f8d8e4a53323c1 Mon Sep 17 00:00:00 2001 From: Marc Fallows Date: Fri, 23 Jun 2017 13:37:02 +1000 Subject: [PATCH 05/30] Use uuid for action IDs instead of Math.random (fixes #1109) --- addons/actions/package.json | 3 ++- addons/actions/src/preview.js | 5 +++-- addons/actions/src/preview.test.js | 27 +++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 addons/actions/src/preview.test.js diff --git a/addons/actions/package.json b/addons/actions/package.json index f01a34fe71d..36fe1213090 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -25,7 +25,8 @@ "deep-equal": "^1.0.1", "json-stringify-safe": "^5.0.1", "prop-types": "^15.5.8", - "react-inspector": "^2.0.0" + "react-inspector": "^2.0.0", + "uuid": "^3.1.0" }, "devDependencies": { "react": "^15.5.4", diff --git a/addons/actions/src/preview.js b/addons/actions/src/preview.js index 0e8a0a85d7d..7eece2d95cb 100644 --- a/addons/actions/src/preview.js +++ b/addons/actions/src/preview.js @@ -2,6 +2,7 @@ import addons from '@storybook/addons'; import stringify from 'json-stringify-safe'; +import uuid from 'uuid/v1'; import { EVENT_ID } from './'; function _format(arg) { @@ -16,9 +17,9 @@ export function action(name) { const handler = function(..._args) { const args = Array.from(_args).map(_format); const channel = addons.getChannel(); - const randomId = Math.random().toString(16).slice(2); + const id = uuid(); channel.emit(EVENT_ID, { - id: randomId, + id, data: { name, args }, }); }; diff --git a/addons/actions/src/preview.test.js b/addons/actions/src/preview.test.js new file mode 100644 index 00000000000..be8154c2971 --- /dev/null +++ b/addons/actions/src/preview.test.js @@ -0,0 +1,27 @@ +import addons from '@storybook/addons'; +import uuid from 'uuid/v1'; +import { action } from './preview'; + +jest.mock('uuid/v1'); +jest.mock('@storybook/addons'); + +describe('preview', () => { + describe('action()', () => { + it('should use a uuid for action ids', () => { + const channel = { emit: jest.fn() }; + const uuidGenerator = (function*() { + yield '42'; + yield '24'; + })(); + uuid.mockImplementation(() => uuidGenerator.next().value); + addons.getChannel.mockReturnValue(channel); + const fn = action('foo'); + + fn(); + fn(); + expect(channel.emit).toHaveBeenCalledTimes(2); + expect(channel.emit.mock.calls[0][1].id).toBe('42'); + expect(channel.emit.mock.calls[1][1].id).toBe('24'); + }); + }); +}); From 1797bbc6ba49140f4d47336b72feffa9d2ef32ba Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2017 13:54:28 +1000 Subject: [PATCH 06/30] Add notes on our release process Based on this gist: https://gist.github.com/shilman/7993bc0c74974ef1ace7c4f96900554c --- CONTRIBUTING.md | 1 + RELEASES.md | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 RELEASES.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1b491e361a..06cdc399d36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ Please review this document to help to streamline the process and save everyone' No software is bug free. So, if you got an issue, follow these steps: - Search the [issue list](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=) for current and old issues. + - If you find an existing issue, please UPVOTE the issue by adding a "thumbs-up reaction". We use this to help prioritize issues! - If none of that is helping, create an issue with with following information: - Clear title (make is shorter if possible). - Describe the issue in clear language. diff --git a/RELEASES.md b/RELEASES.md new file mode 100644 index 00000000000..bbb2a9a60e1 --- /dev/null +++ b/RELEASES.md @@ -0,0 +1,113 @@ +# Release Process + +A Storybook release process based on [Semver](http://semver.org/). In short: +1\. merge bugfix PRs directly into master automatically release (~daily) +2\. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) +3\. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. + +## Motivation + +During the Storybook 3.x transition we've undergone a series of growing pains as +we've opened up the development process. We've had questions about: + +1. how to adhere to semver? +2. how to do marketing releases (while adhering to semver)? +3. how to introduce significant new features (e.g. vue support, story hierarchy)? +4. how to converge on key design decisions (e.g. new addons API)? +5. how to schedule releases? +6. how to maintain quality/stability through the process? +7. how to pay down tech debt as we go? + +This process attempts to address all these concerns in one shot. + +## Semver + +[Semver](http://semver.org/) dictates three types of release: + +1. MAJOR version when you make incompatible API changes, +2. MINOR version when you add functionality in a backwards-compatible manner, and +3. PATCH version when you make backwards-compatible bug fixes. + +We'll do our best to adhere to Semver, but won't be religious about it. In +particular, we may occasionally release small bits of new functionality in PATCH +releases. We'll try our best to restrict breaking changes to MAJOR releases. + +## PATCH releases + +Every bugfix should go out as soon as we've verified the fix, and based on the +current rate of contribution, we should be issuing PATCH releases multiple times per week. +Soon we'll automate the process so that a release will go out every time a PR is +merged into `master`, and we've already laid most of the groundwork for this. + +## MINOR releases + +Every new feature, particularly significant ones (e.g. Vue support, deep +hierarchy for stories) deserves more attention: + +1. They should be well-tested by the community before we release. +2. They often have architectural implications for the entire Storybook ecosystem, so should be discussed thoroughly before release. Doing `alpha` releases allow us to test in the community without necessarily achieving agreement. For example, currently `Vue` support is in `alpha`, although it contains potentially controversial changes to addons. +3. They often deserve proper marketing treatment (blog posts, release announcement, podcast, etc.) + +Therefore we merge these into a release branch of the form `release/MAJOR.MINOR` +and we create preview releases and get them tested by the community before +merging those branches into `master`. + +> NOTE: it is possible to edit the `base` branch in a PR, so we can expect users to issue PRs to `master`, but as maintainers as we see feature releases we should set them to merge into the appropriate release branch. + +In general we should release 2-3 headline features per minor release for +marketing purposes. Each headline feature should get its own blog post on the +Storybook medium publication, and the release itself should also get a blog +post. + +## MAJOR releases + +We should avoid major releases, and should try to do these at most 1-2x per +year. Ideally each breaking change would have been agreed upon by the +maintainers and validated in backwards-compatible feature releases. At some +point once a change has been thoroughly vetted, we deprecate the old way and +give some time for people to upgrade to the new way. Finally MAJOR releases +should have killer features that reward users for upgrading, and should not be +used to scratch our own architectural itches -- unless those itches are really +killing development in some meaningful way. + +## Blocking bugs + +Most PATCH releases come from community members, who generously fix problems as +they come up. However, there are also bugs that never get picked up and just sit +there gathering upvotes and "me too" comments. We need a way to make sure that +these bugs get addressed. + +For every non-PATCH release, we nominate a small number of bugs that must be +addressed before a release can go out by adding them to the milestone. This +helps focus attention for people looking for good ways to contribute, or to +understand what is blocking the release so they can actually do something about +it. Discussion about which bugs are critical happens in the `#maintenance` +channel [in our Slack](https://storybooks-slackin.herokuapp.com/). + +If you're experiencing a bug, the best way to make sure that it gets attention +is to upvote it by adding a "thumbs-up" reaction in Github. This way important +bugs quickly bubble to the top [with a +search](https://github.com/storybooks/storybook/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). + +And of course, the best way to make sure a bug gets addressed quickly is to fix +it yourself and issue a PR. If the fix is good, we'll try to release it quickly +in a patch release. + +## Decision-making + +- For PATCH changes, all discussion can occur in issue/PR comments (and random slack chat as needed). +- For MINOR feature changes, there are multiple stages of discussion: + - The feature may be discussed in an issue before it is implemented (ex: ) + - Once it's implemented, the discussion may be occur on the PR (ex: ) + - If people disagree on an implementation and it can't be resolved in discussion, they may issue alternative PR's with different ideas + - Ultimately the maintainers will reach a consensus before merging the changes. There is no set process for this, but we're all adults. + - Since MINOR features are released in alpha before they are fully released, new issues may be created by end users, etc. +- For MAJOR infrastructural changes, the discussion may take place over time, in gists like this one, issues, slack discussions, etc. + - Once the breaking changes have been reduced to an actual implementation, it looks pretty much like a feature release (only with higher stakes and probably a longer stabilization process). + +## FAQ's + +#### How does my PR get merged? + +- For PATCH PR's, any maintainer can review, test, approve, and merge it. +- For MINOR/MAJOR PR's, once a maintainer reviews, tests, and approves it, s/he should clear it with the other maintainers before merging it into the release branch. From fb93b1854042f791840a8b4246f5d579759f656d Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2017 13:58:38 +1000 Subject: [PATCH 07/30] Added example of blocking bugs to release documentation --- RELEASES.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index bbb2a9a60e1..762a0f4d848 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,9 +1,9 @@ # Release Process A Storybook release process based on [Semver](http://semver.org/). In short: -1\. merge bugfix PRs directly into master automatically release (~daily) -2\. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) -3\. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. +1. merge bugfix PRs directly into master automatically release (~daily) +2. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) +3. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. ## Motivation @@ -78,10 +78,11 @@ there gathering upvotes and "me too" comments. We need a way to make sure that these bugs get addressed. For every non-PATCH release, we nominate a small number of bugs that must be -addressed before a release can go out by adding them to the milestone. This -helps focus attention for people looking for good ways to contribute, or to -understand what is blocking the release so they can actually do something about -it. Discussion about which bugs are critical happens in the `#maintenance` +addressed before a release can go out by adding them to the milestone. For example, here's a list of blocking bugs [for the 3.2 milestone](https://github.com/storybooks/storybook/milestone/3). + +Adding bugs to the milestone helps people looking for good ways to contribute, +or to understand what is blocking the release so they can actually do something +about it. Discussion about which bugs are critical happens in the `#maintenance` channel [in our Slack](https://storybooks-slackin.herokuapp.com/). If you're experiencing a bug, the best way to make sure that it gets attention From de576eb6e8fce6f66f49c3296fc32d30243d0f81 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2017 14:22:21 +1000 Subject: [PATCH 08/30] Fix RELEASE doc links and add tighter issue search --- RELEASES.md | 10 +++++----- docs/pages/basics/faq/index.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 762a0f4d848..69dd735fd78 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,9 +1,9 @@ # Release Process A Storybook release process based on [Semver](http://semver.org/). In short: -1. merge bugfix PRs directly into master automatically release (~daily) -2. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) -3. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. +1\. merge bugfix PRs directly into master automatically release (~daily) +2\. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) +3\. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. ## Motivation @@ -88,7 +88,7 @@ channel [in our Slack](https://storybooks-slackin.herokuapp.com/). If you're experiencing a bug, the best way to make sure that it gets attention is to upvote it by adding a "thumbs-up" reaction in Github. This way important bugs quickly bubble to the top [with a -search](https://github.com/storybooks/storybook/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc). +search](https://github.com/storybooks/storybook/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20sort%3Areactions-%2B1-desc%20label%3Abug). And of course, the best way to make sure a bug gets addressed quickly is to fix it yourself and issue a PR. If the fix is good, we'll try to release it quickly @@ -99,7 +99,7 @@ in a patch release. - For PATCH changes, all discussion can occur in issue/PR comments (and random slack chat as needed). - For MINOR feature changes, there are multiple stages of discussion: - The feature may be discussed in an issue before it is implemented (ex: ) - - Once it's implemented, the discussion may be occur on the PR (ex: ) + - Once it's implemented, the discussion may be occur on the PR (ex: ) - If people disagree on an implementation and it can't be resolved in discussion, they may issue alternative PR's with different ideas - Ultimately the maintainers will reach a consensus before merging the changes. There is no set process for this, but we're all adults. - Since MINOR features are released in alpha before they are fully released, new issues may be created by end users, etc. diff --git a/docs/pages/basics/faq/index.md b/docs/pages/basics/faq/index.md index a5da8ca8a29..87a3c3759fc 100644 --- a/docs/pages/basics/faq/index.md +++ b/docs/pages/basics/faq/index.md @@ -17,5 +17,5 @@ npm test -- --coverage --collectCoverageFrom='["src/**/*.{js,jsx}","!src/**/stor Next automatically defines `React` for all of your files via a babel plugin. You must define `React` for JSX to work. You can solve this either by: -1. Adding `import React from 'react'` to your component files. -1. Adding a `.babelrc` that includes [`babel-plugin-react-require`](https://www.npmjs.com/package/babel-plugin-react-require) +1. Adding `import React from 'react'` to your component files. +2. Adding a `.babelrc` that includes [`babel-plugin-react-require`](https://www.npmjs.com/package/babel-plugin-react-require) From e1dfd2e11732340057c45ec4f19adcc6f6267333 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Fri, 23 Jun 2017 14:40:29 +1000 Subject: [PATCH 09/30] Remove the `cacheDirectory` option from babel config In storyshots, we are running babel directly, not through webpack, so we can't use this option, which applies to `babel-loader`. See https://github.com/storybooks/storybook/blob/master/app/react/src/server/config/babel.js#L15 https://github.com/storybooks/storybook/issues/1254 --- addons/storyshots/src/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/storyshots/src/index.js b/addons/storyshots/src/index.js index 6b328fd0116..4ca2a6d85f4 100644 --- a/addons/storyshots/src/index.js +++ b/addons/storyshots/src/index.js @@ -31,11 +31,14 @@ export default function testStorySnapshots(options = {}) { if (isStorybook) { storybook = require.requireActual('@storybook/react'); // eslint-disable-next-line - const loadBabelConfig = require('@storybook/react/dist/server/babel_config').default; + const loadBabelConfig = require('@storybook/react/dist/server/babel_config') + .default; const configDirPath = path.resolve(options.configPath || '.storybook'); configPath = path.join(configDirPath, 'config.js'); const babelConfig = loadBabelConfig(configDirPath); + // We set this in the default babel config, but it is webpack-only + delete babelConfig.cacheDirectory; const content = babel.transformFileSync(configPath, babelConfig).code; const contextOpts = { filename: configPath, From 9790d5ae1cfc1d8c629f17cbab739db324780eac Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2017 18:54:50 +1000 Subject: [PATCH 10/30] Fix RELEASES formatting --- RELEASES.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index 69dd735fd78..96bd423248d 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,9 +1,12 @@ # Release Process A Storybook release process based on [Semver](http://semver.org/). In short: -1\. merge bugfix PRs directly into master automatically release (~daily) -2\. merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) -3\. consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. + +1. Merge bugfix PRs directly into master automatically release (~daily) + +2. Merge feature and breaking PRs into a release branch (e.g. `release/3.2`) and release features in groups along with a marketing push after a preview period (~monthly) + +3. Consensus on critical infrastructure/bugs that are needed before we can do a minor release, so that we pay down our tech debt as we go. ## Motivation From 1c0978f83a1981421bc5e4d05fcc01aeded933d2 Mon Sep 17 00:00:00 2001 From: Tom Coleman Date: Mon, 26 Jun 2017 10:49:19 +1000 Subject: [PATCH 11/30] Only add the `cacheDirectory` option as we assemble the webpack config. --- addons/storyshots/src/index.js | 2 -- app/react-native/package.json | 1 + app/react-native/src/server/config.js | 8 ++++++++ app/react-native/src/server/config/babel.js | 3 --- app/react/src/server/config.js | 9 ++++++++- app/react/src/server/config/babel.js | 6 ------ 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/addons/storyshots/src/index.js b/addons/storyshots/src/index.js index 4ca2a6d85f4..cdca24c81f1 100644 --- a/addons/storyshots/src/index.js +++ b/addons/storyshots/src/index.js @@ -37,8 +37,6 @@ export default function testStorySnapshots(options = {}) { configPath = path.join(configDirPath, 'config.js'); const babelConfig = loadBabelConfig(configDirPath); - // We set this in the default babel config, but it is webpack-only - delete babelConfig.cacheDirectory; const content = babel.transformFileSync(configPath, babelConfig).code; const contextOpts = { filename: configPath, diff --git a/app/react-native/package.json b/app/react-native/package.json index 12210e7610a..f26ee489c6a 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -51,6 +51,7 @@ "events": "^1.1.1", "express": "^4.15.2", "file-loader": "^0.11.1", + "find-cache-dir": "^1.0.0", "global": "^4.3.2", "json-loader": "^0.5.4", "json5": "^0.5.1", diff --git a/app/react-native/src/server/config.js b/app/react-native/src/server/config.js index e9e366aadce..f5abb9a0d00 100644 --- a/app/react-native/src/server/config.js +++ b/app/react-native/src/server/config.js @@ -1,6 +1,7 @@ import fs from 'fs'; import path from 'path'; import JSON5 from 'json5'; +import findCacheDir from 'find-cache-dir'; // avoid ESLint errors const logger = console; @@ -82,6 +83,13 @@ export default function(configType, baseConfig, projectDir, configDir) { config.module.loaders[0].query = babelConfig; } + // This is a feature of `babel-loader` for webpack (not Babel itself). + // It enables a cache directory for faster-rebuilds + // `find-cache-dir` will create the cache directory under the node_modules directory. + config.module.loaders[0].query.cacheDirectory = findCacheDir({ + name: 'react-storybook', + }); + // Check whether addons.js file exists inside the storybook. // Load the default addons.js file if it's missing. const storybookDefaultAddonsPath = path.resolve(__dirname, 'addons.js'); diff --git a/app/react-native/src/server/config/babel.js b/app/react-native/src/server/config/babel.js index 70ff7a9fc94..6499e3fe358 100644 --- a/app/react-native/src/server/config/babel.js +++ b/app/react-native/src/server/config/babel.js @@ -10,9 +10,6 @@ module.exports = { // Don't try to find .babelrc because we want to force this configuration. babelrc: false, - // This is a feature of `babel-loader` for webpack (not Babel itself). - // It enables caching results in OS temporary directory for faster rebuilds. - cacheDirectory: true, presets: [ // let, const, destructuring, classes, modules require.resolve('babel-preset-es2015'), diff --git a/app/react/src/server/config.js b/app/react/src/server/config.js index 3d0b5e662fc..36e2d30ec25 100644 --- a/app/react/src/server/config.js +++ b/app/react/src/server/config.js @@ -1,6 +1,7 @@ /* eslint-disable global-require, import/no-dynamic-require */ import fs from 'fs'; import path from 'path'; +import findCacheDir from 'find-cache-dir'; import loadBabelConfig from './babel_config'; // avoid ESLint errors @@ -13,7 +14,13 @@ export default function(configType, baseConfig, configDir) { const config = baseConfig; const babelConfig = loadBabelConfig(configDir); - config.module.rules[0].query = babelConfig; + config.module.rules[0].query = { + // This is a feature of `babel-loader` for webpack (not Babel itself). + // It enables a cache directory for faster-rebuilds + // `find-cache-dir` will create the cache directory under the node_modules directory. + cacheDirectory: findCacheDir({ name: 'react-storybook' }), + ...babelConfig, + }; // Check whether a config.js file exists inside the storybook // config directory and throw an error if it's not. diff --git a/app/react/src/server/config/babel.js b/app/react/src/server/config/babel.js index d362a465669..231735a40cc 100644 --- a/app/react/src/server/config/babel.js +++ b/app/react/src/server/config/babel.js @@ -7,15 +7,9 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -const findCacheDir = require('find-cache-dir'); - module.exports = { // Don't try to find .babelrc because we want to force this configuration. babelrc: false, - // This is a feature of `babel-loader` for webpack (not Babel itself). - // It enables a cache directory for faster-rebuilds - // `find-cache-dir` will create the cache directory under the node_modules directory. - cacheDirectory: findCacheDir({ name: 'react-storybook' }), presets: [ require.resolve('babel-preset-es2015'), require.resolve('babel-preset-es2016'), From fcdc98e66091b3a20497bf69b4ad469cff53a5e4 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sun, 25 Jun 2017 19:08:24 -0700 Subject: [PATCH 12/30] Fix pointer to Button definition location --- app/react/src/demo/Welcome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/react/src/demo/Welcome.js b/app/react/src/demo/Welcome.js index ddf09bc8952..8f191b1f503 100644 --- a/app/react/src/demo/Welcome.js +++ b/app/react/src/demo/Welcome.js @@ -64,7 +64,7 @@ const Welcome = props => You can also edit those components and see changes right away.
(Try editing the Button component - located at src/stories/Button.js.) + located at src/stories/index.js.)

Usually we create stories with smaller UI components in the app.
From 8e6df76a2e6f1b9441f7053ca30ad9ab2715d78a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 26 Jun 2017 15:28:03 +1000 Subject: [PATCH 13/30] Tweaked Welcome message and snapshot to fix the build --- app/react/src/demo/Welcome.js | 2 +- examples/test-cra/src/__snapshots__/storyshots.test.js.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/react/src/demo/Welcome.js b/app/react/src/demo/Welcome.js index 8f191b1f503..fb42d2b3c7c 100644 --- a/app/react/src/demo/Welcome.js +++ b/app/react/src/demo/Welcome.js @@ -63,7 +63,7 @@ const Welcome = props =>
You can also edit those components and see changes right away.
- (Try editing the Button component + (Try editing the Button stories located at src/stories/index.js.)

diff --git a/examples/test-cra/src/__snapshots__/storyshots.test.js.snap b/examples/test-cra/src/__snapshots__/storyshots.test.js.snap index a09cbc66cc5..142cc1e87e5 100644 --- a/examples/test-cra/src/__snapshots__/storyshots.test.js.snap +++ b/examples/test-cra/src/__snapshots__/storyshots.test.js.snap @@ -79,11 +79,11 @@ exports[`Storyshots Welcome to Storybook 1`] = ` > Button - component located at + stories located at - src/stories/Button.js + src/stories/index.js .)

From 307205a2e15c5cdbfb057715b07b99788c3f42ee Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 26 Jun 2017 16:05:54 +1000 Subject: [PATCH 14/30] CHANGELOG for 3.1.6 --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43b30191c33..b81a66664f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +# 3.1.6 + +2017-June-26 + +#### Bug Fixes + +- Remove the `cacheDirectory` option from babel config [#1350](https://github.com/storybooks/storybook/pull/1350) +- websockets (ws) removed `socket.upgradeReq`, so use `req` instead [#1337](https://github.com/storybooks/storybook/pull/1337) +- Ensure we add the correct version of `react-dom` [#1349](https://github.com/storybooks/storybook/pull/1349) +- Fix invalid prop 'node.type' supplied to 'Props' [#1351](https://github.com/storybooks/storybook/pull/1351) +- Addon Info: Omit empty inline info header [#1306](https://github.com/storybooks/storybook/pull/1306) +- Use uuid for action IDs instead of Math.random (fixes #1109) [#1347](https://github.com/storybooks/storybook/pull/1347) + +#### Documentation + +- Fix welcome instructions now that `getstorybook` does not add Button source [#1358](https://github.com/storybooks/storybook/pull/1358) +- Update addons/info read me with configuration instructuctions [#1326](https://github.com/storybooks/storybook/pull/1326) + +#### Dependency Upgrades + +- Update lint-staged to the latest version ๐Ÿš€ [#1315](https://github.com/storybooks/storybook/pull/1315) + # 3.1.5 2017-June-22 From cc4abb1b98a8bcaff605844ca9df42482ed0f38b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 26 Jun 2017 16:06:30 +1000 Subject: [PATCH 15/30] Linting fixes --- addons/actions/README.md | 4 +--- addons/info/README.md | 1 - docs/pages/basics/faq/index.md | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/actions/README.md b/addons/actions/README.md index bd280131085..19117bc40d4 100644 --- a/addons/actions/README.md +++ b/addons/actions/README.md @@ -25,9 +25,7 @@ npm i -D @storybook/addon-actions Then, add following content to `.storybook/addons.js` -``` -import '@storybook/addon-actions/register'; -``` + import '@storybook/addon-actions/register'; Import the `action` function and use it to create actions handlers. When creating action handlers, provide a **name** to make it easier to identify. diff --git a/addons/info/README.md b/addons/info/README.md index e567e7240d6..bc6c4045d84 100644 --- a/addons/info/README.md +++ b/addons/info/README.md @@ -55,7 +55,6 @@ storiesOf('Component') > Have a look at [this example](example/story.js) stories to learn more about the `addWithInfo` API. - To customize your defaults: ```js diff --git a/docs/pages/basics/faq/index.md b/docs/pages/basics/faq/index.md index a5da8ca8a29..87a3c3759fc 100644 --- a/docs/pages/basics/faq/index.md +++ b/docs/pages/basics/faq/index.md @@ -17,5 +17,5 @@ npm test -- --coverage --collectCoverageFrom='["src/**/*.{js,jsx}","!src/**/stor Next automatically defines `React` for all of your files via a babel plugin. You must define `React` for JSX to work. You can solve this either by: -1. Adding `import React from 'react'` to your component files. -1. Adding a `.babelrc` that includes [`babel-plugin-react-require`](https://www.npmjs.com/package/babel-plugin-react-require) +1. Adding `import React from 'react'` to your component files. +2. Adding a `.babelrc` that includes [`babel-plugin-react-require`](https://www.npmjs.com/package/babel-plugin-react-require) From 64144873707d21488c3933784e32f654b33bd17a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 26 Jun 2017 16:25:01 +1000 Subject: [PATCH 16/30] Clarify 3.1.6 CHANGELOG --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b81a66664f9..d9e303738c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,14 @@ - Remove the `cacheDirectory` option from babel config [#1350](https://github.com/storybooks/storybook/pull/1350) - websockets (ws) removed `socket.upgradeReq`, so use `req` instead [#1337](https://github.com/storybooks/storybook/pull/1337) - Ensure we add the correct version of `react-dom` [#1349](https://github.com/storybooks/storybook/pull/1349) -- Fix invalid prop 'node.type' supplied to 'Props' [#1351](https://github.com/storybooks/storybook/pull/1351) +- Addon Info: Fix invalid prop `node.type` supplied to 'Props' [#1351](https://github.com/storybooks/storybook/pull/1351) - Addon Info: Omit empty inline info header [#1306](https://github.com/storybooks/storybook/pull/1306) -- Use uuid for action IDs instead of Math.random (fixes #1109) [#1347](https://github.com/storybooks/storybook/pull/1347) +- Addon Actions: Use uuid for action IDs instead of Math.random (fixes #1109) [#1347](https://github.com/storybooks/storybook/pull/1347) #### Documentation -- Fix welcome instructions now that `getstorybook` does not add Button source [#1358](https://github.com/storybooks/storybook/pull/1358) -- Update addons/info read me with configuration instructuctions [#1326](https://github.com/storybooks/storybook/pull/1326) +- Fix welcome instructions to reflect current `getstorybook` [#1358](https://github.com/storybooks/storybook/pull/1358) +- Addon Info: Update README with configuration instructions [#1326](https://github.com/storybooks/storybook/pull/1326) #### Dependency Upgrades From d8f22cdb852714eee4ecc6168c8a50b5237fe78b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 26 Jun 2017 16:32:38 +1000 Subject: [PATCH 17/30] v3.1.6 --- addons/actions/package.json | 4 ++-- addons/comments/package.json | 4 ++-- addons/events/package.json | 4 ++-- addons/graphql/package.json | 2 +- addons/info/package.json | 4 ++-- addons/knobs/package.json | 4 ++-- addons/links/package.json | 4 ++-- addons/notes/package.json | 4 ++-- addons/options/package.json | 4 ++-- addons/storyshots/package.json | 14 +++++++------- app/react-native/package.json | 12 ++++++------ app/react/package.json | 12 ++++++------ lerna.json | 2 +- lib/addons/package.json | 2 +- lib/channel-postmessage/package.json | 4 ++-- lib/channel-websocket/package.json | 4 ++-- lib/channels/package.json | 2 +- lib/cli/package.json | 4 ++-- lib/codemod/package.json | 2 +- lib/ui/package.json | 2 +- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/addons/actions/package.json b/addons/actions/package.json index 36fe1213090..ee42c14dd09 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "3.1.5", + "version": "3.1.6", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -21,7 +21,7 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "deep-equal": "^1.0.1", "json-stringify-safe": "^5.0.1", "prop-types": "^15.5.8", diff --git a/addons/comments/package.json b/addons/comments/package.json index f056ed7877f..8b9c26e5ac8 100644 --- a/addons/comments/package.json +++ b/addons/comments/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-comments", - "version": "3.1.5", + "version": "3.1.6", "description": "Comments addon for Storybook", "keywords": [ "storybook" @@ -23,7 +23,7 @@ "storybook-remote": "start-storybook -p 3006" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "babel-runtime": "^6.23.0", "deep-equal": "^1.0.1", "events": "^1.1.1", diff --git a/addons/events/package.json b/addons/events/package.json index 0a031cd68e0..e56d576f0ea 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "3.1.5", + "version": "3.1.6", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -20,7 +20,7 @@ "storybook": "start-storybook -p 6006" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "babel-runtime": "^6.5.0", "format-json": "^1.0.3", "prop-types": "^15.5.10", diff --git a/addons/graphql/package.json b/addons/graphql/package.json index df9345521d6..507e9d62e68 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-graphql", - "version": "3.1.5", + "version": "3.1.6", "description": "Storybook addon to display the GraphiQL IDE", "keywords": [ "storybook" diff --git a/addons/info/package.json b/addons/info/package.json index 42156f78d27..6a880a325b1 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-info", - "version": "3.1.5", + "version": "3.1.6", "description": "A Storybook addon to show additional information for your stories.", "license": "MIT", "main": "dist/index.js", @@ -14,7 +14,7 @@ "storybook": "start-storybook -p 9010" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "babel-runtime": "^6.23.0", "global": "^4.3.2", "marksy": "^2.0.0", diff --git a/addons/knobs/package.json b/addons/knobs/package.json index df474f9e00f..2d96b76ae03 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-knobs", - "version": "3.1.5", + "version": "3.1.6", "description": "Storybook Addon Prop Editor Component", "license": "MIT", "main": "dist/index.js", @@ -16,7 +16,7 @@ "storybook": "start-storybook -p 9010" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "babel-runtime": "^6.23.0", "deep-equal": "^1.0.1", "global": "^4.3.2", diff --git a/addons/links/package.json b/addons/links/package.json index 0df5bfed2db..33fd04b44bf 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "3.1.5", + "version": "3.1.6", "description": "Story Links addon for storybook", "keywords": [ "storybook" @@ -22,7 +22,7 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.1.5" + "@storybook/addons": "^3.1.6" }, "devDependencies": { "react": "^15.5.4", diff --git a/addons/notes/package.json b/addons/notes/package.json index bb0229ec885..35f3c0d47d4 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-notes", - "version": "3.1.5", + "version": "3.1.6", "description": "Write notes for your Storybook stories.", "keywords": [ "addon", @@ -19,7 +19,7 @@ "storybook": "start-storybook -p 9010" }, "dependencies": { - "@storybook/addons": "^3.1.5", + "@storybook/addons": "^3.1.6", "babel-runtime": "^6.23.0", "prop-types": "^15.5.10" }, diff --git a/addons/options/package.json b/addons/options/package.json index 00e9326bffd..81d330ce6a3 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-options", - "version": "3.1.5", + "version": "3.1.6", "description": "Options addon for storybook", "keywords": [ "storybook" @@ -21,7 +21,7 @@ "storybook": "start-storybook -p 9001" }, "dependencies": { - "@storybook/addons": "^3.1.5" + "@storybook/addons": "^3.1.6" }, "devDependencies": { "react": "^15.5.4", diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index cd81f777ce4..9aa81d2c03b 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "3.1.5", + "version": "3.1.6", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "license": "MIT", "main": "dist/index.js", @@ -20,9 +20,9 @@ "read-pkg-up": "^2.0.0" }, "devDependencies": { - "@storybook/addons": "^3.1.5", - "@storybook/channels": "^3.1.5", - "@storybook/react": "^3.1.5", + "@storybook/addons": "^3.1.6", + "@storybook/channels": "^3.1.6", + "@storybook/react": "^3.1.6", "babel-cli": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-es2015": "^6.24.1", @@ -31,9 +31,9 @@ "react-dom": "^15.5.4" }, "peerDependencies": { - "@storybook/addons": "^3.1.5", - "@storybook/channels": "^3.1.5", - "@storybook/react": "^3.1.5", + "@storybook/addons": "^3.1.6", + "@storybook/channels": "^3.1.6", + "@storybook/react": "^3.1.6", "babel-core": "^6.24.1", "react": "*", "react-test-renderer": "*" diff --git a/app/react-native/package.json b/app/react-native/package.json index f26ee489c6a..fdf0a0b2ea7 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-native", - "version": "3.1.5", + "version": "3.1.6", "description": "A better way to develop React Native Components for your app", "keywords": [ "react", @@ -24,11 +24,11 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/addon-actions": "^3.1.5", - "@storybook/addon-links": "^3.1.5", - "@storybook/addons": "^3.1.5", - "@storybook/channel-websocket": "^3.1.5", - "@storybook/ui": "^3.1.5", + "@storybook/addon-actions": "^3.1.6", + "@storybook/addon-links": "^3.1.6", + "@storybook/addons": "^3.1.6", + "@storybook/channel-websocket": "^3.1.6", + "@storybook/ui": "^3.1.6", "autoprefixer": "^7.0.1", "babel-core": "^6.24.1", "babel-loader": "^7.0.0", diff --git a/app/react/package.json b/app/react/package.json index d943634eb85..dfb92e73b82 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "3.1.5", + "version": "3.1.6", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/apps/react", "bugs": { @@ -22,11 +22,11 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/addon-actions": "^3.1.5", - "@storybook/addon-links": "^3.1.5", - "@storybook/addons": "^3.1.5", - "@storybook/channel-postmessage": "^3.1.5", - "@storybook/ui": "^3.1.5", + "@storybook/addon-actions": "^3.1.6", + "@storybook/addon-links": "^3.1.6", + "@storybook/addons": "^3.1.6", + "@storybook/channel-postmessage": "^3.1.6", + "@storybook/ui": "^3.1.6", "airbnb-js-shims": "^1.1.1", "autoprefixer": "^7.1.1", "babel-core": "^6.24.1", diff --git a/lerna.json b/lerna.json index 7589361a3d3..7dcdee8e17e 100644 --- a/lerna.json +++ b/lerna.json @@ -23,5 +23,5 @@ "examples/*" ], "concurrency": 1, - "version": "3.1.5" + "version": "3.1.6" } diff --git a/lib/addons/package.json b/lib/addons/package.json index 1351535778c..c37e9d87679 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "3.1.5", + "version": "3.1.6", "description": "Storybook addons store", "keywords": [ "storybook" diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index a04f00335cd..2c84ab4ba63 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "3.1.5", + "version": "3.1.6", "description": "", "license": "MIT", "main": "dist/index.js", @@ -8,7 +8,7 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/channels": "^3.1.5", + "@storybook/channels": "^3.1.6", "global": "^4.3.2", "json-stringify-safe": "^5.0.1" }, diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index 7a53d6657f4..29d3f8a43b8 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "3.1.5", + "version": "3.1.6", "description": "", "license": "MIT", "main": "dist/index.js", @@ -8,7 +8,7 @@ "prepublish": "node ../../scripts/prepublish.js" }, "dependencies": { - "@storybook/channels": "^3.1.5", + "@storybook/channels": "^3.1.6", "global": "^4.3.2" }, "devDependencies": { diff --git a/lib/channels/package.json b/lib/channels/package.json index ac21587e478..2b883f58d16 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "3.1.5", + "version": "3.1.6", "description": "", "license": "MIT", "main": "dist/index.js", diff --git a/lib/cli/package.json b/lib/cli/package.json index 3244c095891..ec86e380005 100644 --- a/lib/cli/package.json +++ b/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "3.1.5", + "version": "3.1.6", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -24,7 +24,7 @@ "postinstall": "opencollective postinstall --collective=storybook" }, "dependencies": { - "@storybook/codemod": "^3.1.5", + "@storybook/codemod": "^3.1.6", "chalk": "^1.1.3", "child-process-promise": "^2.2.1", "commander": "^2.9.0", diff --git a/lib/codemod/package.json b/lib/codemod/package.json index 5a3a6af6820..912a9c197b6 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "3.1.5", + "version": "3.1.6", "description": "A collection of codemod scripts written with JSCodeshift", "license": "MIT", "main": "dist/index.js", diff --git a/lib/ui/package.json b/lib/ui/package.json index ff79e13763d..830895e029b 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ui", - "version": "3.1.5", + "version": "3.1.6", "description": "Core Storybook UI", "license": "MIT", "main": "dist/index.js", From 33472f9af2d0de39bb8c66ec4b5e318f40d6208e Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Tue, 27 Jun 2017 02:43:17 +0200 Subject: [PATCH 18/30] fix: allow multiple assets with different types --- app/react/src/server/iframe.html.js | 14 +++++++------- app/react/src/server/iframe.html.test.js | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 app/react/src/server/iframe.html.test.js diff --git a/app/react/src/server/iframe.html.js b/app/react/src/server/iframe.html.js index 95193273617..0a8b1065fae 100644 --- a/app/react/src/server/iframe.html.js +++ b/app/react/src/server/iframe.html.js @@ -8,7 +8,7 @@ import url from 'url'; // 'preview.0d2d3d845f78399fd6d5e859daa152a9.css', // 'static/preview.9adbb5ef965106be1cc3.bundle.js.map', // 'preview.0d2d3d845f78399fd6d5e859daa152a9.css.map' ] -const urlsFromAssets = assets => { +export const urlsFromAssets = assets => { if (!assets) { return { js: ['static/preview.bundle.js'], @@ -26,13 +26,13 @@ const urlsFromAssets = assets => { // Don't load the manager script in the iframe .filter(key => key !== 'manager') .forEach(key => { - const asset = assets[key]; - if (typeof asset === 'string') { - urls[re.exec(asset)[1]].push(asset); - } else { - const assetUrl = asset.find(u => re.exec(u)[1] !== 'map'); - urls[re.exec(assetUrl)[1]].push(assetUrl); + let assetList = assets[key]; + if (!Array.isArray(assetList)) { + assetList = [assetList]; } + assetList.filter(u => re.exec(u)[1] !== 'map').forEach(u => { + urls[re.exec(u)[1]].push(u); + }); }); return urls; diff --git a/app/react/src/server/iframe.html.test.js b/app/react/src/server/iframe.html.test.js new file mode 100644 index 00000000000..34cfc2e6766 --- /dev/null +++ b/app/react/src/server/iframe.html.test.js @@ -0,0 +1,21 @@ +import { urlsFromAssets } from './iframe.html'; + +describe('server.urlsFromAssets', () => { + it('should return the default when there are no assets', () => { + expect(urlsFromAssets()).toEqual({ + js: ['static/preview.bundle.js'], + css: [], + }); + }); + + it('should return multiple assets', () => { + const fixture = { + manager: 'static/manager.a.bundle.js', + preview: ['static/preview.x.bundle.js', 'static/preview.y.css', 'static/preview.y.css.map'], + }; + expect(urlsFromAssets(fixture)).toEqual({ + js: ['static/preview.x.bundle.js'], + css: ['static/preview.y.css'], + }); + }); +}); From 4c4a2b07c2a6c3120de5201b4ffb1cbfa649f9f6 Mon Sep 17 00:00:00 2001 From: Keith Yao Date: Tue, 27 Jun 2017 11:27:27 +0200 Subject: [PATCH 19/30] typo fix --- app/react/src/client/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/react/src/client/index.js b/app/react/src/client/index.js index 43e56c15e81..831d5487303 100644 --- a/app/react/src/client/index.js +++ b/app/react/src/client/index.js @@ -14,10 +14,10 @@ export const getStorybook = previewApi.getStorybook; export const action = deprecate( deprecatedAction, - '@storybook/react action is deprecated. See: https://github.com/storybooks/storybook/tree/master/addon/actions' + '@storybook/react action is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/actions' ); export const linkTo = deprecate( deprecatedLinkTo, - '@storybook/react linkTo is deprecated. See: https://github.com/storybooks/storybook/tree/master/addon/links' + '@storybook/react linkTo is deprecated. See: https://github.com/storybooks/storybook/tree/master/addons/links' ); From f3e7a0b02af0d36160214b5b3f54e7f1d04aaada Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 12:57:16 +0200 Subject: [PATCH 20/30] fix: Fail on transpilation errors Currently, storybook does not exit non-zero when there are errors in the pipeline, e.g. we are using TypeScript with `ts-loader` and a type error that fails tsc does not make storybook exit non-zero even though the transpilation failed. --- app/react/src/server/build.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js index 01a4a739404..74082edd11b 100755 --- a/app/react/src/server/build.js +++ b/app/react/src/server/build.js @@ -80,8 +80,17 @@ webpack(config).run((err, stats) => { if (err) { logger.error('Failed to build the storybook'); logger.error(err.message); + } + if (stats.hasErrors()) { + logger.error('Failed to build the storybook'); + stats.toJson().errors.forEach(function (e) { + return logger.error(e); + }); + } + if (err || stats.hasErrors()) { process.exit(1); } + const data = { publicPath: config.output.publicPath, From 302f15773e5c9d01229a10eaec13d74640333ea3 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 12:57:44 +0200 Subject: [PATCH 21/30] Update build.js --- app/react/src/server/build.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js index 74082edd11b..f618fabba8f 100755 --- a/app/react/src/server/build.js +++ b/app/react/src/server/build.js @@ -90,7 +90,6 @@ webpack(config).run((err, stats) => { if (err || stats.hasErrors()) { process.exit(1); } - const data = { publicPath: config.output.publicPath, From a9d88cf2f3d2d20683de6f31707e3d2cd4a93e07 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 13:05:37 +0200 Subject: [PATCH 22/30] u -> url --- app/react/src/server/iframe.html.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/react/src/server/iframe.html.js b/app/react/src/server/iframe.html.js index 0a8b1065fae..0cd82660356 100644 --- a/app/react/src/server/iframe.html.js +++ b/app/react/src/server/iframe.html.js @@ -30,8 +30,8 @@ export const urlsFromAssets = assets => { if (!Array.isArray(assetList)) { assetList = [assetList]; } - assetList.filter(u => re.exec(u)[1] !== 'map').forEach(u => { - urls[re.exec(u)[1]].push(u); + assetList.filter(url => re.exec(url)[1] !== 'map').forEach(url => { + urls[re.exec(url)[1]].push(url); }); }); From 9c57ae0d3d6831c02a57b08d593023109aa27f7b Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 13:18:40 +0200 Subject: [PATCH 23/30] factor into one if --- app/react/src/server/build.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js index f618fabba8f..f003fcb1cf4 100755 --- a/app/react/src/server/build.js +++ b/app/react/src/server/build.js @@ -77,17 +77,10 @@ if (program.staticDir) { // compile all resources with webpack and write them to the disk. logger.log('Building storybook ...'); webpack(config).run((err, stats) => { - if (err) { - logger.error('Failed to build the storybook'); - logger.error(err.message); - } - if (stats.hasErrors()) { - logger.error('Failed to build the storybook'); - stats.toJson().errors.forEach(function (e) { - return logger.error(e); - }); - } if (err || stats.hasErrors()) { + logger.error('Failed to build the storybook'); + err && logger.error(err.message); + stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e)); process.exit(1); } From be7625a7d5fe6bcda37911f42df46ad187aa49c4 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 13:37:26 +0200 Subject: [PATCH 24/30] url -> assetUrl --- app/react/src/server/iframe.html.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/react/src/server/iframe.html.js b/app/react/src/server/iframe.html.js index 0cd82660356..2aeb77f6e92 100644 --- a/app/react/src/server/iframe.html.js +++ b/app/react/src/server/iframe.html.js @@ -30,8 +30,8 @@ export const urlsFromAssets = assets => { if (!Array.isArray(assetList)) { assetList = [assetList]; } - assetList.filter(url => re.exec(url)[1] !== 'map').forEach(url => { - urls[re.exec(url)[1]].push(url); + assetList.filter(assetUrl => re.exec(assetUrl)[1] !== 'map').forEach(assetUrl => { + urls[re.exec(assetUrl)[1]].push(assetUrl); }); }); From 50aac0520c04e31e7d5e24ae8a8e132e25a4daa1 Mon Sep 17 00:00:00 2001 From: Joscha Feth Date: Wed, 28 Jun 2017 13:39:25 +0200 Subject: [PATCH 25/30] allow guard --- app/react/src/server/build.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js index f003fcb1cf4..b6b9f047e6e 100755 --- a/app/react/src/server/build.js +++ b/app/react/src/server/build.js @@ -79,7 +79,9 @@ logger.log('Building storybook ...'); webpack(config).run((err, stats) => { if (err || stats.hasErrors()) { logger.error('Failed to build the storybook'); + // eslint-disable-next-line no-unused-expressions err && logger.error(err.message); + // eslint-disable-next-line no-unused-expressions stats.hasErrors() && stats.toJson().errors.forEach(e => logger.error(e)); process.exit(1); } From cced0648d23acca0994014cfeadb7aaf20a4bc16 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 28 Jun 2017 05:13:10 -0700 Subject: [PATCH 26/30] CHANGELOG v3.1.7 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9e303738c0..17b384aa433 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 3.1.7 + +2017-June-28 + +#### Bug Fixes + +- Exit storybook build non-zero on stats errors (e.g. errors in the transpilation pipeline) [#1372](https://github.com/storybooks/storybook/pull/1372) +- Fixed regression: CSS entries were not picked up for storybook pages (e.g. when using exract-text-webpack-plugin) [#1363](https://github.com/storybooks/storybook/pull/1363) + +#### Documentation + +- Document Storybook release process [#1348](https://github.com/storybooks/storybook/pull/1348) + # 3.1.6 2017-June-26 From dbd6842bbb4c6bd7c47170c7e1f48a8a626ca85a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 28 Jun 2017 05:23:31 -0700 Subject: [PATCH 27/30] v3.1.7 --- addons/storyshots/package.json | 6 +++--- app/react/package.json | 2 +- lerna.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index 9aa81d2c03b..7ec747b0e0e 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "3.1.6", + "version": "3.1.7", "description": "StoryShots is a Jest Snapshot Testing Addon for Storybook.", "license": "MIT", "main": "dist/index.js", @@ -22,7 +22,7 @@ "devDependencies": { "@storybook/addons": "^3.1.6", "@storybook/channels": "^3.1.6", - "@storybook/react": "^3.1.6", + "@storybook/react": "^3.1.7", "babel-cli": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-es2015": "^6.24.1", @@ -33,7 +33,7 @@ "peerDependencies": { "@storybook/addons": "^3.1.6", "@storybook/channels": "^3.1.6", - "@storybook/react": "^3.1.6", + "@storybook/react": "^3.1.7", "babel-core": "^6.24.1", "react": "*", "react-test-renderer": "*" diff --git a/app/react/package.json b/app/react/package.json index dfb92e73b82..ffb4cd61d0a 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "3.1.6", + "version": "3.1.7", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybooks/storybook/tree/master/apps/react", "bugs": { diff --git a/lerna.json b/lerna.json index 7dcdee8e17e..2ff3ed4575d 100644 --- a/lerna.json +++ b/lerna.json @@ -23,5 +23,5 @@ "examples/*" ], "concurrency": 1, - "version": "3.1.6" + "version": "3.1.7" } From 0585290f14b3290e1c76cff27f55778ecc8a9a76 Mon Sep 17 00:00:00 2001 From: Edvins Antonovs Date: Wed, 28 Jun 2017 13:32:37 +0100 Subject: [PATCH 28/30] Updated link to point to the correct place --- docs/components/Homepage/MainLinks/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/Homepage/MainLinks/index.js b/docs/components/Homepage/MainLinks/index.js index 6d08eda237e..ee8db36edb3 100644 --- a/docs/components/Homepage/MainLinks/index.js +++ b/docs/components/Homepage/MainLinks/index.js @@ -55,7 +55,7 @@ const MainLinks = () =>
  • Quick setup
  • Adding to existing project
    • -
  • Writing stories
    • +
  • Writing stories
From 279e1988571ca6d6871614aa0371f13a7303bf33 Mon Sep 17 00:00:00 2001 From: igor Date: Thu, 29 Jun 2017 13:41:52 +0300 Subject: [PATCH 29/30] Change the order of the atomic namespace --- examples/cra-kitchen-sink/src/stories/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/cra-kitchen-sink/src/stories/index.js b/examples/cra-kitchen-sink/src/stories/index.js index 9d9f2c9ba2c..cf967cab700 100644 --- a/examples/cra-kitchen-sink/src/stories/index.js +++ b/examples/cra-kitchen-sink/src/stories/index.js @@ -177,19 +177,19 @@ storiesOf('component.Button') // Atomic -storiesOf('Atomsยฏ\\_(ใƒ„)_/ยฏMolecules.Cells/simple', module) +storiesOf('Cellsยฏ\\_(ใƒ„)_/ยฏMolecules.Atoms/simple', module) .addDecorator(withKnobs) .add('with text', () => ) .add('with some emoji', () => ); -storiesOf('Atoms/Molecules/Cells.more', module) +storiesOf('Cells/Molecules/Atoms.more', module) .add('with text2', () => ) .add('with some emoji2', () => ); -storiesOf('Atoms/Molecules', module) +storiesOf('Cells/Molecules', module) .add('with text', () => ) .add('with some emoji', () => ); -storiesOf('Atoms.Molecules.Cells', module) +storiesOf('Cells.Molecules.Atoms', module) .add('with text2', () => ) .add('with some emoji2', () => ); From 8262b7bedc10437be9065f1a3bd6602e369cc3d3 Mon Sep 17 00:00:00 2001 From: igor Date: Thu, 29 Jun 2017 17:12:40 +0300 Subject: [PATCH 30/30] Revert code that was injected by aliens --- .gitignore | 1 + addons/info/src/components/Story.js | 19 ++++++++++++++----- app/react-native/src/server/index.js | 8 +++----- .../generators/REACT_NATIVE_SCRIPTS/index.js | 3 ++- package.json | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index b81f584793d..cbaf6162bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ yarn.lock /**/LICENSE docs/public packs/*.tgz +package-lock.json diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js index 7e412085cc4..618d64d4f31 100644 --- a/addons/info/src/components/Story.js +++ b/addons/info/src/components/Story.js @@ -125,11 +125,7 @@ export default class Story extends React.Component { _renderInline() { return (
-
-
- {this._getInfoHeader()} -
-
+ {this._renderInlineHeader()}
{this._renderStory()}
@@ -145,6 +141,19 @@ export default class Story extends React.Component { ); } + _renderInlineHeader() { + const infoHeader = this._getInfoHeader(); + + return ( + infoHeader && +
+
+ {infoHeader} +
+
+ ); + } + _renderOverlay() { const linkStyle = { ...stylesheet.link.base, diff --git a/app/react-native/src/server/index.js b/app/react-native/src/server/index.js index ed284ab31b4..09e0a34284b 100755 --- a/app/react-native/src/server/index.js +++ b/app/react-native/src/server/index.js @@ -12,14 +12,12 @@ export default class Server { this.expressApp.use(storybook(options)); this.httpServer.on('request', this.expressApp); this.wsServer = new ws.Server({ server: this.httpServer }); - this.wsServer.on('connection', s => this.handleWS(s)); + this.wsServer.on('connection', (s, req) => this.handleWS(s, req)); } - handleWS(socket) { + handleWS(socket, req) { if (this.options.manualId) { - const params = socket.upgradeReq && socket.upgradeReq.url - ? querystring.parse(socket.upgradeReq.url.substr(1)) - : {}; + const params = req.url ? querystring.parse(req.url.substr(1)) : {}; if (params.pairedId) { socket.pairedId = params.pairedId; // eslint-disable-line diff --git a/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js b/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js index fe05fbdbf47..b163469d208 100644 --- a/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js +++ b/lib/cli/generators/REACT_NATIVE_SCRIPTS/index.js @@ -15,7 +15,8 @@ module.exports = latestVersion('@storybook/react-native').then(version => { packageJson.devDependencies['@storybook/react-native'] = `^${version}`; if (!packageJson.dependencies['react-dom'] && !packageJson.devDependencies['react-dom']) { - packageJson.devDependencies['react-dom'] = '^15.5.4'; + const reactVersion = packageJson.dependencies.react; + packageJson.devDependencies['react-dom'] = reactVersion; } packageJson.scripts = packageJson.scripts || {}; diff --git a/package.json b/package.json index a3ef97b387f..076b0be0e40 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "jest": "^20.0.4", "jest-enzyme": "^3.2.0", "lerna": "2.0.0-rc.5", - "lint-staged": "^3.5.1", + "lint-staged": "^4.0.0", "markdown-it-anchor": "^4.0.0", "markdownlint-cli": "^0.3.1", "nodemon": "^1.11.0",