Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions x-pack/plugins/canvas/server/lib/get_plugin_paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ const getKibanaPluginsPath = () => {

// find the kibana path in the build, which lives in node_modules and requires going 1 path up
const buildPluginPath = path.join(basePluginPath, '..');
if (isDirname(basePluginPath, 'node_modules') && isDirname(buildPluginPath, 'kibana'))
return path.join(buildPluginPath, 'plugins');
if (isDirname(basePluginPath, 'node_modules')) {
const pluginPath = path.join(buildPluginPath, 'plugins');
return isDirectory(pluginPath) && pluginPath;
}

return false;
};
Expand Down