From 00450683138b71568b9c9fff0a84faeff5accf44 Mon Sep 17 00:00:00 2001
From: Liza Katz <liza.katz@elastic.co>
Date: Thu, 27 Feb 2020 13:07:38 +0000
Subject: [PATCH] Fix plugin path (#58649) (#58703)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 packages/kbn-plugin-generator/sao_template/sao.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/kbn-plugin-generator/sao_template/sao.js b/packages/kbn-plugin-generator/sao_template/sao.js
index 8e5e106190194..9073ce865a963 100755
--- a/packages/kbn-plugin-generator/sao_template/sao.js
+++ b/packages/kbn-plugin-generator/sao_template/sao.js
@@ -135,8 +135,11 @@ module.exports = function({ name, targetPath }) {
       'eslintrc.js': '.eslintrc.js',
       'i18nrc.json': '.i18nrc.json',
     },
-    data: answers =>
-      Object.assign(
+    data: answers => {
+      const pathToPlugin = answers.customPath
+        ? resolve(answers.customPath, camelCase(name), 'public')
+        : resolve(targetPath, 'public');
+      return Object.assign(
         {
           templateVersion: pkg.version,
           startCase,
@@ -150,13 +153,11 @@ module.exports = function({ name, targetPath }) {
           hasUi: !!answers.generateApp,
           hasServer: !!answers.generateApi,
           hasScss: !!answers.generateScss,
-          relRoot: relative(
-            resolve(answers.customPath || targetPath, name, 'public'),
-            process.cwd()
-          ),
+          relRoot: relative(pathToPlugin, process.cwd()),
         },
         answers
-      ),
+      );
+    },
     enforceNewFolder: true,
     installDependencies: false,
     async post({ log, answers }) {