Merge pull request #6 from storybooks/master

update from master
storybookjs · Oct 31, 2018 · fe3c5b1 · fe3c5b1
2 parents 4cd5266 + 48b2b51
commit fe3c5b1
Show file tree

Hide file tree

Showing 25 changed files with 574 additions and 254 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 4.0.2
+
+2018-October-31
+
+Fix broken 4.0.1 release
+
+#### Bug Fixes
+
+-   Addon-knobs: fix select array values showing k [#4586](https://github.com/storybooks/storybook/pull/4586)
+
+# 4.0.1
+
+2018-October-31
+
+Broken release - `@storybook/client-logger` [somehow didn't get published to NPM.](https://github.com/storybooks/storybook/issues/4660)
 
 # 4.0.0
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Kadira Inc. <[email protected]>
+Copyright (c) 2018 Norbert de Langen [email protected]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -44,7 +44,7 @@
     "zone.js": "^0.8.26"
   },
   "peerDependencies": {
-    "@angular-devkit/core": "^0.6.1",
+    "@angular-devkit/core": "^0.6.1 || >=7.0.0",
     "@angular/common": ">=6.0.0",
     "@angular/compiler": ">=6.0.0",
     "@angular/core": ">=6.0.0",

diff --git a/app/ember/package.json b/app/ember/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@ember/test-helpers": "^0.7.27",
+    "@ember/test-helpers": "^1.0.0",
     "@storybook/core": "4.0.0",
     "common-tags": "^1.8.0",
     "global": "^4.3.2",

diff --git a/app/react-native/docs/addons.md b/app/react-native/docs/addons.md
@@ -25,6 +25,7 @@ configure(() => {
 
 const StorybookUI = getStorybookUI();
 export default StorybookUI;
+```
 
 **storybook/rn-addons.js**
 ```

diff --git a/app/react-native/package.json b/app/react-native/package.json
@@ -58,7 +58,7 @@
     "lazy-universal-dotenv": "^2.0.0",
     "prop-types": "^15.6.2",
     "raw-loader": "^0.5.1",
-    "react-dev-utils": "^6.0.5",
+    "react-dev-utils": "^6.1.0",
     "react-native-swipe-gestures": "^1.0.2",
     "shelljs": "^0.8.2",
     "url-parse": "^1.4.3",

diff --git a/app/react-native/src/preview/components/OnDeviceUI/index.js b/app/react-native/src/preview/components/OnDeviceUI/index.js
@@ -124,6 +124,7 @@ export default class OnDeviceUI extends PureComponent {
           <Animated.View style={previewWrapperStyles}>
             <Animated.View style={previewStyles}>
               <TouchableOpacity
+                accessible={false}
                 style={style.flex}
                 disabled={tabOpen === PREVIEW}
                 onPress={this.handleOpenPreview}

diff --git a/app/react/package.json b/app/react/package.json
@@ -40,7 +40,7 @@
     "lodash": "^4.17.11",
     "mini-css-extract-plugin": "^0.4.4",
     "prop-types": "^15.6.2",
-    "react-dev-utils": "^6.0.5",
+    "react-dev-utils": "^6.1.0",
     "semver": "^5.6.0",
     "webpack": "^4.23.1"
   },

diff --git a/docs/package.json b/docs/package.json
@@ -19,7 +19,7 @@
     "prepare": "npm run snyk-protect"
   },
   "dependencies": {
-    "@storybook/addon-actions": "^3.4.11",
+    "@storybook/addon-actions": "^4.0.0",
     "@storybook/addon-links": "^3.4.11",
     "@storybook/addons": "^3.4.11",
     "@storybook/react": "^3.4.11",
@@ -28,7 +28,7 @@
     "common-tags": "^1.8.0",
     "gatsby": "^1.9.279",
     "gatsby-link": "^1.6.45",
-    "gatsby-plugin-sharp": "^2.0.7",
+    "gatsby-plugin-sharp": "^2.0.10",
     "gatsby-remark-autolink-headers": "^1.4.19",
     "gatsby-remark-copy-linked-files": "^1.5.37",
     "gatsby-remark-images": "^1.5.67",

diff --git a/docs/src/pages/basics/guide-ember/index.md b/docs/src/pages/basics/guide-ember/index.md
@@ -37,50 +37,20 @@ npm init
 
 Then add the following NPM script to your package json in order to start the storybook later in this guide:
 
-> In order for your storybook to run properly be sure to be either run `ember serve` or `ember build` before running any storybook commands.
+> In order for your storybook to run properly be sure to be either run `ember serve` or `ember build` before running any storybook commands. Running `ember serve` before storybook will enable live reloading.
 
 ```json
 {
   "scripts": {
-    "storybook": "start-storybook -p 9001 -s dist"
+    "build-storybook": "ember build && build-storybook -p 9001 -s dist",
+    "storybook": "ember serve & start-storybook -p 9001 -s dist"
   }
 }
 ```
 
 ## Setup environment
 
-### Adding preview-head.html
-
-In order for storybook to register your ember application you must add the following file to `.storybook/preview-head.html`
-
-> These scripts may not contain everything you need, a good point of reference is to look at what is in the head tag in your applications `dist/index.html` file when you build.
-
-```
-<meta name="{ember-app-name}/config/environment" content="%7B%22modulePrefix%22%3A%22{ember-app-name}%22%2C%22environment%22%3A%22test%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22{ember-app-name}%22%2C%22version%22%3A%224.0.0-alpha.23+4f61a2fb%22%7D%7D" />
-
-<link integrity="" rel="stylesheet" href="./assets/vendor.css">
-<link integrity="" rel="stylesheet" href="./assets/{ember-app-name}.css">
-
-<script src="./assets/vendor.js"></script>
-<script>
-  runningTests = true;
-</script>
-<script src="./assets/{ember-app-name}.js"></script>
-```
-
-> Adding the runningTests script is extremely important don't forget to add this as it will result in your application binding multiple times.
-
-Substitute `ember-app-name` with the name of your ember application.
-
-> This is found by going to `package.json` and referencing the name field
-
-### Adding .env
-
-A file named `.env` is needed in the root directory with the following contents:
-
-```
-STORYBOOK_NAME={ember-app-name}
-```
+Your environment will be preconfigured using `ember-cli-storybook`. This will add a `preview-head.html`, a `.env` and make sure that your environment is configured to work with live reload.
 
 ## Create the config file
 

diff --git a/docs/src/pages/basics/quick-start-guide/index.md b/docs/src/pages/basics/quick-start-guide/index.md
@@ -42,5 +42,6 @@ To learn more about what the Storybook CLI command `sb init` command does, have
 - [HTML](/basics/guide-html/)
 - [Svelte](/basics/guide-svelte/)
 - [Ember](/basics/guide-ember/)
+- [Riot](/basics/guide-riot/)
 
 A tutorial is also available at [Learn Storybook](https://www.learnstorybook.com) for a step-by-step guide (only available for React).
diff --git a/docs/src/pages/configurations/default-config/index.md b/docs/src/pages/configurations/default-config/index.md
@@ -28,7 +28,7 @@ Here are some key features of Storybook's Babel configurations.
 
 We have added ES2016 support with Babel for transpiling your JS code.
 In addition to that, we've added a few experimental features, like object spreading and async await.
-Check out our [source](https://github.com/storybooks/storybook/blob/master/lib/core/src/server/config/babel.js#L4) to learn more about these plugins.
+Check out our [source](https://github.com/storybooks/storybook/blob/master/lib/core/src/server/config/babel.dev.js) to learn more about these plugins.
 
 ### .babelrc support
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ configure(() => { @@
     const StorybookUI = getStorybookUI();
     export default StorybookUI;
+    ```
     **storybook/rn-addons.js**
     ```
@@ Expand Down @@