Merge pull request #2 from storybooks/master

Update from storybook/master

.circleci/config.yml

@@ -184,22 +184,12 @@ jobs:
           at: .
       - run:
           name: Bootstrap
-          command: yarn bootstrap --reactnative --reactnativeapp
-      - run:
-          name: Run React-Native example
-          command: |
-            cd examples/react-native-vanilla
-            yarn storybook --smoke-test
+          command: yarn bootstrap --reactnativeapp
       - run:
           name: Run React-Native-App example
           command: |
             cd examples/crna-kitchen-sink
             yarn storybook --smoke-test
-      - run:
-          name: Run React-Native unit tests
-          command: |
-            yarn test --coverage --runInBand --reactnative
-            yarn coverage
   docs:
     <<: *defaults
     steps:

.github/CODEOWNERS

@@ -31,7 +31,6 @@
 /examples/crna-kitchen-sink/ @Gongreg @danielduan
 /examples/official-storybook/ @hypnosphi @danielduan @UsulPro
 /examples/polymer-cli/ @naipath @igor-dv
-/examples/react-native-vanilla/ @tmeasday @danielduan
 /examples/vue-kitchen-sink/ @igor-dv @alexandrebodin
 /examples/svelte-kitchen-sink/ @plumpNation
 

.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_ReactNative.kt

@@ -9,8 +9,6 @@ object OpenSourceProjects_Storybook_ReactNative : BuildType({
     id = "OpenSourceProjects_Storybook_ReactNative"
     name = "React Native"
 
-    artifactRules = "examples/react-native-vanilla/coverage/lcov-report => coverage.zip"
-
     params {
         param("env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD", "true")
     }
@@ -26,15 +24,7 @@ object OpenSourceProjects_Storybook_ReactNative : BuildType({
             name = "Bootstrap"
             scriptContent = """
                 yarn
-                yarn bootstrap --core --reactnative --reactnativeapp
-            """.trimIndent()
-            dockerImage = "node:%docker.node.version%"
-        }
-        script {
-            name = "react-native-vanilla"
-            scriptContent = """
-                cd examples/react-native-vanilla
-                yarn storybook --smoke-test
+                yarn bootstrap --core --reactnativeapp
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"
         }
@@ -46,14 +36,6 @@ object OpenSourceProjects_Storybook_ReactNative : BuildType({
             """.trimIndent()
             dockerImage = "node:%docker.node.version%"
         }
-        script {
-            name = "Test"
-            scriptContent = """
-                yarn test --reactnative --coverage --runInBand --teamcity
-                yarn coverage
-            """.trimIndent()
-            dockerImage = "node:%docker.node.version%"
-        }
     }
 
     features {

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 4.0.0-alpha.24
+
+2018-October-04
+
+#### Features
+
+-   Ember: add ember support [#4237](https://github.com/storybooks/storybook/pull/4237)
+-   Riot: support the tagConstructor option [#4258](https://github.com/storybooks/storybook/pull/4258)
+-   Presets: Add "addons" and "config" to preset extensions [#4240](https://github.com/storybooks/storybook/pull/4240)
+
+#### Bug Fixes
+
+-   Webpack: Fix broken SVGs [#4260](https://github.com/storybooks/storybook/pull/4260)
+-   Babel/minify: use `builtIns: false` [#4262](https://github.com/storybooks/storybook/pull/4262)
+-   Addon-Notes: Fix how markdownOptions are passed to marked [#4242](https://github.com/storybooks/storybook/pull/4242)
+-   Addon-Knobs: Fix broken colorpicker [#4222](https://github.com/storybooks/storybook/pull/4222)
+
 # 4.0.0-alpha.23
 
 2018-September-25

CONTRIBUTING.md

@@ -60,13 +60,6 @@ You can also pick suites from CLI.  Suites available are listed below.
 This option executes test from `<rootdir>/app/react`, `<rootdir>/app/vue`, and `<rootdir>/lib`.
 Before the tests are ran, the project must be bootstrapped with core. You can accomplish this with `yarn bootstrap --core`
 
-##### React-Native example Tests
-
-`yarn test --reactnative`
-
-This option executes tests from `<rootdir>/app/react-native`.
-Before these tests are ran, the project must be bootstrapped with the React Native example enabled.  You can accomplish this by running `yarn bootstrap --reactnative`
-
 ##### CRA-kitchen-sink - Image snapshots using Storyshots
 
 `yarn test --image`

MIGRATION.md

@@ -9,6 +9,7 @@
   - [Storyshots changes](#storyshots-changes)
   - [Webpack 4](#webpack-4)
   - [Babel 7](#babel-7)
+  - [Create-react-app](#create-react-app)
 - [From version 3.3.x to 3.4.x](#from-version-33x-to-34x)
 - [From version 3.2.x to 3.3.x](#from-version-32x-to-33x)
   - [Refactored Knobs](#refactored-knobs)
@@ -82,11 +83,43 @@ Storybook now uses webpack 4. If you have a [custom webpack config](https://stor
 
 Storybook now uses Babel 7. There's a couple of cases when it can break with your app:
 
-* If you aren't using Babel yourself, and don't have .babelrc, install following dependencies:
+- If you aren't using Babel yourself, and don't have .babelrc, install following dependencies:
   ```
   npm i -D @babel/core babel-loader@next
   ```
-* If you're using Babel 6, make sure that you have direct dependencies on `babel-core@6` and `babel-loader@7`.
+- If you're using Babel 6, make sure that you have direct dependencies on `babel-core@6` and `babel-loader@7` and that you have a `.babelrc` in your project directory.
+
+### Create-react-app
+
+If you are using `create-react-app` (aka CRA), you may need to do some manual steps to upgrade, depending on the setup.
+
+- `create-react-app@1` may require manual migrations.
+  - If you're adding storybook for the first time, it should just work: `storybook init` should add the correct dependencies.
+  - If you've upgrading an existing project, your `package.json` probably already uses Babel 6, making it incompatible with `@storybook/react@4` which uses Babel 7. There are two ways to make it compatible, each of which is spelled out in detail in the next section:
+    - Upgrade to Babel 7 if you are not dependent on Babel 6-specific features.
+    - Migrate Babel 6 if you're heavily dependent on some Babel 6-specific features).
+- `create-react-app@2` should be compatible as is, since it uses babel 7.
+
+#### Upgrade CRA1 to babel 7
+
+```
+yarn remove babel-core babel-runtime
+yarn add @babel/core babel-loader --dev
+```
+
+#### Migrate CRA1 while keeping babel 6
+
+```
+yarn add babel-loader@7
+```
+
+Also make sure you have a `.babelrc` in your project directory. You probably already do if you are using Babel 6 features (otherwise you should consider upgrading to Babel 7 instead). If you don't have one, here's a simple one that works:
+
+```json
+{
+  "presets": ["env", "react"]
+}
+```
 
 ### start-storybook opens browser automatically
 

README.md

@@ -40,7 +40,7 @@ Storybook comes with a lot of [addons](https://storybook.js.org/addons/introduct
     -   🛠[Supported Frameworks & Examples](#supported-frameworks)
     -   🚇[Sub Projects](#sub-projects)
     -   🔗[Addons](#addons)
--   🏅[Badges & Presentation materials](#badges)
+-   🏅[Badges & Presentation materials](#badges--presentation-materials)
 -   👥[Community](#community)
 -   👏[Contributing](#contributing)
     -   👨‍💻[Development scripts](#development-scripts)

addons/a11y/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/client-logger": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/client-logger": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "axe-core": "^3.0.3",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"

addons/actions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Action Logger addon for storybook",
   "keywords": [
     "storybook"
@@ -26,9 +26,9 @@
     "@emotion/core": "^0.13.1",
     "@emotion/provider": "^0.11.2",
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "deep-equal": "^1.0.1",
     "global": "^4.3.2",
     "lodash.isequal": "^4.5.0",

addons/backgrounds/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "util-deprecate": "^1.0.2"

addons/centered/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

addons/events/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-events",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Add events to your Storybook stories.",
   "keywords": [
     "addon",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "format-json": "^1.0.3",
     "prop-types": "^15.6.2",
     "react-lifecycles-compat": "^3.0.4",

addons/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",

addons/info/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "A Storybook addon to show additional information for your stories.",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/client-logger": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/client-logger": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
     "core-js": "2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.0.3",

addons/jest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "util-deprecate": "^1.0.2"

addons/jest/src/register.js

@@ -7,7 +7,7 @@ import Panel from './components/Panel';
 addons.register('storybook/tests', api => {
   const channel = addons.getChannel();
   addons.addPanel('storybook/tests/panel', {
-    title: <PanelTitle channel={addons.getChannel()} api={api} />,
+    title: () => <PanelTitle channel={addons.getChannel()} api={api} />,
     // eslint-disable-next-line react/prop-types
     render: ({ active }) => <Panel channel={channel} api={api} active={active} />,
   });

addons/knobs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-knobs",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Storybook Addon Prop Editor Component",
   "keywords": [
     "addon",
@@ -25,9 +25,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "copy-to-clipboard": "^3.0.8",
     "escape-html": "^1.0.3",
     "fast-deep-equal": "^2.0.1",

addons/links/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Story Links addon for storybook",
   "keywords": [
     "addon",
@@ -24,9 +24,9 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.23",
-    "@storybook/components": "4.0.0-alpha.23",
-    "@storybook/core-events": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
+    "@storybook/components": "4.0.0-alpha.24",
+    "@storybook/core-events": "4.0.0-alpha.24",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"
   },

addons/notes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
     "marked": "^0.5.0",
     "prop-types": "^15.6.2"
   },

addons/options/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-options",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.24",
   "description": "Options addon for storybook",
   "keywords": [
     "addon",
@@ -23,7 +23,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.0.0-alpha.23",
+    "@storybook/addons": "4.0.0-alpha.24",
     "util-deprecate": "^1.0.2"
   },
   "peerDependencies": {