From 8f84c3a5a3a6d81c4e85e74f3ebd390a4e3721f9 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 25 Nov 2019 15:05:18 +0100 Subject: [PATCH] MIGRATE rax-example --- .../rax-kitchen-sink/.storybook/addons.js | 10 ------ .../rax-kitchen-sink/.storybook/config.js | 16 --------- examples/rax-kitchen-sink/.storybook/main.js | 36 +++++++++++++++++++ .../rax-kitchen-sink/.storybook/manager.js | 19 ++++++++++ .../.storybook/webpack.config.js | 21 ----------- examples/rax-kitchen-sink/package.json | 1 + 6 files changed, 56 insertions(+), 47 deletions(-) delete mode 100644 examples/rax-kitchen-sink/.storybook/addons.js delete mode 100644 examples/rax-kitchen-sink/.storybook/config.js create mode 100644 examples/rax-kitchen-sink/.storybook/main.js create mode 100644 examples/rax-kitchen-sink/.storybook/manager.js delete mode 100644 examples/rax-kitchen-sink/.storybook/webpack.config.js diff --git a/examples/rax-kitchen-sink/.storybook/addons.js b/examples/rax-kitchen-sink/.storybook/addons.js deleted file mode 100644 index 0c163b22837..00000000000 --- a/examples/rax-kitchen-sink/.storybook/addons.js +++ /dev/null @@ -1,10 +0,0 @@ -import '@storybook/addon-storysource/register'; -import '@storybook/addon-actions/register'; -import '@storybook/addon-links/register'; -import '@storybook/addon-events/register'; -import '@storybook/addon-notes/register'; -import '@storybook/addon-options/register'; -import '@storybook/addon-knobs/register'; -import '@storybook/addon-backgrounds/register'; -import '@storybook/addon-a11y/register'; -import '@storybook/addon-jest/register'; diff --git a/examples/rax-kitchen-sink/.storybook/config.js b/examples/rax-kitchen-sink/.storybook/config.js deleted file mode 100644 index a461578d87e..00000000000 --- a/examples/rax-kitchen-sink/.storybook/config.js +++ /dev/null @@ -1,16 +0,0 @@ -import { configure, addParameters } from '@storybook/rax'; - -addParameters({ - options: { - name: 'Stroybook for Rax', - url: 'https://github.com/storybookjs/storybook/tree/master/examples/rax-kitchen-sink', - goFullScreen: false, - showAddonsPanel: true, - showSearchBox: false, - showRoots: true, - enableShortcuts: true, - panelPosition: 'bottom', - }, -}); - -configure(require.context('../src/stories', true, /\.stories\.js$/), module); diff --git a/examples/rax-kitchen-sink/.storybook/main.js b/examples/rax-kitchen-sink/.storybook/main.js new file mode 100644 index 00000000000..1075d2a9d6d --- /dev/null +++ b/examples/rax-kitchen-sink/.storybook/main.js @@ -0,0 +1,36 @@ +const path = require('path'); + +module.exports = { + stories: ['../src/stories/**/*.stories.js'], + addons: [ + '@storybook/addon-storysource/register', + '@storybook/addon-actions/register', + '@storybook/addon-links/register', + '@storybook/addon-events/register', + '@storybook/addon-notes/register', + '@storybook/addon-options/register', + '@storybook/addon-knobs/register', + '@storybook/addon-backgrounds/register', + '@storybook/addon-a11y/register', + '@storybook/addon-jest/register', + ], + webpack: async config => ({ + ...config, + module: { + ...config.module, + rules: [ + ...config.module.rules, + { + test: [/\.stories\.js$/, /index\.js$/], + loaders: [require.resolve('@storybook/source-loader')], + include: [path.resolve(__dirname, '../src')], + enforce: 'pre', + }, + { + test: /\.stylesheet$/, + use: [require.resolve('stylesheet-loader')], + }, + ], + }, + }), +}; diff --git a/examples/rax-kitchen-sink/.storybook/manager.js b/examples/rax-kitchen-sink/.storybook/manager.js new file mode 100644 index 00000000000..29673158057 --- /dev/null +++ b/examples/rax-kitchen-sink/.storybook/manager.js @@ -0,0 +1,19 @@ +import { addons } from '@storybook/addons'; +import { create } from '@storybook/theming/create'; + +const theme = create({ + base: 'light', + + brandTitle: 'Storybook for Rax', + brandUrl: 'https://github.com/storybookjs/storybook/tree/master/examples/rax-kitchen-sink', +}); + +addons.setConfig({ + goFullScreen: false, + showAddonsPanel: true, + showSearchBox: false, + showRoots: true, + enableShortcuts: true, + panelPosition: 'bottom', + theme, +}); diff --git a/examples/rax-kitchen-sink/.storybook/webpack.config.js b/examples/rax-kitchen-sink/.storybook/webpack.config.js deleted file mode 100644 index c3648ab2f3c..00000000000 --- a/examples/rax-kitchen-sink/.storybook/webpack.config.js +++ /dev/null @@ -1,21 +0,0 @@ -const path = require('path'); - -module.exports = async ({ config, mode }) => ({ - ...config, - module: { - ...config.module, - rules: [ - ...config.module.rules, - { - test: [/\.stories\.js$/, /index\.js$/], - loaders: [require.resolve('@storybook/source-loader')], - include: [path.resolve(__dirname, '../src')], - enforce: 'pre', - }, - { - test: /\.stylesheet$/, - use: [require.resolve('stylesheet-loader')], - }, - ], - }, -}); diff --git a/examples/rax-kitchen-sink/package.json b/examples/rax-kitchen-sink/package.json index af75ad72a70..03c95ce5091 100644 --- a/examples/rax-kitchen-sink/package.json +++ b/examples/rax-kitchen-sink/package.json @@ -38,6 +38,7 @@ "@storybook/addons": "5.3.0-beta.6", "@storybook/rax": "5.3.0-beta.6", "@storybook/source-loader": "5.3.0-beta.6", + "@storybook/theming": "5.3.0-beta.6", "babel-eslint": "^10.0.3", "babel-preset-rax": "^1.0.0-beta.0", "rax-scripts": "^2.0.0",