Merge pull request #13204 from jon301/fix-13202

Addon-controls: Fix ensureDocsBeforeControls support for paths
storybookjs · Nov 24, 2020 · 92e082f · 92e082f
2 parents aa678e0 + d5efc50
commit 92e082f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/addons/controls/src/preset/ensureDocsBeforeControls.test.ts b/addons/controls/src/preset/ensureDocsBeforeControls.test.ts
@@ -16,6 +16,7 @@ describe.each([
 
 describe.each([
   [['@storybook/addon-docs', '@storybook/addon-controls']],
+  [['@storybook/addon-docs', 'foo/node_modules/@storybook/addon-controls']],
   [[{ name: '@storybook/addon-docs' }, '@storybook/addon-controls']],
   [['@storybook/addon-essentials', '@storybook/addon-controls']],
   [['@storybook/addon-essentials']],

diff --git a/addons/controls/src/preset/ensureDocsBeforeControls.ts b/addons/controls/src/preset/ensureDocsBeforeControls.ts
@@ -8,7 +8,7 @@ type Entry = string | OptionsEntry;
 const findIndex = (addon: string, addons: Entry[]) =>
   addons.findIndex((entry) => {
     const name = (entry as OptionsEntry).name || (entry as string);
-    return name && name.startsWith(addon);
+    return name && name.includes(addon);
   });
 
 const indexOfAddonOrEssentials = (addon: string, addons: Entry[]) => {