Commit d4f98249d56e5a7ea7f5b0932263fd04cc551370
Exists in
master
Merge branch 'master' into 'master'
Master(efernandez) See merge request modulos-npm/foca-login!1
Showing
2 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -45,7 +45,7 @@ gulp.task('uglify', ['templates'], function() { |
| 45 | 45 | ); |
| 46 | 46 | }); |
| 47 | 47 | |
| 48 | -gulp.task('clean', function(){ | |
| 48 | +gulp.task('clean', function() { | |
| 49 | 49 | return gulp.src(['tmp', 'dist'], {read: false}) |
| 50 | 50 | .pipe(clean()); |
| 51 | 51 | }); |
| ... | ... | @@ -60,3 +60,19 @@ gulp.task('pre-commit', function() { |
| 60 | 60 | ] |
| 61 | 61 | ); |
| 62 | 62 | }); |
| 63 | + | |
| 64 | +gulp.task('clean-post-install', function() { | |
| 65 | + return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js', | |
| 66 | + 'index.html'], {read: false}) | |
| 67 | + .pipe(clean()); | |
| 68 | +}); | |
| 69 | + | |
| 70 | +gulp.task('compile', ['templates', 'uglify']); | |
| 71 | + | |
| 72 | +gulp.task('webserver', function() { | |
| 73 | + pump [ | |
| 74 | + connect.server({port: 3000}) | |
| 75 | + ] | |
| 76 | +}); | |
| 77 | + | |
| 78 | +gulp.task('default', ['webserver']); |
package.json
| 1 | 1 | { |
| 2 | 2 | "name": "foca-login", |
| 3 | - "version": "1.0.0", | |
| 3 | + "version": "0.0.1", | |
| 4 | 4 | "description": "Login", |
| 5 | 5 | "main": "dist/foca-login.js", |
| 6 | 6 | "scripts": { |
| 7 | 7 | "test": "echo \"Error: no test specified\" && exit 1", |
| 8 | - "compile": "gulp uglify", | |
| 9 | - "pre-commit": [ | |
| 10 | - "gulp-pre-commit" | |
| 11 | - ], | |
| 12 | - "postinstall": "npm run compile && rm -R src && rm index.html && rm .jshintrc && rm gulpfile.js" | |
| 8 | + "compile": "gulp compile", | |
| 9 | + "gulp-pre-commit": "gulp pre-commit", | |
| 10 | + "postinstall": "npm run compile && gulp clean-post-install", | |
| 11 | + "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es jquery jshint pump" | |
| 13 | 12 | }, |
| 13 | + "pre-commit": [ | |
| 14 | + "gulp-pre-commit" | |
| 15 | + ], | |
| 14 | 16 | "repository": { |
| 15 | 17 | "type": "git", |
| 16 | 18 | "url": "https://192.168.0.11/modulos-npm/foca-login.git" |
| ... | ... | @@ -32,24 +34,23 @@ |
| 32 | 34 | "pump": "^3.0.x" |
| 33 | 35 | }, |
| 34 | 36 | "devDependencies": { |
| 37 | + "angular": "^1.7.4", | |
| 38 | + "bootstrap": "^4.1.3", | |
| 39 | + "font-awesome": "^4.7.0", | |
| 40 | + "gulp": "^3.9.1", | |
| 41 | + "gulp-angular-templatecache": "^2.2.1", | |
| 42 | + "gulp-clean": "^0.4.0", | |
| 35 | 43 | "gulp-connect": "^5.6.1", |
| 36 | - "jasmine-core": "3.2.1", | |
| 37 | - "pre-commit": "^1.2.2" | |
| 38 | - }, | |
| 39 | - "dependencies": { | |
| 40 | - "angular": "1.7.4", | |
| 41 | - "bootstrap": "4.1.3", | |
| 42 | - "font-awesome": "4.7.0", | |
| 43 | - "gulp-angular-templatecache": "2.2.1", | |
| 44 | - "gulp-clean": "0.4.0", | |
| 45 | - "gulp-htmlmin": "5.0.1", | |
| 46 | - "gulp-jshint": "2.1.0", | |
| 47 | - "gulp-rename": "1.4.0", | |
| 48 | - "gulp-replace": "1.0.0", | |
| 49 | - "gulp-sequence": "1.0.0", | |
| 50 | - "gulp-uglify-es": "1.0.4", | |
| 51 | - "jquery": "3.3.1", | |
| 52 | - "jshint": "2.9.6", | |
| 53 | - "pump": "3.0.0" | |
| 44 | + "gulp-htmlmin": "^5.0.1", | |
| 45 | + "gulp-jshint": "^2.1.0", | |
| 46 | + "gulp-rename": "^1.4.0", | |
| 47 | + "gulp-replace": "^1.0.0", | |
| 48 | + "gulp-sequence": "^1.0.0", | |
| 49 | + "gulp-uglify-es": "^1.0.4", | |
| 50 | + "jasmine-core": "^3.2.1", | |
| 51 | + "jquery": "^3.3.1", | |
| 52 | + "jshint": "^2.9.6", | |
| 53 | + "pre-commit": "^1.2.2", | |
| 54 | + "pump": "^3.0.0" | |
| 54 | 55 | } |
| 55 | 56 | } |