From 4a66bc3ef802f49d483f76bf81471f3977242bd4 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Mon, 10 Aug 2015 21:07:53 -0400 Subject: [PATCH] really npm module --- deploy.cmd | 22 +++++++++------------- gulpfile.js | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/deploy.cmd b/deploy.cmd index b84999d..f7c289e 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -98,23 +98,12 @@ IF /I "%IN_PLACE_DEPLOYMENT%" NEQ "1" ( call :SelectNodeVersion :: 3. Install npm packages -IF EXIST "%DEPLOYMENT_TARGET%\package.json" ( pushd "%DEPLOYMENT_TARGET%" call :ExecuteCmd !NPM_CMD! install IF !ERRORLEVEL! NEQ 0 goto error popd -) -:: 4. Install bower -IF EXIST "%DEPLOYMENT_TARGET%\bower.json" ( - pushd "%DEPLOYMENT_TARGET%" - call :ExecuteCmd !NPM_CMD! install bower - call .\node_modules\.bin\bower install - IF !ERRORLEVEL! NEQ 0 goto error - popd -) - -:: 5. Install gulp +:: 4. Install gulp IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" ( pushd "%DEPLOYMENT_TARGET%" call :ExecuteCmd !NPM_CMD! install gulp @@ -123,7 +112,14 @@ IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" ( popd ) - +:: 5. Install bower +IF EXIST "%DEPLOYMENT_TARGET%\bower.json" ( + pushd "%DEPLOYMENT_TARGET%" + call :ExecuteCmd !NPM_CMD! install bower + call .\node_modules\.bin\bower install + IF !ERRORLEVEL! NEQ 0 goto error + popd +) :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: diff --git a/gulpfile.js b/gulpfile.js index 21de783..348ed5a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,7 +4,7 @@ var gulp = require('gulp'), livereload = require('gulp-livereload'), concatCss = require('gulp-concat-css'), uglify = require('gulp-uglify'), - //cachebust = require('gulp-cache-bust'), + cachebust = require('gulp-cache-bust'), minifyCss = require('gulp-minify-css'); @@ -60,7 +60,7 @@ gulp.task('cachebust', function(){ gulp.task('publish', [ 'combineCss', 'minifyJs', - //'cachebust', + 'cachebust', 'develop' ]); diff --git a/package.json b/package.json index f7cad35..cd49b1a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "devDependencies": { "gulp": "~3.8.10", - + "gulp-cache-bust": "^1.0.1", "gulp-concat-css": "^2.2.0", "gulp-less": "~3.0.1", "gulp-livereload": "~3.8.0",