Skip to content

Commit 0d81de4

Browse files
fix gulp error on building dashboard (#797)
1 parent 454a163 commit 0d81de4

File tree

2 files changed

+25
-6
lines changed

2 files changed

+25
-6
lines changed

gulpfile.js

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ var
1313
htmlreplace = require('gulp-html-replace'),
1414
ghtmlSrc = require('gulp-html-src'),
1515
minifyHTML = require('gulp-htmlmin'),
16-
gulpif = require('gulp-if'),
1716
gjscs = require('gulp-jscs'),
1817
jshint = require('gulp-jshint'),
1918
gmanifest = require('gulp-manifest3'),
2019
rename = require('gulp-rename'),
2120
replace = require('gulp-replace'),
2221
sass = require('gulp-sass')(require('sass')),
23-
uglify = require('gulp-uglify'),
2422
gutil = require('gulp-util'),
2523
path = require('path'),
26-
streamqueue = require('streamqueue');
24+
streamqueue = require('streamqueue'),
25+
map = require("map-stream"),
26+
terser = require("terser");
2727

2828
var vendorPrefix = "vendor/";
2929
function getFileName(attr, node) {
@@ -81,7 +81,26 @@ function js() {
8181
.pipe(gulp.dest('dist/'));
8282

8383
return streamqueue({ objectMode:true }, scripts, templates)
84-
.pipe(gulpif(/[.]min[.]js$/, gutil.noop(), uglify()))
84+
.pipe(map((data, cb) => {
85+
const path = data.path;
86+
const contents = data.contents;
87+
if (/\.min\.js$/.test(path)) {
88+
cb(null, data);
89+
}
90+
else {
91+
(async () => {
92+
try {
93+
const code = await terser.minify(contents.toString('utf8'));
94+
const result = Buffer.from(code.code);
95+
data.contents = result;
96+
cb(null, data);
97+
}
98+
catch (e) {
99+
cb("error: " +e.toString());
100+
}
101+
})();
102+
}
103+
}))
85104
.pipe(concat('app.min.js'))
86105
.pipe(header(fs.readFileSync('license.js')))
87106
.pipe(eol('\n'))

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,25 +117,25 @@
117117
"gulp-html-replace": "^1.6.2",
118118
"gulp-html-src": "^1.0.0",
119119
"gulp-htmlmin": "^5.0.1",
120-
"gulp-if": "^3.0.0",
121120
"gulp-jscs": "^4.1.0",
122121
"gulp-jshint": "^2.1.0",
123122
"gulp-manifest3": "^0.1.2",
124123
"gulp-rename": "^1.4.0",
125124
"gulp-replace": "^1.1.4",
126125
"gulp-sass": "^5.1.0",
127-
"gulp-uglify": "~3.0.2",
128126
"gulp-util": "^3.0.8",
129127
"jquery": "~3.6.2",
130128
"jshint": "~2.13.6",
131129
"justgage": "~1.6.1",
132130
"less": "^3.13.1",
131+
"map-stream": "^0.0.7",
133132
"material-design-icons-iconfont": "^6.7.0",
134133
"moment": "~2.29.4",
135134
"sass": "^1.57.1",
136135
"sprintf-js": "^1.1.2",
137136
"streamqueue": "~1.1.2",
138137
"svg-morpheus": "^0.3.0",
138+
"terser": "^5.16.5",
139139
"tinycolor2": "1.4.2",
140140
"weather-icons-lite": "^1.6.1"
141141
},

0 commit comments

Comments
 (0)