Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: objectscript/SQLKPI
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.1.1
Choose a base ref
...
head repository: objectscript/SQLKPI
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 27, 2017

  1. Copy the full SHA
    523ba5b View commit details
  2. [FIX] Template error

    MakarovS96 committed Dec 27, 2017
    Copy the full SHA
    493b1aa View commit details
Showing with 17 additions and 15 deletions.
  1. +2 −1 .gitignore
  2. +14 −13 gulpfile.js
  3. +1 −1 package.json
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
csp/.idea
.idea
node_modules
build
build
package-lock.json
27 changes: 14 additions & 13 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -26,13 +26,9 @@ gulp.task('lint', function () {
});

gulp.task('minify:js', function () {
return gulp.src('./csp/index.html')
.pipe(useref())
.pipe(gulpIf("*.js",replace('"{{package.json.version}}"', '"' + p.version + '"')))
.pipe(gulpIf("*.js",traceur()))
.pipe(gulpIf("*.js",uglify()))
.pipe(gulpIf("*.html",htmlmin({empty: false})))
.pipe(gulp.dest('build'));
return gulp.src('csp/src/**/*.*')
.pipe(gulpIf('*.js', replace('"{{package.json.version}}"', '"' + p.version + '"')))
.pipe(gulp.dest('build/src'));
});

gulp.task('minify:css', function () {
@@ -42,27 +38,32 @@ gulp.task('minify:css', function () {
.pipe(gulp.dest('build/css'))
});

gulp.task('minify:template', function () {
/*gulp.task('minify:template', function () {
return gulp.src('csp/src/view/*.html')
.pipe(htmlmin({empty: false}))
.pipe(templateCache({root:"src/view"}))
.pipe(gulp.dest('build/src/'))
});
});*/

gulp.task('concat-with-templates', function () {
/*gulp.task('concat-with-templates', function () {
return gulp.src(['build/src/app.js', 'build/src/templates.js'])
.pipe(concat('app.js'))
.pipe(gulp.dest('build/src'))
});
});*/

gulp.task('copy:csslibs', function () {
return gulp.src('csp/css/*.min.css')
.pipe(gulp.dest('build/css'));
});

gulp.task('copy:jslibs', function () {
/*gulp.task('copy:jslibs', function () {
return gulp.src('csp/src/lib/*.*')
.pipe(gulp.dest('build/src/lib'))
});*/

gulp.task('copy:jslibs', function () {
return gulp.src('csp/index.html')
.pipe(gulp.dest('build'))
});

gulp.task('copy:fonts', function () {
@@ -211,7 +212,7 @@ gulp.task('cleanup:after-creating-installer', function () {
});
});

gulp.task('minify', gulp.series(gulp.parallel('minify:js','minify:css','minify:template'), 'concat-with-templates'));
gulp.task('minify', gulp.series(gulp.parallel('minify:js','minify:css'/*,'minify:template'*/)/*, 'concat-with-templates'*/));
gulp.task('copy', gulp.parallel('copy:csslibs','copy:jslibs','copy:fonts'));
gulp.task('build', gulp.series(gulp.parallel('lint','cleanup:before-build'),gulp.parallel('minify','copy'),'cleanup:after-build'));
gulp.task('create-xml-installer', gulp.series(
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
"gulp-replace": "^0.6.1",
"gulp-traceur-compiler": "^1.1.4",
"gulp-uglify": "^3.0.0",
"gulp-useref": "^3.1.2",
"gulp-useref": "^3.1.3",
"jshint": "^2.9.5",
"through2": "^2.0.3"
},