AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch to uglify-es

Browse source
This commit is contained in:
Stewart Allen 2018-09-17 12:12:04 -04:00
commit 9f9ae2e7e2
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = {
COPYRIGHT:"Copyright (C) 2014-2018 Stewart Allen <sa@grid.space> - All Rights Reserved",
LICENSE:"See the license.md file included with the source distribution",
VERSION:"1.2.3"
VERSION:"1.2.4"
};
if (!module) var module = {};
module.exports = exports;

18
js/web-server.js
View file

@ -174,7 +174,7 @@ function concatCode(array) {
cachepath = filepath;
}
cached = getCachedFile(filepath, cachepath, function(path) {
return uglify.minify(filepath).code;
return minify(filepath);
});
code.push(cached);
});
@ -488,6 +488,16 @@ function handleData(req, res, next) {
}
}
function minify(path) {
let code = fs.readFileSync(path);
let mini = uglify.minify(code.toString());
if (mini.error) {
console.trace(mini.error);
throw mini.error;
}
return mini.code;
}
/**
* @param {Object} req
* @param {Object} res
@ -523,7 +533,7 @@ function handleJS(req, res, next) {
return;
} else {
var start = new Date().getTime(),
code = uglify.minify([fpath]).code,
code = minify(fpath),
end = new Date().getTime();
log({minify:fpath, in:f.size, out:code.length, time:(end-start)});
@ -686,7 +696,7 @@ var ver = require('../js/license.js'),
spawn = require('child_process').spawn,
level = require('levelup')('./persist/', {valueEncoding:"json"}),
https = require('https'),
uglify = require('uglify-js'),
uglify = require('uglify-es'),
connect = require('connect'),
request = require('request'),
serveStatic = require('serve-static'),
@ -963,7 +973,7 @@ function initModule(file, dir) {
if (clearJS) {
code[endpoint] = fs.readFileSync(path);
} else {
code[endpoint] = uglify.minify(path).code;
code[endpoint] = minify(path);
}
}
},

10
package.json
View file

@ -27,18 +27,18 @@
},
"dependencies": {
"buffer-crc32": "^0.2.13",
"compression": "^1.7.2",
"compression": "^1.7.3",
"connect": "^3.6.6",
"express-useragent": "^1.0.12",
"leveldown": "^1.9.0",
"levelup": "^1.3.9",
"moment": "^2.21.0",
"moment": "^2.22.2",
"n3d-threejs": "^72.0.0",
"pixi.js": "^4.7.0",
"request": "^2.83.0",
"pixi.js": "^4.8.2",
"request": "^2.88.0",
"serve-static": "^1.13.2",
"tween.js": "^0.14.0",
"uglify-js": "^2.8.29",
"uglify-es": "^3.3.9",
"validator": "^8.2.0"
}
}