Merge pull request #11294 from storybookjs/fix/allow-refs-versions-in…

…-config Composition: Allow refs versions in config
storybookjs · Jun 24, 2020 · 826f328 · 826f328
2 parents 1f01a01 + 43a2d32
commit 826f328
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/examples/dev-kits/main.js b/examples/dev-kits/main.js
@@ -6,6 +6,10 @@ module.exports = {
       id: 'ember',
       title: 'Ember',
       url: 'https://next--storybookjs.netlify.app/ember-cli',
+      versions: {
+        next: 'https://next--storybookjs.netlify.app/ember-cli',
+        master: 'https://master--storybookjs.netlify.app/ember-cli',
+      },
     },
     cra: 'https://next--storybookjs.netlify.app/cra-ts-kitchen-sink',
   },

diff --git a/lib/api/src/modules/refs.ts b/lib/api/src/modules/refs.ts
@@ -108,8 +108,8 @@ export const init: ModuleFn = ({ store, provider, fullAPI }, { runCheck = true }
       return Object.values(refs).find(({ url }) => url.match(source));
     },
     changeRefVersion: (id, url) => {
-      const previous = api.getRefs()[id];
-      const ref = { ...previous, stories: {}, url } as SetRefData;
+      const { versions, title } = api.getRefs()[id];
+      const ref = { id, url, versions, title, stories: {} } as SetRefData;
 
       api.checkRef(ref);
     },
@@ -192,6 +192,7 @@ export const init: ModuleFn = ({ store, provider, fullAPI }, { runCheck = true }
         id,
         url,
         ...loadedData,
+        error: loadedData.error,
         type: !loadedData.stories ? 'auto-inject' : 'lazy',
       });
     },

diff --git a/lib/api/src/tests/refs.test.js b/lib/api/src/tests/refs.test.js
@@ -331,6 +331,7 @@ describe('Refs API', () => {
         Object {
           "refs": Object {
             "fake": Object {
+              "error": undefined,
               "id": "fake",
               "ready": false,
               "stories": Object {},
@@ -423,6 +424,7 @@ describe('Refs API', () => {
         Object {
           "refs": Object {
             "fake": Object {
+              "error": undefined,
               "id": "fake",
               "loginUrl": "https://example.com/login",
               "ready": false,
@@ -516,6 +518,7 @@ describe('Refs API', () => {
         Object {
           "refs": Object {
             "fake": Object {
+              "error": undefined,
               "id": "fake",
               "ready": false,
               "stories": Object {},
@@ -603,6 +606,7 @@ describe('Refs API', () => {
         Object {
           "refs": Object {
             "fake": Object {
+              "error": undefined,
               "id": "fake",
               "ready": false,
               "stories": undefined,

diff --git a/lib/core/src/server/manager/manager-config.js b/lib/core/src/server/manager/manager-config.js
@@ -71,11 +71,14 @@ async function getManagerWebpackConfig(options, presets) {
   if (definedRefs) {
     Object.entries(definedRefs).forEach(([key, value]) => {
       const url = typeof value === 'string' ? value : value.url;
-      const title = typeof value === 'string' ? toTitle(key) : value.title || toTitle(value.key);
+      const rest =
+        typeof value === 'string'
+          ? { title: toTitle(key) }
+          : { ...value, title: value.title || toTitle(value.key) };
 
       refs[key] = {
         id: key,
-        title,
+        ...rest,
         url: stripTrailingSlash(url),
       };
     });