mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 06:55:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge conflict

Browse source
This commit is contained in:
n1474335 2017-05-02 23:03:28 +01:00
commit 80cdf0c014
76 changed files with 1504 additions and 809 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Gruntfile.js
View file

@ -1,7 +1,7 @@
var webpack = require("webpack"),
ExtractTextPlugin = require("extract-text-webpack-plugin"),
HtmlWebpackPlugin = require("html-webpack-plugin"),
Inliner = require("web-resource-inliner");
const webpack = require("webpack");
const ExtractTextPlugin = require("extract-text-webpack-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin");
const Inliner = require("web-resource-inliner");
module.exports = function (grunt) {
grunt.file.defaultEncoding = "utf8";
@ -54,7 +54,7 @@ module.exports = function (grunt) {
// Project configuration
var compileTime = grunt.template.today("UTC:dd/mm/yyyy HH:MM:ss") + " UTC",
const compileTime = grunt.template.today("UTC:dd/mm/yyyy HH:MM:ss") + " UTC",
banner = "/**\n" +
"* CyberChef - The Cyber Swiss Army Knife\n" +
"*\n" +
@ -80,7 +80,7 @@ module.exports = function (grunt) {
* Compiles a production build of CyberChef into a single, portable web page.
*/
function runInliner() {
var inlinerError = false;
const done = this.async();
Inliner.html({
relativeTo: "build/prod/",
fileContent: grunt.file.read("build/prod/cyberchef.htm"),
@ -91,14 +91,16 @@ module.exports = function (grunt) {
strict: true
}, function(error, result) {
if (error) {
console.log(error);
inlinerError = true;
return false;
if (error instanceof Error) {
done(error);
} else {
done(new Error(error));
}
} else {
grunt.file.write("build/prod/cyberchef.htm", result);
done(true);
}
grunt.file.write("build/prod/cyberchef.htm", result);
});
return !inlinerError;
}
grunt.initConfig({
@ -111,7 +113,7 @@ module.exports = function (grunt) {
},
eslint: {
options: {
configFile: "src/.eslintrc.json"
configFile: "./.eslintrc.json"
},
configs: ["Gruntfile.js"],
core: ["src/core/**/*.js", "!src/core/lib/**/*"],
@ -301,7 +303,7 @@ module.exports = function (grunt) {
copy: {
ghPages: {
options: {
process: function (content, srcpath) {
process: function (content) {
// Add Google Analytics code to index.html
content = content.replace("</body></html>",
grunt.file.read("src/web/static/ga.html") + "</body></html>");
@ -342,5 +344,4 @@ module.exports = function (grunt) {
test: "build/test/index.js"
},
});
};