Merge branch 'next' into tech/overhaul-ui

# Conflicts: # addons/actions/package.json # addons/backgrounds/package.json # addons/notes/package.json # addons/storyshots/storyshots-core/package.json # lib/addons/package.json # lib/channel-websocket/package.json # lib/components/package.json # lib/core/src/client/preview/story_store.js # lib/core/src/server/manager/manager-webpack.config.js # lib/ui/package.json # lib/ui/src/modules/api/configs/init_api.js # lib/ui/src/modules/ui/components/menu_item.stories.js # lib/ui/src/modules/ui/components/search_box.stories.js # lib/ui/src/modules/ui/components/shortcuts_help.stories.js # lib/ui/src/modules/ui/components/stories_panel/index.stories.js # lib/ui/src/modules/ui/components/stories_panel/stories_tree/index.stories.js # lib/ui/src/modules/ui/components/stories_panel/text_filter.stories.js
storybookjs · Nov 30, 2018 · aab7aa2 · aab7aa2
2 parents efbf470 + 5f69057
commit aab7aa2
Show file tree

Hide file tree

Showing 81 changed files with 776 additions and 472 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -1,12 +1,17 @@
 module.exports = {
-  presets: ['@babel/preset-env', '@babel/preset-react', '@babel/preset-flow'],
+  presets: [
+    ['@babel/preset-env', { shippedProposals: true }],
+    '@babel/preset-react',
+    '@babel/preset-flow',
+  ],
   plugins: [
     ['emotion', { sourceMap: true, autoLabel: true }],
     'babel-plugin-add-react-displayname',
     'babel-plugin-macros',
     '@babel/plugin-syntax-dynamic-import',
     '@babel/plugin-proposal-object-rest-spread',
     '@babel/plugin-proposal-class-properties',
+    '@babel/plugin-proposal-object-rest-spread',
     '@babel/plugin-proposal-export-default-from',
     [
       '@babel/plugin-transform-runtime',
@@ -23,7 +28,7 @@ module.exports = {
   overrides: [
     {
       test: './examples/vue-kitchen-sink',
-      presets: ['@babel/preset-env', 'babel-preset-vue'],
+      presets: [['@babel/preset-env', { shippedProposals: true }], 'babel-preset-vue'],
     },
     {
       test: [

diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,5 @@
 dist
+lib/**/dll
 build
 coverage
 node_modules

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -82,6 +82,12 @@ module.exports = {
     ],
   },
   overrides: [
+    {
+      files: ['**/__tests__/**', '**/*.test.js/**', '**/*.spec.js/**'],
+      rules: {
+        'import/no-extraneous-dependencies': ignore,
+      },
+    },
     {
       files: ['**/react-native*/**', '**/REACT_NATIVE*/**', '**/crna*/**'],
       rules: { 'jsx-a11y/accessible-emoji': ignore },

diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ integration/__image_snapshots__/__diff_output__
 .jest-test-results.json
 /examples/cra-kitchen-sink/src/__image_snapshots__/__diff_output__/
 lib/*.jar
+lib/**/dll
diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Bootstrap.kt
@@ -17,6 +17,7 @@ object OpenSourceProjects_Storybook_Bootstrap : BuildType({
         addons/storyshots/*/dist/** => dist.zip/addons/storyshots
         app/*/dist/** => dist.zip/app
         lib/*/dist/** => dist.zip/lib
+        lib/core/dll/** => dist.zip/lib/core/dll
     """.trimIndent()
 
     vcs {

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/OpenSourceProjects_Storybook_Examples.kt
@@ -12,10 +12,10 @@ object OpenSourceProjects_Storybook_Examples : BuildType({
     name = "Examples"
 
     artifactRules = """
-${StorybookApp.values().map { it.artifactPath }.joinToString("\n")}
-examples/official-storybook/storybook-static => official.zip
-examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapshots
-""".trimIndent()
+        ${StorybookApp.values().map { it.artifactPath }.joinToString("\n")}
+        examples/official-storybook/storybook-static => official.zip
+        examples/official-storybook/image-snapshots/__image_snapshots__ => image-snapshots
+    """.trimIndent()
 
     vcs {
         root(OpenSourceProjects_Storybook.vcsRoots.OpenSourceProjects_Storybook_HttpsGithubComStorybooksStorybookRefsHeadsMaster)

diff --git a/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt b/.teamcity/OpenSourceProjects_Storybook/buildTypes/StorybookApp.kt
@@ -82,7 +82,9 @@ enum class StorybookApp(val appName: String, val exampleDir: String, val merged:
                 }
 
                 artifacts {
-                    artifactRules = "dist.zip!**"
+                    artifactRules = """
+                        dist.zip!**
+                    """.trimIndent()
                 }
             }
         }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## 4.1.0-alpha.9 (November 29, 2018)
+
+### Features
+
+* UI: Accessible success/fail colors ([#4843](https://github.com/storybooks/storybook/pull/4843))
+* React-native: add option to set keyboarVerticalOffset ([#4862](https://github.com/storybooks/storybook/pull/4862))
+* Addon-CSSResources: new adddon to dynamically add/remove css ([#4622](https://github.com/storybooks/storybook/pull/4622))
+
+### Bug Fixes
+
+* Core: Add try, catch for history API for IE11 ([#4870](https://github.com/storybooks/storybook/pull/4870))
+* Core: Don't copy index.html on build-storybook ([#4856](https://github.com/storybooks/storybook/pull/4856))
+* React-native: properly set initial story out of Async Storage. ([#4872](https://github.com/storybooks/storybook/pull/4872))
+* React-native: show webpack-related build issues ([#4883](https://github.com/storybooks/storybook/pull/4883))
+* Addon-info: fix docgen description display ([#4685](https://github.com/storybooks/storybook/pull/4685))
+
+### Dependency Upgrades
+
+* Bump svelte to 2.15.3, addresses !4478 ([#4842](https://github.com/storybooks/storybook/pull/4842))
+
 ## 4.1.0-alpha.8 (November 25, 2018)
 
 ### Features

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-a11y",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "a11y addon for storybook",
   "keywords": [
     "a11y",
@@ -29,10 +29,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.8",
-    "@storybook/client-logger": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
-    "@storybook/core-events": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/client-logger": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
+    "@storybook/core-events": "4.1.0-alpha.9",
     "axe-core": "^3.1.2",
     "global": "^4.3.2",
     "prop-types": "^15.6.2"

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-actions",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "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.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
-    "@storybook/core-events": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
+    "@storybook/core-events": "4.1.0-alpha.9",
     "fast-deep-equal": "^2.0.1",
     "global": "^4.3.2",
     "lodash": "^4.17.11",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-backgrounds",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -28,9 +28,10 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
-    "@storybook/core-events": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
+    "@storybook/core-events": "4.1.0-alpha.9",
+    "eventemitter3": "^3.1.0",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "util-deprecate": "^1.0.2"

diff --git a/addons/backgrounds/src/__tests__/BackgroundPanel.js b/addons/backgrounds/src/__tests__/BackgroundPanel.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow, mount } from 'enzyme';
-import EventEmitter from 'events';
+import EventEmitter from 'eventemitter3';
 
 import Panel from '../Panel';
 import Events from '../constants';

diff --git a/addons/centered/package.json b/addons/centered/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-centered",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "Storybook decorator to center components",
   "keywords": [
     "addon",

diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-cssresources",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "A storybook addon to switch between css resources at runtime for your story",
   "keywords": [
     "addon",
@@ -9,6 +9,9 @@
     "storybook"
   ],
   "homepage": "https://storybook.js.org",
+  "publishConfig": {
+    "access": "public"
+  },
   "bugs": {
     "url": "https://github.com/storybooks/storybook/issues"
   },
@@ -25,9 +28,9 @@
   },
   "dependencies": {
     "@emotion/styled": "0.10.6",
-    "@storybook/addons": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
-    "@storybook/core-events": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
+    "@storybook/core-events": "4.1.0-alpha.9",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "react-syntax-highlighter": "^10.0.0",

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

diff --git a/addons/google-analytics/package.json b/addons/google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-google-analytics",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "Storybook addon for google analytics",
   "keywords": [
     "addon",
@@ -24,7 +24,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
     "global": "^4.3.2",
     "react-ga": "^2.5.3"
   }

diff --git a/addons/graphql/package.json b/addons/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-graphql",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "Storybook addon to display the GraphiQL IDE",
   "keywords": [
     "addon",

diff --git a/addons/info/package.json b/addons/info/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-info",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "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.1.0-alpha.8",
-    "@storybook/client-logger": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/client-logger": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
     "core-js": "2.5.7",
     "global": "^4.3.2",
     "marksy": "^6.1.0",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-jest",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "React storybook addon that show component jest report",
   "keywords": [
     "addon",
@@ -31,8 +31,8 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
     "global": "^4.3.2",
     "prop-types": "^15.6.2",
     "upath": "^1.1.0",

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

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

diff --git a/addons/notes/package.json b/addons/notes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-notes",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "Write notes for your Storybook stories.",
   "keywords": [
     "addon",
@@ -26,9 +26,9 @@
   },
   "dependencies": {
     "@emotion/styled": "^0.10.6",
-    "@storybook/addons": "4.1.0-alpha.8",
-    "@storybook/components": "4.1.0-alpha.8",
-    "@storybook/core-events": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
+    "@storybook/components": "4.1.0-alpha.9",
+    "@storybook/core-events": "4.1.0-alpha.9",
     "markdown-to-jsx": "^6.7.4",
     "prop-types": "^15.6.2"
   },

diff --git a/addons/ondevice-backgrounds/package.json b/addons/ondevice-backgrounds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-ondevice-backgrounds",
-  "version": "4.1.0-alpha.8",
+  "version": "4.1.0-alpha.9",
   "description": "A storybook addon to show different backgrounds for your preview",
   "keywords": [
     "addon",
@@ -26,7 +26,7 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "4.1.0-alpha.8",
+    "@storybook/addons": "4.1.0-alpha.9",
     "prop-types": "^15.6.2"
   },
   "peerDependencies": {