Merge branch 'master' into tmeasday/shilman-refactor-core-rebase

addons/actions/src/lib/util/index.js

@@ -2,5 +2,6 @@ export canConfigureName from './canConfigureName.js';
 export getPropertiesList from './getPropertiesList.js';
 export isObject from './isObject.js';
 export muteProperty from './muteProperty.js';
+export prepareArguments from './prepareArguments';
 export typeReviver from './typeReviver.js';
 export typeReplacer from './typeReplacer.js';

addons/actions/src/lib/util/prepareArguments.js

@@ -0,0 +1,13 @@
+import { decycle } from '../index';
+
+export default function prepareArguments(arg) {
+  if (arg && typeof arg.preventDefault !== 'undefined') {
+    return JSON.stringify(`[${arg.constructor.name}]`);
+  }
+
+  try {
+    return JSON.stringify(decycle(arg));
+  } catch (error) {
+    return error.toString(); // IE still cyclic.
+  }
+}

addons/actions/src/preview.js

@@ -3,25 +3,12 @@
 import addons from '@storybook/addons';
 import uuid from 'uuid/v1';
 import { EVENT_ID } from './';
-import { decycle } from './lib';
-import { canConfigureName } from './lib/util';
+import { canConfigureName, prepareArguments } from './lib/util';
 
 export function action(name) {
   // eslint-disable-next-line no-shadow
   const handler = function action(..._args) {
-    const args = _args.map(arg => {
-      let result;
-
-      try {
-        result = JSON.stringify(decycle(arg));
-      } catch (error) {
-        // IE still cyclic.
-
-        return JSON.stringify(error.toString());
-      }
-
-      return result;
-    });
+    const args = _args.map(prepareArguments);
     const channel = addons.getChannel();
     const id = uuid();
     channel.emit(EVENT_ID, {

app/react-native/src/bin/storybook-start.js

@@ -78,7 +78,7 @@ if (!program.skipPackager) {
   let cliCommand = 'node node_modules/react-native/local-cli/cli.js start';
   if (program.haul) {
     const platform = program.platform || 'all';
-    cliCommand = `node node_modules/.bin/haul start --config ${
+    cliCommand = `node node_modules/haul/bin/cli.js start --config ${
       program.haul
     } --platform ${platform}`;
   }

docs/src/pages/basics/guide-angular/index.md

@@ -113,3 +113,33 @@ npm run storybook
 
 Now you can change components and write stories whenever you need to.
 You'll get those changes into Storybook in a snap with the help of webpack's HMR API.
+
+## Tips
+
+### Configure style rules
+
+If you use `templateUrl` in your components, you need to configure webpack rules for .css/.scss files. Create a file named `webpack.config.js` under the config directory(by default `.storybook`):
+
+```js
+const genDefaultConfig = require('@storybook/angular/dist/server/config/defaults/webpack.config.js');
+
+module.exports = (baseConfig, env) => {
+  const config = genDefaultConfig(baseConfig, env);
+
+  // Overwrite .css rule
+  const cssRule = config.module.rules.find(rule => rule.test && rule.test.toString() === '/\\.css$/');
+  if (cssRule) {
+    cssRule.exclude = /\.component\.css$/;
+  }
+
+  // Add .scss rule
+  config.module.rules.unshift({
+    test: /\.scss$/,
+    loaders: ['raw-loader', 'sass-loader'],
+  });
+
+  return config;
+};
+```
+
+If you want more details, see [customize the webpack config](/configurations/custom-webpack-config/).

docs/src/pages/configurations/custom-webpack-config/index.md

@@ -87,6 +87,8 @@ Storybook uses the config returned from the above function. So, try to edit the
 -   first loader in the module.loaders (Babel loader for JS)
 -   all existing plugins
 
+> If your custom webpack config uses a loader that does not explicitly include specific file extensions via the `test` property, it is necessary to `exclude` the `.ejs` file extension from that loader.
+
 ## Full control mode + default
 
 You may want to keep Storybook's [default config](/configurations/default-config), but just need to extend it.

package.json

@@ -63,7 +63,7 @@
     "github-release-from-changelog": "^1.3.0",
     "glob": "^7.1.2",
     "husky": "^0.14.3",
-    "inquirer": "^4.0.1",
+    "inquirer": "^4.0.2",
     "jest": "^22.0.4",
     "jest-cli": "^22.0.4",
     "jest-config": "^22.0.4",

yarn.lock

@@ -6620,9 +6620,9 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-4.0.1.tgz#b25cd541789394b4bb56f6440fb213b121149096"
+inquirer@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-4.0.2.tgz#cc678b4cbc0e183a3500cc63395831ec956ab0a3"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"