diff --git a/deploy.cmd b/deploy.cmd index 8d6824f..13d3b2e 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -109,8 +109,7 @@ IF EXIST "%DEPLOYMENT_TARGET%\package.json" ( IF EXIST "%DEPLOYMENT_TARGET%\bower.json" ( pushd "%DEPLOYMENT_TARGET%" IF EXIST ".\components" (call rmdir .\components /S /Q) - call :ExecuteCmd !NPM_CMD! install bower - call .\node_modules\.bin\bower install + call :ExecuteCmd !NPM_CMD! run bower install IF !ERRORLEVEL! NEQ 0 goto error popd ) @@ -119,9 +118,7 @@ IF EXIST "%DEPLOYMENT_TARGET%\bower.json" ( :: 4. Install gulp IF EXIST "%DEPLOYMENT_TARGET%\gulpfile.js" ( pushd "%DEPLOYMENT_TARGET%" - call :ExecuteCmd !NPM_CMD! install gulp gulp-cache-bust gulp-concat-css gulp-uglify html-minifier gulp-concat gulp-rimraf - call .\node_modules\.bin\gulp clean - call .\node_modules\.bin\gulp publish + call :ExecuteCmd !NPM_CMD! run gulp publish IF !ERRORLEVEL! NEQ 0 goto error popd ) diff --git a/gulpfile.js b/gulpfile.js index e98aec2..8adacf3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,7 +78,7 @@ gulp.task('combineJs',['clean'], function() { }); -gulp.task('cachebust', function(){ +gulp.task('cachebust', ['clean'], function(){ return gulp.src('index.html') .pipe(cachebust({ type: 'timestamp' diff --git a/package-lock.json b/package-lock.json index 7752a17..baf473e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -441,6 +441,11 @@ "hoek": "2.x.x" } }, + "bower": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz", + "integrity": "sha1-54dqB23rgTf30GUl3F6MZtuC8oo=" + }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", diff --git a/package.json b/package.json index c5aa870..72196e3 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,11 @@ "version": "0.0.1", "private": true, "scripts": { - "start": "" + "gulp": "gulp", + "bower": "bower" }, "dependencies": { + "bower": "^1.8.4", "html-minifier": "^0.7.2" }, "devDependencies": {