From e2d3057f57d3b277cabbf2b98cb08a3628b28500 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Sun, 23 Jul 2017 14:32:02 -0400
Subject: [PATCH] fix: revert to npm install

---
 npm/install.js        | 17 +----------------
 npm/package-lock.json |  2 +-
 npm/package.json      |  2 +-
 package.json          |  2 +-
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/npm/install.js b/npm/install.js
index 8b1bc8d1..2c4de41a 100644
--- a/npm/install.js
+++ b/npm/install.js
@@ -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()
diff --git a/npm/package-lock.json b/npm/package-lock.json
index 800f5dbb..f730f4c9 100644
--- a/npm/package-lock.json
+++ b/npm/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "lockfileVersion": 1,
   "dependencies": {
     "amp": {
diff --git a/npm/package.json b/npm/package.json
index 7dcb6d43..8feb4f56 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "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",
   "main": "install.js",
   "scripts": {
diff --git a/package.json b/package.json
index d4396f78..34bd3afb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "wiki.js",
   "scripts": {