Skip to content

Commit 187ab04

Browse files
committed
build: all SVGs are optimized
- move svgs from src/main/frontend/img to src/main/frontend/svg - adapt Gulpfile - remove duplicates in src/main/xar-resoures/resources/images
1 parent 796a192 commit 187ab04

File tree

7 files changed

+31
-34
lines changed

7 files changed

+31
-34
lines changed

Gulpfile.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Turn on/off build features
44
*/
55

6-
var settings = {
6+
const settings = {
77
clean: true,
88
scripts: true,
99
hjs: false,
@@ -17,7 +17,7 @@ var settings = {
1717
* Paths to project folders
1818
*/
1919

20-
var paths = {
20+
const paths = {
2121
input: 'src/main/frontend/',
2222
output: 'target/generated-resources/frontend/xar-resources/resources/',
2323
scripts: {
@@ -30,7 +30,7 @@ var paths = {
3030
output: 'target/generated-resources/frontend/xar-resources/resources/styles/'
3131
},
3232
svgs: {
33-
input: 'src/main/frontend/img/*.svg',
33+
input: 'src/main/frontend/svg/*.svg',
3434
output: 'target/generated-resources/frontend/xar-resources/resources/images/'
3535
},
3636
vendor: {
@@ -46,7 +46,7 @@ var paths = {
4646
* Template for banner to add to file headers
4747
*/
4848

49-
var banner = {
49+
const banner = {
5050
full: '/*!\n' +
5151
' * <%= package.name %> v<%= package.version %>\n' +
5252
' * <%= package.description %>\n' +
@@ -67,43 +67,43 @@ var banner = {
6767
*/
6868

6969
// General
70-
var {
70+
const {
7171
gulp,
7272
src,
7373
dest,
7474
series,
7575
parallel
7676
} = require('gulp')
77-
var del = require('del')
78-
var flatmap = require('gulp-flatmap')
79-
var lazypipe = require('lazypipe')
80-
var rename = require('gulp-rename')
81-
var header = require('gulp-header')
82-
var pkg = require('./package.json')
83-
var muxml = require('gulp-muxml')
77+
const del = require('del')
78+
const flatmap = require('gulp-flatmap')
79+
const lazypipe = require('lazypipe')
80+
const rename = require('gulp-rename')
81+
const header = require('gulp-header')
82+
const pkg = require('./package.json')
83+
const muxml = require('gulp-muxml')
8484

8585

8686
// Scripts
87-
var standard = require('gulp-standard')
88-
var concat = require('gulp-concat')
89-
var uglify = require('gulp-uglify')
90-
var optimizejs = require('gulp-optimize-js')
87+
const standard = require('gulp-standard')
88+
const concat = require('gulp-concat')
89+
const uglify = require('gulp-uglify')
90+
const optimizejs = require('gulp-optimize-js')
9191

9292
// Styles
93-
var sass = require('gulp-sass')(require('sass'))
94-
var prefix = require('gulp-autoprefixer')
95-
var minify = require('gulp-cssnano')
96-
var sourcemaps = require('gulp-sourcemaps')
93+
const sass = require('gulp-sass')(require('sass'))
94+
const prefix = require('gulp-autoprefixer')
95+
const minify = require('gulp-cssnano')
96+
const sourcemaps = require('gulp-sourcemaps')
9797

9898
// SVGs
99-
var svgmin = require('gulp-svgmin')
99+
const svgmin = require('gulp-svgmin')
100100

101101
/**
102102
* Gulp Tasks
103103
*/
104104

105105
// Remove pre-existing content from output folders
106-
var cleanDist = function (done) {
106+
const cleanDist = function (done) {
107107
// Make sure this feature is activated before running
108108
if (!settings.clean) return done()
109109

@@ -117,7 +117,7 @@ var cleanDist = function (done) {
117117
}
118118

119119
// Repeated JavaScript tasks
120-
var jsTasks = lazypipe()
120+
const jsTasks = lazypipe()
121121
.pipe(header, banner.full, {
122122
package: pkg
123123
})
@@ -134,7 +134,7 @@ var jsTasks = lazypipe()
134134
.pipe(dest, paths.scripts.output)
135135

136136
// Lint, minify, and concatenate scripts
137-
var buildScripts = function (done) {
137+
const buildScripts = function (done) {
138138
// Make sure this feature is activated before running
139139
if (!settings.scripts) return done()
140140

@@ -144,7 +144,7 @@ var buildScripts = function (done) {
144144
// If the file is a directory
145145
if (file.isDirectory()) {
146146
// Setup a suffix variable
147-
var suffix = ''
147+
const suffix = ''
148148

149149
// If separate polyfill files enabled
150150
if (settings.polyfills) {
@@ -175,7 +175,7 @@ var buildScripts = function (done) {
175175
}
176176

177177
// Lint scripts
178-
var lintScripts = function (done) {
178+
const lintScripts = function (done) {
179179
// Make sure this feature is activated before running
180180
if (!settings.scripts) return done()
181181

@@ -192,7 +192,7 @@ var lintScripts = function (done) {
192192

193193
// pretty print all xml listings
194194
// articles not yet decided
195-
var prettyXml = function (done) {
195+
const prettyXml = function (done) {
196196
src(paths.xml.listings, { base: "./" })
197197
.pipe(muxml({
198198
stripComments: false,
@@ -209,7 +209,7 @@ var prettyXml = function (done) {
209209
}
210210

211211
// Process, lint, and minify Sass files
212-
var buildStyles = function (done) {
212+
const buildStyles = function (done) {
213213
// Make sure this feature is activated before running
214214
if (!settings.styles) return done()
215215

@@ -249,7 +249,7 @@ var buildStyles = function (done) {
249249
}
250250

251251
// Optimize SVG files
252-
var buildSVGs = function (done) {
252+
const buildSVGs = function (done) {
253253
// Make sure this feature is activated before running
254254
if (!settings.svgs) return done()
255255

@@ -263,13 +263,13 @@ var buildSVGs = function (done) {
263263
}
264264

265265
// Copy third-party dependencies from node_modules into resources
266-
var vendorFiles = function (done) {
266+
const vendorFiles = function (done) {
267267
// Make sure this feature is activated before running
268268
if (!settings.vendor) return done()
269269

270270
// TODO ensure each declared third-parrty dep has a corresponding command below
271271
// TODO modernizr@2 needs refactor via npm or gulp-modernizr
272-
var deps = pkg.dependencies.length
272+
const deps = pkg.dependencies.length
273273

274274

275275
// copy vendor scripts
File renamed without changes.
File renamed without changes.

src/main/xar-resources/resources/images/existdb-web.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/main/xar-resources/resources/images/powered-by-whiteglass.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)