fix: revert to npm install

requarks · Jul 23, 2017 · e2d3057 · e2d3057
1 parent afb6f7d
commit e2d3057
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 19 deletions.
diff --git 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
diff --git 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
@@ -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": {