From 1293bab868436339175ed59db18dcbf4099d635d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Dahlgren?= Date: Tue, 10 Nov 2015 00:35:20 +0100 Subject: [PATCH] Run gulp using npm Simplifies usage of gulp and makes sure everyone is using same version --- CONTRIBUTING.md | 4 +++- build.sh | 2 +- package.json | 3 ++- readme.md | 4 +--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4a47b1a73..07bcc506a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,9 @@ Setup guides, FAQ, the more information we have on the wiki the better. 1. Fork Sonarr 2. Clone (develop branch) *you may need pull in submodules separately if you client doesn't clone them automatically (CurlSharp)* 3. Run `npm install` -4. Run `gulp watch` - Used to compile the UI components and copy them (leave this window open) +4. Run `npm start` - Used to compile the UI components and copy them. + Leave this window open. + If you have gulp globally installed you can use `gulp watch` instead 5. Compile in Visual Studio ### Contributing Code ### diff --git a/build.sh b/build.sh index e6b5859d8..ac185c2ca 100755 --- a/build.sh +++ b/build.sh @@ -106,7 +106,7 @@ RunGulp() echo "##teamcity[progressFinish 'npm install']" echo "##teamcity[progressStart 'Running Gulp']" - CheckExitCode gulp build + CheckExitCode npm run build echo "##teamcity[progressFinish 'Running Gulp']" } diff --git a/package.json b/package.json index 0d0f0e893..2799089ab 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "Sonarr", "main": "main.js", "scripts": { - "preinstall": "" + "build": "gulp build", + "start": "gulp watch" }, "repository": { "type": "git", diff --git a/readme.md b/readme.md index 70385d49d..495dd4155 100644 --- a/readme.md +++ b/readme.md @@ -24,7 +24,6 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee - Visual Studio 2015 [Free Community Edition](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx) - [Git](http://git-scm.com/downloads) - [NodeJS](http://nodejs.org/download/) -- [Gulp](http://gulpjs.com) ### Setup ### @@ -32,8 +31,7 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee - Clone the repository into your development machine. [*info*](https://help.github.com/articles/working-with-repositories) - Grab the submodules `git submodule init && git submodule update` - install the required Node Packages `npm install` -- install gulp `npm install gulp -g` -- start gulp to monitor your dev environment for any changes that need post processing using `gulp watch` command. +- start gulp to monitor your dev environment for any changes that need post processing using `npm start` command. *Please note gulp must be running at all times while you are working with Sonarr client source files.*