autofront 1.1.1 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/index.js +30 -8
  2. package/package.json +4 -1
package/index.js CHANGED
@@ -4,8 +4,8 @@ const gulp = require('gulp'),
4
4
  $ = require('gulp-load-plugins')(),
5
5
  injStr = $.injectString,
6
6
  gulpSync = $.sync(gulp),
7
- browserSync = require('browser-sync').create(),
8
- deleteEmpty = require('delete-empty');
7
+ notifyError = $.notify.onError(error => error.message),
8
+ browserSync = require('browser-sync').create();
9
9
 
10
10
  var domain = undefined;
11
11
 
@@ -43,15 +43,33 @@ gulp.task('check', () => {
43
43
  });
44
44
 
45
45
  gulp.task('del', () => delFolder(paths.tmp));
46
- gulp.task('index-build', () => gulp.src(paths.srcIndexHtml).pipe(injStr.after('<!-- endbuild -->', nl+tab+'<link rel="stylesheet" href="'+cssFilename+'.css">')).pipe($.wiredep()).pipe($.useref()).pipe(gulp.dest(paths.tmp)));
46
+ gulp.task('index-build', () => {
47
+ const srcLibJs = paths.src+'lib/'+getFiles('js');
48
+ return gulp.src(paths.srcIndexHtml)
49
+ .pipe(injStr.after('<!-- endbuild -->', nl+tab+'<link rel="stylesheet" href="'+cssFilename+'.css">'))
50
+ .pipe(injectJs(srcLibJs, 'vendor'))
51
+ .pipe(injectJs([paths.srcJs, '!'+srcLibJs], 'app'))
52
+ .pipe($.wiredep())
53
+ .pipe($.useref())
54
+ .pipe(gulp.dest(paths.tmp));
55
+
56
+ function injectJs(globs, subname) {
57
+ return $.inject(gulp.src(globs).pipe($.angularFilesort()), {name: 'inject-'+subname, relative: true});
58
+ }
59
+ });
47
60
  gulp.task('index-domain', () => gulp.src(paths.tmp+getFiles('js')).pipe(injStr.replace('{{AUTOFRONT_DOMAIN}}', domain)).pipe(gulp.dest(paths.tmp)));
48
61
  gulp.task('index', gulpSync.sync([
49
62
  'index-build',
50
63
  'index-domain'
51
64
  ]));
52
- gulp.task('styles', () => gulp.src(paths.src+cssFilename+'.less').pipe(injStr.prepend('// bower:less'+nl+'// endbower'+nl)).pipe($.wiredep()).pipe($.less()).on('error', $.notify.onError(error => error.message)).pipe(gulp.dest(paths.tmp+stylesFolder)));
65
+ gulp.task('styles', () => gulp.src(paths.src+cssFilename+'.less').pipe(injStr.prepend('// bower:less'+nl+'// endbower'+nl)).pipe($.wiredep()).pipe($.less()).on('error', notifyError).pipe(gulp.dest(paths.tmp+stylesFolder)));
53
66
  gulp.task('fonts', () => gulp.src(mainBowerFiles()).pipe(filter(['eot','otf','svg','ttf', 'woff', 'woff2'], true)).pipe(gulp.dest(paths.tmp+'fonts/')));
54
- gulp.task('others', () => gulp.src(paths.srcOthers).pipe(gulp.dest(paths.tmp)));
67
+ gulp.task('others', () => {
68
+ const pugFilter = filter('pug');
69
+ return gulp.src(paths.srcOthers)
70
+ .pipe(pugFilter).pipe($.pug()).on('error', notifyError).pipe(pugFilter.restore)
71
+ .pipe(gulp.dest(paths.tmp));
72
+ });
55
73
  gulp.task('about', () => gulp.src('package.json').pipe($.about()).pipe(gulp.dest(paths.tmp)));
56
74
  gulp.task('build:tmp', gulpSync.sync([
57
75
  'del',
@@ -70,8 +88,8 @@ gulp.task('serve', ['browser'], () => {
70
88
 
71
89
  gulp.task('del:dist', () => delFolder(paths.dist));
72
90
  gulp.task('copy', ['del:dist'], () => gulp.src(paths.tmp+allFiles).pipe(gulp.dest(paths.dist)));
73
- gulp.task('templates-build', () => gulp.src([paths.dist+getFiles('html'), '!'+paths.dist+indexHtmlFile]).pipe($.cleanDest(paths.dist)).pipe($.htmlmin({collapseWhitespace: true, conservativeCollapse: true})).pipe($.angularTemplatecache(jsTemplatesFile, {module: 'app'})).pipe(gulp.dest(paths.dist)));
74
- gulp.task('templates-clean', () => deleteEmpty(paths.dist));
91
+ gulp.task('templates-build', () => gulp.src([paths.dist+getFiles('html'), '!'+paths.dist+indexHtmlFile]).pipe($.cleanDest(paths.dist)).pipe(minifyHtml()).pipe($.angularTemplatecache(jsTemplatesFile, {module: 'app'})).pipe(gulp.dest(paths.dist)));
92
+ gulp.task('templates-clean', () => require('delete-empty')(paths.dist));
75
93
  gulp.task('templates', gulpSync.sync([
76
94
  'templates-build',
77
95
  'templates-clean'
@@ -88,7 +106,7 @@ gulp.task('build', gulpSync.sync([
88
106
  imgFilter = filter(['png','jpg','gif','svg']),
89
107
  jsonFilter = filter('json');
90
108
  return gulp.src(paths.dist+allFiles)
91
- .pipe(indexHtmlFilter).pipe(injStr.before('</body>', '<script src="'+jsTemplatesFile+'"></script>'+nl)).pipe($.htmlmin({collapseWhitespace: true})).pipe(indexHtmlFilter.restore)
109
+ .pipe(indexHtmlFilter).pipe(injStr.before('</body>', '<script src="'+jsTemplatesFile+'"></script>'+nl)).pipe(minifyHtml()).pipe(indexHtmlFilter.restore)
92
110
  .pipe(cssFilter).pipe($.cssnano({zindex: false})).pipe(cssFilter.restore)
93
111
  .pipe(jsFilter).pipe($.ngAnnotate()).pipe($.uglify()).pipe(jsFilter.restore)
94
112
  .pipe(cssAndJsFilter).pipe($.rev()).pipe($.revDeleteOriginal()).pipe(cssAndJsFilter.restore)
@@ -123,4 +141,8 @@ function browserSyncInit(path) {
123
141
  baseDir: path
124
142
  }
125
143
  });
144
+ }
145
+
146
+ function minifyHtml() {
147
+ return $.htmlmin({collapseWhitespace: true, conservativeCollapse: true});
126
148
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "autofront",
3
- "version": "1.1.1",
3
+ "version": "1.3.0",
4
4
  "description": "Gulp settings for projects.",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -25,6 +25,7 @@
25
25
  "get-gulp-args": "0.0.1",
26
26
  "gulp": "^3.9.1",
27
27
  "gulp-about": "^1.1.0",
28
+ "gulp-angular-filesort": "^1.2.1",
28
29
  "gulp-angular-templatecache": "^2.2.1",
29
30
  "gulp-clean": "^0.4.0",
30
31
  "gulp-clean-dest": "^0.2.0",
@@ -32,12 +33,14 @@
32
33
  "gulp-filter": "^5.1.0",
33
34
  "gulp-htmlmin": "^4.0.0",
34
35
  "gulp-imagemin": "^4.1.0",
36
+ "gulp-inject": "^4.3.2",
35
37
  "gulp-inject-string": "^1.1.1",
36
38
  "gulp-jsonmin": "^1.1.0",
37
39
  "gulp-less": "^3.5.0",
38
40
  "gulp-load-plugins": "^1.5.0",
39
41
  "gulp-ng-annotate": "^2.1.0",
40
42
  "gulp-notify": "^3.2.0",
43
+ "gulp-pug": "^4.0.1",
41
44
  "gulp-rev": "^8.1.1",
42
45
  "gulp-rev-delete-original": "^0.2.3",
43
46
  "gulp-rev-replace": "^0.4.4",