From 182244f13d7e38453b4e414201c4f2c4e8484000 Mon Sep 17 00:00:00 2001
From: Norbert de Langen <ndelangen@me.com>
Date: Tue, 21 Apr 2020 16:38:28 +0200
Subject: [PATCH] FIX bugs with event source & removing the fileName & error
 handling & loading of refs

---
 lib/api/src/modules/refs.ts                           | 8 ++++++--
 lib/api/src/modules/stories.ts                        | 8 ++++++--
 lib/channel-postmessage/src/index.ts                  | 9 +++++++--
 lib/core/src/server/manager/manager-webpack.config.js | 4 ++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/api/src/modules/refs.ts b/lib/api/src/modules/refs.ts
index 25e3c3cdd32..2b07e18ffc3 100644
--- a/lib/api/src/modules/refs.ts
+++ b/lib/api/src/modules/refs.ts
@@ -54,7 +54,10 @@ export const getSourceType = (source: string) => {
   ) {
     return 'local';
   }
-  return 'external';
+  if (source) {
+    return 'external';
+  }
+  return null;
 };
 
 export const defaultMapper: Mapper = (b, a) => {
@@ -82,7 +85,7 @@ export const init: ModuleFn = ({ store, provider }) => {
     findRef: (source) => {
       const refs = api.getRefs();
 
-      return Object.values(refs).find(({ url }) => `${url}/iframe.html`.match(source));
+      return Object.values(refs).find(({ url }) => url.match(source));
     },
     changeRefVersion: (id, url) => {
       const previous = api.getRefs()[id];
@@ -156,6 +159,7 @@ export const init: ModuleFn = ({ store, provider }) => {
   };
 
   const refs = provider.getConfig().refs || {};
+
   const initialState: SubState['refs'] = refs;
 
   Object.entries(refs).forEach(([k, v]) => {
diff --git a/lib/api/src/modules/stories.ts b/lib/api/src/modules/stories.ts
index c8d2b3bf6a4..b7530a33586 100644
--- a/lib/api/src/modules/stories.ts
+++ b/lib/api/src/modules/stories.ts
@@ -319,11 +319,15 @@ export const init: ModuleFn = ({
         // if it's a ref, we need to map the incoming stories to a prefixed version, so it cannot conflict with others
         case 'external': {
           const ref = fullAPI.findRef(source);
-          fullAPI.setRef(ref.id, { ...ref, ...data }, true);
-          break;
+
+          if (ref) {
+            fullAPI.setRef(ref.id, { ...ref, ...data }, true);
+            break;
+          }
         }
 
         // if we couldn't find the source, something risky happened, we ignore the input, and log a warning
+        // eslint-disable-next-line no-fallthrough
         default: {
           logger.warn('received a SET_STORIES frame that was not configured as a ref');
           break;
diff --git a/lib/channel-postmessage/src/index.ts b/lib/channel-postmessage/src/index.ts
index 9d37081ecd6..d459951bec9 100644
--- a/lib/channel-postmessage/src/index.ts
+++ b/lib/channel-postmessage/src/index.ts
@@ -170,8 +170,13 @@ export class PostmsgTransport {
           ? `<span style="color: #FF4785">${event.type}</span>`
           : `<span style="color: #FFAE00">${event.type}</span>`;
 
-        event.source =
-          source || this.config.page === 'preview' ? rawEvent.origin : getEventSourceUrl(rawEvent);
+        if (source) {
+          const { origin, pathname } = new URL(source, document.location);
+          event.source = origin + pathname;
+        } else {
+          event.source =
+            this.config.page === 'preview' ? rawEvent.origin : getEventSourceUrl(rawEvent);
+        }
 
         if (!event.source) {
           pretty.error(
diff --git a/lib/core/src/server/manager/manager-webpack.config.js b/lib/core/src/server/manager/manager-webpack.config.js
index a172ceab921..cfe1d9b02f8 100644
--- a/lib/core/src/server/manager/manager-webpack.config.js
+++ b/lib/core/src/server/manager/manager-webpack.config.js
@@ -55,8 +55,8 @@ export default ({
       refs
         ? new VirtualModulePlugin({
             [path.resolve(path.join(configDir, `generated-refs.js`))]: refsTemplate.replace(
-              '{{refs}}',
-              refs
+              `'{{refs}}'`,
+              JSON.stringify(refs)
             ),
           })
         : null,