From 9848f600e9c4b5f5cc35af36edb7472998cb02be Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 23 Jul 2017 13:48:56 -0400 Subject: [PATCH] fix: run yarn locally --- .travis.yml | 5 ++++- npm/install.js | 4 ++-- npm/package-lock.json | 2 +- npm/package.json | 2 +- package.json | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2f8ca352..374a37d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,15 @@ before_script: - yarn run build before_deploy: - tar -czf wiki-js.tar.gz * -X .build/.deployexclude +- yarn install --production --ignore-scripts --prefer-offline +- tar -czf node_modules.tar.gz node_modules deploy: provider: releases api_key: secure: TyasQ2QnWQoBhsiwm88oHoeJ+PWBZnbWEJwu6JdN5HA9cXqIdHqd1msCh84gGtKRfL2EObw4AvDwLSEd5mIM0cmQfTiokYbmb7OSjOq880rbZwtXt9t9KkC5b+TIxkhJzkzi7vIpssTeNkVJBbo/R3m0suaCRqzypkW5mhVcsFhhZ8oVCZnI1uZAXCwFNMcFFUAHxWYE98tW5bfxknRU1NJFcXysN8VXskIZ82wQQBAzZ1aQgVyMl6Uw2hns399hxCx8gVKWOIdbpO1bliHBMdm5z+lR5i723IQnHpYJf4gWvPf3oHnSS1ocrJeWVoBqanC5Iu3QhwOvPLPw/AUcJOqhvS/QiGZ2AuA9GwtBpYNVYYGD9RqcODBKZy0fWluwCuVNNoQHmwMWVP7lRnwP+SNtLzzV5ZC8mrjb4B9KGoBUR8Q7lz8cMtLoPOixk1WdWOpIFzKcw/fy8Ze6cnnFKrzsPVUZy3E3SKit3GuP6Nd7ghO0Kxp4x0eAlqFDYRZ9nG55ctd0i2b5u1r+VArt21dk2aMFxL6i67funIraEndLQFHhRgPVmjemJBRXf8j8OYrGStTsm0S26IXo3iVh/NJakIg6mEFJ3j4BXPEjCUmIW0iD6sKGTeNH6jaON+DV4T+ErGnYzgwO5KIfo9cI00DqjG0tjBQ45lWaLGy6PEo= file: - - wiki-js.tar.gz + - wiki-js.tar.gz + - node_modules.tar.gz skip_cleanup: true overwrite: true on: diff --git a/npm/install.js b/npm/install.js index 19df66f0..8b1bc8d1 100644 --- a/npm/install.js +++ b/npm/install.js @@ -143,7 +143,7 @@ const tasks = { */ installYarn() { ora.text = 'Installing Yarn...' - return exec.stdout('npm', ['install', '-g', 'yarn'], { + return exec.stdout('npm', ['install', 'yarn'], { cwd: installDir }).then(results => { ora.text = 'Yarn installed successfully.' @@ -155,7 +155,7 @@ const tasks = { */ installDependencies() { ora.text = 'Installing Wiki.js npm dependencies...' - return exec.stdout('yarn', ['install', '--production', '--ignore-optional'], { + return exec.stdout('./node_modules/.bin/yarn', ['install', '--production', '--ignore-optional'], { cwd: installDir }).then(results => { ora.text = 'Wiki.js npm dependencies installed successfully.' diff --git a/npm/package-lock.json b/npm/package-lock.json index 568100e2..800f5dbb 100644 --- a/npm/package-lock.json +++ b/npm/package-lock.json @@ -1,6 +1,6 @@ { "name": "wiki.js", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 1, "dependencies": { "amp": { diff --git a/npm/package.json b/npm/package.json index af5d0c70..7dcb6d43 100644 --- a/npm/package.json +++ b/npm/package.json @@ -1,6 +1,6 @@ { "name": "wiki.js", - "version": "1.0.1", + "version": "1.0.2", "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 b47b4a0a..d4396f78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wiki", - "version": "1.0.1", + "version": "1.0.2", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "main": "wiki.js", "scripts": {