Merge branch 'master' into webpack-4

addons/storysource/README.md

@@ -40,6 +40,34 @@ module.exports = {
 
 The loader can be customized with the following options:
 
+### parser
+The parser that will be parsing your code to AST (based on [prettier](https://github.com/prettier/prettier/tree/master/src/language-js))
+
+Alowed values:
+* `javascript` - default
+* `typescript`
+
+Usage:
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.stories\.jsx?$/,
+        loaders: [
+          {
+            loader: require.resolve('@storybook/addon-storysource/loader'),
+            options: { parser: 'typescript' }
+          }
+        ],
+        enforce: 'pre',
+      },
+    ],
+  },
+};
+```
+
 ### prettierConfig
 
 The prettier configuration that will be used to format the story source in the addon panel.

docs/package.json

@@ -37,7 +37,7 @@
     "global": "^4.3.2",
     "highlight.js": "^9.12.0",
     "lodash": "^4.17.5",
-    "marked": "^0.3.18",
+    "marked": "^0.3.19",
     "prop-types": "^15.6.1",
     "react": "^15.6.1",
     "react-document-title": "^2.0.3",

docs/yarn.lock

@@ -6830,9 +6830,9 @@ markdown-table@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c"
 
-marked@^0.3.18:
+marked@^0.3.19:
-  version "0.3.18"
+  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.18.tgz#3ef058cd926101849b92a7a7c15db18c7fc76b2f"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
 
 marked@^0.3.6:
   version "0.3.9"