maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix plugin path (#58649)

Browse source
This commit is contained in:
Liza Katz 2020-02-27 08:58:28 +00:00 committed by GitHub
parent 320e292ea8
commit a0ffce715a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/kbn-plugin-generator/sao_template/sao.js
View file

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