Merge pull request #3068 from storybooks/avoid-mixing-manager-and-pre…

…view Addons: avoid mixing manager and preview code together # Conflicts: # addons/storysource/register.js # addons/storysource/src/index.js
storybookjs · Mar 6, 2018 · e8edea6 · e8edea6
1 parent 7730400
commit e8edea6
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/addons/actions/register.js b/addons/actions/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/actions/src/index.js b/addons/actions/src/index.js
@@ -3,5 +3,4 @@ export const ADDON_ID = 'storybook/actions';
 export const PANEL_ID = `${ADDON_ID}/actions-panel`;
 export const EVENT_ID = `${ADDON_ID}/action-event`;
 
-export { register } from './manager';
 export { action, decorateAction } from './preview';
diff --git a/addons/events/README.md b/addons/events/README.md
@@ -25,8 +25,8 @@ Then create a file called `addons.js` in your storybook config.
 Add following content to it:
 
 ```js
-import '@storybook/addon-actions';
-import '@storybook/addon-links';
+import '@storybook/addon-actions/register';
+import '@storybook/addon-links/register';
 import '@storybook/addon-events/register';
 ```
 

diff --git a/addons/events/register.js b/addons/events/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/events/src/index.js b/addons/events/src/index.js
@@ -1,3 +1 @@
 export default from './preview';
-
-export { register } from './manager';
diff --git a/addons/links/register.js b/addons/links/register.js
@@ -1 +1 @@
-require('./dist').register();
+require('./dist/manager').register();
diff --git a/addons/links/src/index.js b/addons/links/src/index.js
@@ -3,7 +3,6 @@ export const EVENT_ID = `${ADDON_ID}/link-event`;
 export const REQUEST_HREF_EVENT_ID = `${ADDON_ID}/request-href-event`;
 export const RECEIVE_HREF_EVENT_ID = `${ADDON_ID}/receive-href-event`;
 
-export { register } from './manager';
 export { linkTo, hrefTo } from './preview';
 
 let hasWarned = false;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		require('./dist').register();
		require('./dist/manager').register();
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		export default from './preview';

		export { register } from './manager';