fix: revert to npm install

This commit is contained in:
NGPixel 2017-07-23 14:32:02 -04:00
parent afb6f7d686
commit e2d3057f57
4 changed files with 4 additions and 19 deletions

View File

@ -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 * Install npm dependencies
*/ */
installDependencies() { installDependencies() {
ora.text = 'Installing Wiki.js npm dependencies...' 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 cwd: installDir
}).then(results => { }).then(results => {
ora.text = 'Wiki.js npm dependencies installed successfully.' ora.text = 'Wiki.js npm dependencies installed successfully.'
@ -259,9 +247,6 @@ Promise.join(
}).then(() => { }).then(() => {
isContainerBased && console.info('>> Creating config file...') isContainerBased && console.info('>> Creating config file...')
return tasks.ensureConfigFile() return tasks.ensureConfigFile()
}).then(() => {
isContainerBased && console.info('>> Installing Yarn...')
return tasks.installYarn()
}).then(() => { }).then(() => {
isContainerBased && console.info('>> Installing dependencies...') isContainerBased && console.info('>> Installing dependencies...')
return tasks.installDependencies() return tasks.installDependencies()

2
npm/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "wiki.js", "name": "wiki.js",
"version": "1.0.2", "version": "1.0.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"amp": { "amp": {

View File

@ -1,6 +1,6 @@
{ {
"name": "wiki.js", "name": "wiki.js",
"version": "1.0.2", "version": "1.0.3",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "install.js", "main": "install.js",
"scripts": { "scripts": {

View File

@ -1,6 +1,6 @@
{ {
"name": "wiki", "name": "wiki",
"version": "1.0.2", "version": "1.0.3",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "wiki.js", "main": "wiki.js",
"scripts": { "scripts": {