diff --git a/code/addons/interactions/preset.js b/code/addons/interactions/preset.js index e538669369e9..a83f95279e7f 100644 --- a/code/addons/interactions/preset.js +++ b/code/addons/interactions/preset.js @@ -1,10 +1 @@ -const { checkActionsLoaded } = require('./dist/preset'); - -function previewAnnotations(entry = [], options) { - checkActionsLoaded(options.configDir); - return entry; -} - -module.exports = { - previewAnnotations, -}; +module.exports = require('./dist/preset'); diff --git a/code/addons/interactions/src/preset.ts b/code/addons/interactions/src/preset.ts index 2e3dae624042..2d5963d6302f 100644 --- a/code/addons/interactions/src/preset.ts +++ b/code/addons/interactions/src/preset.ts @@ -2,7 +2,7 @@ import { isAbsolute, join } from 'node:path'; import { checkAddonOrder, serverRequire } from 'storybook/internal/common'; -export const checkActionsLoaded = (configDir: string) => { +export function previewAnnotations(entry: string[] = [], options: { configDir: string }) { checkAddonOrder({ before: { name: '@storybook/addon-actions', @@ -12,12 +12,13 @@ export const checkActionsLoaded = (configDir: string) => { name: '@storybook/addon-interactions', inEssentials: false, }, - configFile: isAbsolute(configDir) - ? join(configDir, 'main') - : join(process.cwd(), configDir, 'main'), + configFile: isAbsolute(options.configDir) + ? join(options.configDir, 'main') + : join(process.cwd(), options.configDir, 'main'), getConfig: (configFile) => serverRequire(configFile), }); -}; + return entry; +} // This annotation is read by addon-test, so it can throw an error if both addons are used export const ADDON_INTERACTIONS_IN_USE = true;