Fix problems from reverted cleanup

storybookjs · Oct 31, 2018 · 5074896 · 5074896
1 parent 6f8b195
commit 5074896
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 72 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,7 @@
+{
+  "printWidth": 100,
+  "tabWidth": 2,
+  "bracketSpacing": true,
+  "trailingComma": "es5",
+  "singleQuote": true
+}
diff --git a/README.md b/README.md
@@ -79,19 +79,19 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo
 
 ### Supported Frameworks
 
-| Framework                               | Demo latest                                                                                                                    | Demo prerelease                                   |                                                                                                |
-| --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
-| [React](app/react)                      | [v3.4.x](https://release-3-4--storybooks-official.netlify.com), [v3.3.x](https://release-3-3--storybooks-official.netlify.com) | [v4.0.0](https://storybooks-official.netlify.com) | [![React](https://img.shields.io/npm/dt/@storybook/react.svg)](app/react)                      |
-| [React Native](app/react-native)        | -                                                                                                                              | -                                                 | [![React Native](https://img.shields.io/npm/dt/@storybook/react-native.svg)](app/react-native) |
-| [Vue](app/vue)                          | [v3.4.x](https://release-3-4--storybooks-vue.netlify.com/), [v3.3.x](https://release-3-3--storybooks-vue.netlify.com/)         | [v4.0.0](https://storybooks-vue.netlify.com/)     | [![Vue](https://img.shields.io/npm/dt/@storybook/vue.svg)](app/vue)                            |
-| [Angular](app/angular)                  | [v3.4.x](https://release-3-4--storybooks-angular.netlify.com/), [v3.3.x](https://release-3-3--storybooks-angular.netlify.com/) | [v4.0.0](https://storybooks-angular.netlify.com/) | [![Angular](https://img.shields.io/npm/dt/@storybook/angular.svg)](app/angular)                |
-| [Polymer](app/polymer)                  | [v3.4.x](https://release-3-4--storybooks-polymer.netlify.com/)                                                                 | [v4.0.0](https://storybooks-polymer.netlify.com/) | [![Polymer](https://img.shields.io/npm/dt/@storybook/polymer.svg)](app/polymer)                |
-| [Mithril](app/mithril) <sup>alpha</sup> | -                                                                                                                              | [v4.0.0](https://storybooks-mithril.netlify.com/) | [![Mithril](https://img.shields.io/npm/dt/@storybook/mithril.svg)](app/mithril)                |
-| [Marko](app/marko) <sup>alpha</sup>     | -                                                                                                                              | [v4.0.0](https://storybooks-marko.netlify.com/)   | [![Marko](https://img.shields.io/npm/dt/@storybook/marko.svg)](app/marko)                      |
-| [HTML](app/html) <sup>alpha</sup>       | -                                                                                                                              | [v4.0.0](https://storybooks-html.netlify.com/)    | [![HTML](https://img.shields.io/npm/dt/@storybook/html.svg)](app/html)                         |
-| [Svelte](app/svelte) <sup>alpha</sup>   | -                                                                                                                              | [v4.0.0](https://storybooks-svelte.netlify.com/)  | [![Svelte](https://img.shields.io/npm/dt/@storybook/svelte.svg)](app/svelte)                   |
-| [Riot](app/riot) <sup>alpha</sup>       | -                                                                                                                              | [v4.0.0](https://storybooks-riot.netlify.com/)    | [![Riot](https://img.shields.io/npm/dt/@storybook/riot.svg)](app/riot)                         |
-| [Ember](app/ember) <sup>alpha</sup>     | -                                                                                                                              | [v4.0.0](https://storybooks-ember.netlify.com/)   | [![Ember](https://img.shields.io/npm/dt/@storybook/ember.svg)](app/ember)                      |
+| Framework                        | Demo latest                                                                                                                    | Demo prerelease                                   |                                                                                                |
+| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
+| [React](app/react)               | [v3.4.x](https://release-3-4--storybooks-official.netlify.com), [v3.3.x](https://release-3-3--storybooks-official.netlify.com) | [v4.0.0](https://storybooks-official.netlify.com) | [![React](https://img.shields.io/npm/dt/@storybook/react.svg)](app/react)                      |
+| [React Native](app/react-native) | -                                                                                                                              | -                                                 | [![React Native](https://img.shields.io/npm/dt/@storybook/react-native.svg)](app/react-native) |
+| [Vue](app/vue)                   | [v3.4.x](https://release-3-4--storybooks-vue.netlify.com/), [v3.3.x](https://release-3-3--storybooks-vue.netlify.com/)         | [v4.0.0](https://storybooks-vue.netlify.com/)     | [![Vue](https://img.shields.io/npm/dt/@storybook/vue.svg)](app/vue)                            |
+| [Angular](app/angular)           | [v3.4.x](https://release-3-4--storybooks-angular.netlify.com/), [v3.3.x](https://release-3-3--storybooks-angular.netlify.com/) | [v4.0.0](https://storybooks-angular.netlify.com/) | [![Angular](https://img.shields.io/npm/dt/@storybook/angular.svg)](app/angular)                |
+| [Polymer](app/polymer)           | [v3.4.x](https://release-3-4--storybooks-polymer.netlify.com/)                                                                 | [v4.0.0](https://storybooks-polymer.netlify.com/) | [![Polymer](https://img.shields.io/npm/dt/@storybook/polymer.svg)](app/polymer)                |
+| [Mithril](app/mithril)           | -                                                                                                                              | [v4.0.0](https://storybooks-mithril.netlify.com/) | [![Mithril](https://img.shields.io/npm/dt/@storybook/mithril.svg)](app/mithril)                |
+| [Marko](app/marko)               | -                                                                                                                              | [v4.0.0](https://storybooks-marko.netlify.com/)   | [![Marko](https://img.shields.io/npm/dt/@storybook/marko.svg)](app/marko)                      |
+| [HTML](app/html)                 | -                                                                                                                              | [v4.0.0](https://storybooks-html.netlify.com/)    | [![HTML](https://img.shields.io/npm/dt/@storybook/html.svg)](app/html)                         |
+| [Svelte](app/svelte)             | -                                                                                                                              | [v4.0.0](https://storybooks-svelte.netlify.com/)  | [![Svelte](https://img.shields.io/npm/dt/@storybook/svelte.svg)](app/svelte)                   |
+| [Riot](app/riot)                 | -                                                                                                                              | [v4.0.0](https://storybooks-riot.netlify.com/)    | [![Riot](https://img.shields.io/npm/dt/@storybook/riot.svg)](app/riot)                         |
+| [Ember](app/ember)               | -                                                                                                                              | [v4.0.0](https://storybooks-ember.netlify.com/)   | [![Ember](https://img.shields.io/npm/dt/@storybook/ember.svg)](app/ember)                      |
 
 ### Sub Projects
 

diff --git a/RELEASES.md b/RELEASES.md
@@ -48,7 +48,7 @@ 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.
+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.
 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`
@@ -88,7 +88,6 @@ 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://now-examples-slackin-rrirkqohko.now.sh/) [![Storybook Slack](https://now-examples-slackin-rrirkqohko.now.sh/badge.svg)](https://now-examples-slackin-rrirkqohko.now.sh/)
 
-
 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
@@ -100,20 +99,19 @@ 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: <https://github.com/storybooks/storybook/issues/151>)
-    -   Once it's implemented, the discussion may be occur on the PR (ex: <https://github.com/storybooks/storybook/pull/1329>)
-    -   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).
+- 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: <https://github.com/storybooks/storybook/issues/151>)
+  - Once it's implemented, the discussion may be occur on the PR (ex: <https://github.com/storybooks/storybook/pull/1329>)
+  - 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.
-
+- 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.
diff --git a/addons/notes/README.md b/addons/notes/README.md
@@ -7,7 +7,8 @@ Storybook Addon Notes allows you to write notes (text or HTML) for your stories
 ![Storybook Addon Notes Demo](docs/demo.png)
 
 ### Getting Started
-**NOTE: Documentation on master branch is for alpha version, stable release is on [release/3.4](https://github.com/storybooks/storybook/tree/release/3.4/addons/)**
+
+**NOTE: Documentation on master branch is for alpha version, stable release is on [release/4.0](https://github.com/storybooks/storybook/tree/release/4.0/addons/)**
 
 ```sh
 yarn add -D @storybook/addon-notes

diff --git a/addons/ondevice-notes/README.md b/addons/ondevice-notes/README.md
@@ -23,6 +23,7 @@ import '@storybook/addon-ondevice-notes/register';
 ```
 
 Then import `rn-addons.js` next to your `getStorybookUI` call.
+
 ```js
 import './rn-addons';
 ```

diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@storybook/addon-actions": "4.0.0",
     "@storybook/addon-links": "4.0.0",
-    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/addons": "4.0.0",
     "@storybook/react": "4.0.0",
     "enzyme-to-json": "^3.3.4",
     "react": "^16.5.2"