Addon-storysource: Replace loader with source-loader ✂

CHANGELOG.md

@@ -458,7 +458,7 @@ Publish failed
 - Addon-docs: Docs page bugfix
 - Addon-docs: Fix source block for legacy stories
 
-NOTE: use `@storybook/addon-storysource/loader` with option `injectParameters: true` for legacy source
+NOTE: use `@storybook/source-loader` with option `injectParameters: true` for legacy source
 
 ## 5.2.0-alpha.6 (May 14, 2019)
 

addons/storysource/README.md

@@ -26,7 +26,7 @@ Use this hook to a custom webpack.config. This will generate a decorator call in
 module.exports = function({ config }) {
   config.module.rules.push({
     test: /\.stories\.jsx?$/,
-    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    loaders: [require.resolve('@storybook/source-loader')],
     enforce: 'pre',
   });
 
@@ -56,7 +56,7 @@ module.exports = function({ config }) {
     test: /\.stories\.jsx?$/,
     loaders: [
       {
-        loader: require.resolve('@storybook/addon-storysource/loader'),
+        loader: require.resolve('@storybook/source-loader'),
         options: { parser: 'typescript' },
       },
     ],
@@ -91,7 +91,7 @@ module.exports = function({ config }) {
     test: /\.stories\.jsx?$/,
     loaders: [
       {
-        loader: require.resolve('@storybook/addon-storysource/loader'),
+        loader: require.resolve('@storybook/source-loader'),
         options: {
           prettierConfig: {
             printWidth: 100,
@@ -125,7 +125,7 @@ module.exports = function({ config }) {
     test: /\.stories\.jsx?$/,
     loaders: [
       {
-        loader: require.resolve('@storybook/addon-storysource/loader'),
+        loader: require.resolve('@storybook/source-loader'),
         options: {
           uglyCommentsRegex: [/^eslint-.*/, /^global.*/],
         },
@@ -140,7 +140,7 @@ module.exports = function({ config }) {
 
 ### injectDecorator
 
-Tell storysource whether you need inject decorator.If false, you need to add the decorator by yourself;
+Tell storysource whether you need inject decorator. If false, you need to add the decorator by yourself;
 
 Defaults: true
 
@@ -152,7 +152,7 @@ module.exports = function({ config }) {
     test: /\.stories\.jsx?$/,
     loaders: [
       {
-        loader: require.resolve('@storybook/addon-storysource/loader'),
+        loader: require.resolve('@storybook/source-loader'),
         options: { injectDecorator: false },
       },
     ],

addons/storysource/loader.js

@@ -1 +1 @@
-module.exports = require('./dist/loader');
+module.exports = require('@storybook/source-loader');

addons/storysource/package.json

@@ -35,7 +35,8 @@
     "regenerator-runtime": "^0.12.1"
   },
   "peerDependencies": {
-    "react": "*"
+    "react": "*",
+    "@storybook/source-loader": "*"
   },
   "publishConfig": {
     "access": "public"

addons/storysource/src/StoryPanel.js

@@ -66,9 +66,8 @@ export default class StoryPanel extends Component {
     this.selectedStoryRef = ref;
   };
 
-  listener = ({ source, currentLocation, locationsMap }) => {
+  listener = ({ edition: { source }, location: { currentLocation, locationsMap } }) => {
     const locationsKeys = getLocationKeys(locationsMap);
-
     this.setState({
       source,
       currentLocation,

addons/storysource/src/events.js

@@ -1,3 +1,3 @@
-export const ADDON_ID = 'storybook/storysource';
+export const ADDON_ID = 'storybook/source-loader';
 export const PANEL_ID = `${ADDON_ID}/panel`;
 export const EVENT_ID = `${ADDON_ID}/set`;