Core: Rename load => configure

rmccue · Jul 26, 2019 · 0ac4898 · 0ac4898
1 parent adef6bd
commit 0ac4898
Show file tree

Hide file tree

Showing 38 changed files with 58 additions and 77 deletions.
diff --git a/app/angular/src/client/index.ts b/app/angular/src/client/index.ts
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 export { moduleMetadata } from './preview/angular/decorators';

diff --git a/app/angular/src/client/preview/index.ts b/app/angular/src/client/preview/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
 import { start } from '@storybook/core/client';
-import { ClientStoryApi } from '@storybook/addons';
+import { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import render from './render';
@@ -10,7 +10,7 @@ const framework = 'angular';
 
 interface ClientApi extends ClientStoryApi<StoryFnAngularReturnType> {
   setAddon(addon: any): void;
-  configure(loaders: () => void, module: NodeModule): void;
+  configure(loader: Loadable, module: NodeModule, framework: string): void;
   getStorybook(): IStorybookSection[];
   clearDecorators(): void;
   forceReRender(): void;
@@ -26,12 +26,11 @@ export const storiesOf: ClientApi['storiesOf'] = (kind, m) => {
   });
 };
 
-export const load: ClientApi['load'] = (...args) => api.load(...args, framework);
+export const configure: ClientApi['configure'] = (...args) => api.configure(...args, framework);
 export const addDecorator: ClientApi['addDecorator'] = api.clientApi.addDecorator;
 export const addParameters: ClientApi['addParameters'] = api.clientApi.addParameters;
 export const clearDecorators: ClientApi['clearDecorators'] = api.clientApi.clearDecorators;
 export const setAddon: ClientApi['setAddon'] = api.clientApi.setAddon;
-export const configure: ClientApi['configure'] = api.configApi.configure;
 export const forceReRender: ClientApi['forceReRender'] = api.forceReRender;
 export const getStorybook: ClientApi['getStorybook'] = api.clientApi.getStorybook;
 export const raw: ClientApi['raw'] = api.clientApi.raw;
diff --git a/app/ember/src/client/index.js b/app/ember/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/ember/src/client/preview/index.js b/app/ember/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'ember';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/html/src/client/index.ts b/app/html/src/client/index.ts
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/html/src/client/preview/index.ts b/app/html/src/client/preview/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
 import { start } from '@storybook/core/client';
-import { ClientStoryApi } from '@storybook/addons';
+import { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import render from './render';
@@ -10,12 +10,11 @@ const framework = 'html';
 
 interface ClientApi extends ClientStoryApi<StoryFnHtmlReturnType> {
   setAddon(addon: any): void;
-  configure(loaders: () => void, module: NodeModule): void;
+  configure(loader: Loadable, module: NodeModule, framework: string): void;
   getStorybook(): IStorybookSection[];
   clearDecorators(): void;
   forceReRender(): void;
   raw: () => any; // todo add type
-  load: (req: any, m: NodeModule, framework: string) => void;
 }
 
 const api = start(render);
@@ -26,12 +25,11 @@ export const storiesOf: ClientApi['storiesOf'] = (kind, m) => {
   });
 };
 
-export const load: ClientApi['load'] = (...args) => api.load(...args, framework);
+export const configure: ClientApi['configure'] = (...args) => api.configure(...args, framework);
 export const addDecorator: ClientApi['addDecorator'] = api.clientApi.addDecorator;
 export const addParameters: ClientApi['addParameters'] = api.clientApi.addParameters;
 export const clearDecorators: ClientApi['clearDecorators'] = api.clientApi.clearDecorators;
 export const setAddon: ClientApi['setAddon'] = api.clientApi.setAddon;
-export const configure: ClientApi['configure'] = api.configApi.configure;
 export const forceReRender: ClientApi['forceReRender'] = api.forceReRender;
 export const getStorybook: ClientApi['getStorybook'] = api.clientApi.getStorybook;
 export const raw: ClientApi['raw'] = api.clientApi.raw;
diff --git a/app/marko/src/client/index.js b/app/marko/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/marko/src/client/preview/index.js b/app/marko/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'marko';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/mithril/src/client/index.js b/app/mithril/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/mithril/src/client/preview/index.js b/app/mithril/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'mithril';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/polymer/src/client/index.js b/app/polymer/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/polymer/src/client/preview/index.js b/app/polymer/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'polymer';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/preact/src/client/index.js b/app/preact/src/client/index.js
@@ -7,5 +7,4 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
diff --git a/app/preact/src/client/preview/index.js b/app/preact/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'preact';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/rax/src/client/index.js b/app/rax/src/client/index.js
@@ -7,5 +7,4 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
diff --git a/app/rax/src/client/preview/index.js b/app/rax/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'rax';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/react/src/client/index.ts b/app/react/src/client/index.ts
@@ -7,7 +7,6 @@ export {
   getStorybook,
   raw,
   forceReRender,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/react/src/client/preview/index.ts b/app/react/src/client/preview/index.ts
@@ -1,6 +1,6 @@
 /* eslint-disable prefer-destructuring */
 import { start } from '@storybook/core/client';
-import { ClientStoryApi } from '@storybook/addons';
+import { ClientStoryApi, Loadable } from '@storybook/addons';
 
 import './globals';
 import render from './render';
@@ -10,12 +10,11 @@ const framework = 'react';
 
 interface ClientApi extends ClientStoryApi<StoryFnReactReturnType> {
   setAddon(addon: any): void;
-  configure(loaders: () => void, module: NodeModule): void;
+  configure(loader: Loadable, module: NodeModule, framework: string): void;
   getStorybook(): IStorybookSection[];
   clearDecorators(): void;
   forceReRender(): void;
   raw: () => any; // todo add type
-  load: (...args: any[]) => void;
 }
 
 const api = start(render);
@@ -26,12 +25,11 @@ export const storiesOf: ClientApi['storiesOf'] = (kind, m) => {
   });
 };
 
-export const load: ClientApi['load'] = (...args) => api.load(...args, framework);
+export const configure: ClientApi['configure'] = (...args) => api.configure(...args, framework);
 export const addDecorator: ClientApi['addDecorator'] = api.clientApi.addDecorator;
 export const addParameters: ClientApi['addParameters'] = api.clientApi.addParameters;
 export const clearDecorators: ClientApi['clearDecorators'] = api.clientApi.clearDecorators;
 export const setAddon: ClientApi['setAddon'] = api.clientApi.setAddon;
-export const configure: ClientApi['configure'] = api.configApi.configure;
 export const forceReRender: ClientApi['forceReRender'] = api.forceReRender;
 export const getStorybook: ClientApi['getStorybook'] = api.clientApi.getStorybook;
 export const raw: ClientApi['raw'] = api.clientApi.raw;
diff --git a/app/riot/src/client/index.js b/app/riot/src/client/index.js
@@ -12,7 +12,6 @@ export {
   compileNow,
   asCompiledCode,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/riot/src/client/preview/index.js b/app/riot/src/client/preview/index.js
@@ -5,7 +5,7 @@ import riot, { tag2, mount as vendorMount } from 'riot';
 import render from './render';
 import { compileNow as unboundCompileNow, asCompiledCode } from './compileStageFunctions';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -18,9 +18,8 @@ export const {
 
 const framework = 'riot';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 const mount = vendorMount.bind(riot, '#root');
 const compileNow = unboundCompileNow.bind(null, tag2);
 export { forceReRender, render, tag2 as tag, mount, compileNow, asCompiledCode };
diff --git a/app/svelte/src/client/index.js b/app/svelte/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/svelte/src/client/preview/index.js b/app/svelte/src/client/preview/index.js
@@ -3,7 +3,7 @@ import { start } from '@storybook/core/client';
 import './globals';
 import render from './render';
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render);
+const { configure: coreConfigure, clientApi, forceReRender } = start(render);
 
 export const {
   setAddon,
@@ -16,7 +16,6 @@ export const {
 
 const framework = 'svelte';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/app/vue/src/client/index.js b/app/vue/src/client/index.js
@@ -7,7 +7,6 @@ export {
   getStorybook,
   forceReRender,
   raw,
-  load,
 } from './preview';
 
 if (module && module.hot && module.hot.decline) {

diff --git a/app/vue/src/client/preview/index.js b/app/vue/src/client/preview/index.js
@@ -75,7 +75,9 @@ function decorateStory(getStory, decorators) {
   );
 }
 
-const { load: coreLoad, clientApi, configApi, forceReRender } = start(render, { decorateStory });
+const { configure: coreConfigure, clientApi, forceReRender } = start(render, {
+  decorateStory,
+});
 
 export const {
   setAddon,
@@ -88,7 +90,6 @@ export const {
 
 const framework = 'vue';
 export const storiesOf = (...args) => clientApi.storiesOf(...args).addParameters({ framework });
-export const load = (...args) => coreLoad(...args, framework);
+export const configure = (...args) => coreConfigure(...args, framework);
 
-export const { configure } = configApi;
 export { forceReRender };
diff --git a/examples/ember-cli/.storybook/config.js b/examples/ember-cli/.storybook/config.js
@@ -1,4 +1,4 @@
-import { load, addParameters, addDecorator } from '@storybook/ember';
+import { configure, addParameters, addDecorator } from '@storybook/ember';
 import { withA11y } from '@storybook/addon-a11y';
 
 addDecorator(withA11y);
@@ -9,4 +9,4 @@ addParameters({
   },
 });
 
-load(require.context('../stories', true, /\.stories\.js$/), module);
+configure(require.context('../stories', true, /\.stories\.js$/), module);
diff --git a/examples/html-kitchen-sink/.storybook/config.js b/examples/html-kitchen-sink/.storybook/config.js
@@ -1,4 +1,4 @@
-import { load, addParameters, addDecorator } from '@storybook/html';
+import { configure, addParameters, addDecorator } from '@storybook/html';
 import { withA11y } from '@storybook/addon-a11y';
 import { DocsPage } from '@storybook/addon-docs/blocks';
 
@@ -21,4 +21,4 @@ addParameters({
   docs: DocsPage,
 });
 
-load(require.context('../stories', true, /\.stories\.(js|mdx)$/), module);
+configure(require.context('../stories', true, /\.stories\.(js|mdx)$/), module);
diff --git a/examples/marko-cli/.storybook/config.js b/examples/marko-cli/.storybook/config.js
@@ -1,4 +1,4 @@
-import { load, addParameters, addDecorator } from '@storybook/marko';
+import { configure, addParameters, addDecorator } from '@storybook/marko';
 import { withA11y } from '@storybook/addon-a11y';
 
 addDecorator(withA11y);
@@ -8,4 +8,4 @@ addParameters({
   },
 });
 
-load(require.context('../src/stories', true, /\.stories\.js$/), module);
+configure(require.context('../src/stories', true, /\.stories\.js$/), module);