Merge remote-tracking branch 'origin/next' into core/separate-manager-from-preview

# Conflicts:
#	lib/core/src/server/config/webpack.config.dev.js
#	lib/core/src/server/config/webpack.config.prod.js

addons/info/src/components/Story.js

@@ -350,7 +350,7 @@ class Story extends Component {
     extract(children);
 
     const array = Array.from(types.keys());
-    array.sort((a, b) => getName(a) > getName(b));
+    array.sort((a, b) => (getName(a) > getName(b) ? 1 : -1));
 
     propTables = array.map((type, i) => (
       // eslint-disable-next-line react/no-array-index-key

addons/jest/src/index.js

@@ -5,13 +5,19 @@ import { normalize } from 'upath';
 const findTestResults = (testFiles, jestTestResults, jestTestFilesExt) =>
   Object.values(testFiles).map(name => {
     const fileName = `${name}${jestTestFilesExt}`;
+
     if (jestTestResults && jestTestResults.testResults) {
+      const fileNamePattern = new RegExp(fileName);
+
       return {
         fileName,
         name,
-        result: jestTestResults.testResults.find(t => normalize(t.name).includes(fileName)),
+        result: jestTestResults.testResults.find(test =>
+          normalize(test.name).match(fileNamePattern)
+        ),
       };
     }
+
     return { fileName, name };
   });
 
@@ -38,13 +44,12 @@ export const withTests = userOptions => {
       }, 'Passing component filenames to the `@storybook/addon-jest` via `withTests` is deprecated. Instead, use the `jest` story parameter');
     }
 
-    const [
-      story,
-      {
-        kind,
-        parameters: { jest: testFiles },
-      },
-    ] = args;
+    const [story, { kind, parameters = {} }] = args;
+    let { jest: testFiles } = parameters;
+
+    if (typeof testFiles === 'string') {
+      testFiles = [testFiles];
+    }
 
     if (testFiles && !testFiles.disable) {
       emitAddTests({ kind, story, testFiles, options });

addons/knobs/src/components/types/Number.js

@@ -85,7 +85,7 @@ class NumberType extends React.Component {
 NumberType.propTypes = {
   knob: PropTypes.shape({
     name: PropTypes.string,
-    value: PropTypes.number,
+    value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     range: PropTypes.bool,
     min: PropTypes.number,
     max: PropTypes.number,

addons/viewport/src/manager/components/Panel.js

@@ -25,8 +25,9 @@ const Container = styled.div({
 });
 Container.displayName = 'Container';
 
-const getDefaultViewport = (viewports, candidateViewport) =>
-  candidateViewport in viewports ? candidateViewport : Object.keys(viewports)[0];
+function getDefaultViewport(viewports, candidateViewport) {
+  return candidateViewport in viewports ? candidateViewport : Object.keys(viewports)[0];
+}
 
 const getViewports = viewports =>
   Object.keys(viewports).length > 0 ? viewports : INITIAL_VIEWPORTS;
@@ -62,7 +63,6 @@ export class Panel extends Component {
 
   componentDidMount() {
     const { channel, api } = this.props;
-    const { defaultViewport } = this.state;
 
     this.iframe = document.getElementById(storybookIframe);
 
@@ -71,6 +71,7 @@ export class Panel extends Component {
     channel.on(SET_STORY_DEFAULT_VIEWPORT_EVENT_ID, this.setStoryDefaultViewport);
 
     this.unsubscribeFromOnStory = api.onStory(() => {
+      const { defaultViewport } = this.state;
       this.setStoryDefaultViewport(defaultViewport);
     });
   }
@@ -98,7 +99,7 @@ export class Panel extends Component {
   };
 
   configure = (options = Panel.defaultOptions) => {
-    const viewports = getViewports(options.viewports);
+    const viewports = getViewports(options.viewports || {});
     const defaultViewport = getDefaultViewport(viewports, options.defaultViewport);
 
     this.setState(

dangerfile.js

@@ -10,7 +10,7 @@ const Versions = {
   MAJOR: 'MAJOR',
 };
 
-const branchVersion = Versions.PATCH;
+const branchVersion = Versions.MINOR;
 
 const checkRequiredLabels = labels => {
   const forbiddenLabels = flatten([

docs/src/pages/examples/_examples.yml

@@ -159,3 +159,10 @@ trunx:
   demo: https://g14n.info/trunx
   source: https://github.com/fibo/trunx
   site: https://github.com/fibo/trunx
+auth0:
+  thumbnail: cosmos.png
+  title: Cosmos
+  description: A Design System For Auth0 Products
+  demo: https://auth0-cosmos.now.sh/sandbox/
+  source: https://github.com/auth0/cosmos
+  site: https://auth0-cosmos.now.sh/

examples/html-kitchen-sink/.storybook/config.js

@@ -1,9 +1,11 @@
-import { configure } from '@storybook/html';
-import { setOptions } from '@storybook/addon-options';
+import { configure, addDecorator } from '@storybook/html';
+import { withOptions } from '@storybook/addon-options';
 
-setOptions({
-  hierarchyRootSeparator: /\|/,
-});
+addDecorator(
+  withOptions({
+    hierarchyRootSeparator: /\|/,
+  })
+);
 
 // automatically import all files ending in *.stories.js
 const req = require.context('../stories', true, /.stories.js$/);

examples/html-kitchen-sink/stories/addon-a11y.stories.js

@@ -1,17 +1,12 @@
 import { document, setTimeout } from 'global';
 import { storiesOf } from '@storybook/html';
-import { setOptions } from '@storybook/addon-options';
-
 import { checkA11y } from '@storybook/addon-a11y';
 
 const text = 'Testing the a11y addon';
 
 storiesOf('Addons|a11y', module)
   .addDecorator(checkA11y)
-  .addDecorator(fn => {
-    setOptions({ selectedAddonPanel: '@storybook/addon-a11y/panel' });
-    return fn();
-  })
+  .addParameters({ options: { selectedAddonPanel: '@storybook/addon-a11y/panel' } })
   .add('Default', () => `<button></button>`)
   .add('Label', () => `<button>${text}</button>`)
   .add('Disabled', () => `<button disabled>${text}</button>`)