|
|
@ -138,24 +138,12 @@ const tasks = { |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
/** |
|
|
|
* Install Yarn |
|
|
|
*/ |
|
|
|
installYarn() { |
|
|
|
ora.text = 'Installing Yarn...' |
|
|
|
return exec.stdout('npm', ['install', 'yarn'], { |
|
|
|
cwd: installDir |
|
|
|
}).then(results => { |
|
|
|
ora.text = 'Yarn installed successfully.' |
|
|
|
return true |
|
|
|
}) |
|
|
|
}, |
|
|
|
/** |
|
|
|
* Install npm dependencies |
|
|
|
*/ |
|
|
|
installDependencies() { |
|
|
|
ora.text = 'Installing Wiki.js npm dependencies...' |
|
|
|
return exec.stdout('./node_modules/.bin/yarn', ['install', '--production', '--ignore-optional'], { |
|
|
|
return exec.stdout('npm', ['install', '--only=production', '--no-optional'], { |
|
|
|
cwd: installDir |
|
|
|
}).then(results => { |
|
|
|
ora.text = 'Wiki.js npm dependencies installed successfully.' |
|
|
@ -259,9 +247,6 @@ Promise.join( |
|
|
|
}).then(() => { |
|
|
|
isContainerBased && console.info('>> Creating config file...') |
|
|
|
return tasks.ensureConfigFile() |
|
|
|
}).then(() => { |
|
|
|
isContainerBased && console.info('>> Installing Yarn...') |
|
|
|
return tasks.installYarn() |
|
|
|
}).then(() => { |
|
|
|
isContainerBased && console.info('>> Installing dependencies...') |
|
|
|
return tasks.installDependencies() |
|
|
|