Commit e2d3057f authored by NGPixel's avatar NGPixel

fix: revert to npm install

parent afb6f7d6
...@@ -139,23 +139,11 @@ const tasks = { ...@@ -139,23 +139,11 @@ 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.'
...@@ -260,9 +248,6 @@ Promise.join( ...@@ -260,9 +248,6 @@ Promise.join(
isContainerBased && console.info('>> Creating config file...') isContainerBased && console.info('>> Creating config file...')
return tasks.ensureConfigFile() return tasks.ensureConfigFile()
}).then(() => { }).then(() => {
isContainerBased && console.info('>> Installing Yarn...')
return tasks.installYarn()
}).then(() => {
isContainerBased && console.info('>> Installing dependencies...') isContainerBased && console.info('>> Installing dependencies...')
return tasks.installDependencies() return tasks.installDependencies()
}).then(() => { }).then(() => {
......
{ {
"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": {
......
{ {
"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": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment