From cb49e217fb2f039a761f2779ca82297a6e9615bc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 15 Nov 2019 00:24:04 +0100 Subject: [PATCH] ROLLBACK the change to allow for any string to be loadable, as this is nightmare-scenario for webpack "Critical dependency: the request of a dependency is an expression" Instead allow the array to contain "functions that do the require & return exports" or "the exports directly" --- .../storyshots-core/src/frameworks/configure.ts | 3 ++- lib/core/src/client/preview/start.js | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/storyshots/storyshots-core/src/frameworks/configure.ts b/addons/storyshots/storyshots-core/src/frameworks/configure.ts index 00addb663f1..cbdbdd566ec 100644 --- a/addons/storyshots/storyshots-core/src/frameworks/configure.ts +++ b/addons/storyshots/storyshots-core/src/frameworks/configure.ts @@ -94,7 +94,8 @@ function configure( }); if (stories && stories.length) { - storybook.configure(stories, false); + // eslint-disable-next-line global-require, import/no-dynamic-require + storybook.configure(stories.map(f => require(f)), false); } } diff --git a/lib/core/src/client/preview/start.js b/lib/core/src/client/preview/start.js index 40af992e4e3..4046cf4fcd9 100644 --- a/lib/core/src/client/preview/start.js +++ b/lib/core/src/client/preview/start.js @@ -358,12 +358,12 @@ export default function start(render, { decorateStory } = {}) { typeof req.resolve === 'function' ? req.resolve(filename) : null ); }); - } else { - const fileExports = require(req); - currentExports.set( - fileExports, - typeof req.resolve === 'function' ? req.resolve(filename) : null - ); + } else if (typeof req === 'function') { + const fileExports = req(); + currentExports.set(fileExports, null); + } else if (typeof req === 'object') { + const fileExports = req; + currentExports.set(fileExports, null); } }); } else {