Merge branch 'feature-hashing'

gchq · Sep 14, 2017 · 81acb5b · 81acb5b
2 parents f1fe0b9 + 0b79019
commit 81acb5b
Show file tree

Hide file tree

Showing 12 changed files with 740 additions and 197 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - node
+  - "8.4"
 install: npm install
 before_script:
   - npm install -g grunt

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -111,7 +111,7 @@ module.exports = function (grunt) {
             prod: ["build/prod/*"],
             test: ["build/test/*"],
             node: ["build/node/*"],
-            docs: ["docs/*", "!docs/*.conf.json", "!docs/*.ico"],
+            docs: ["docs/*", "!docs/*.conf.json", "!docs/*.ico", "!docs/*.png"],
         },
         eslint: {
             options: {
@@ -319,15 +319,29 @@ module.exports = function (grunt) {
         copy: {
             ghPages: {
                 options: {
-                    process: function (content) {
+                    process: function (content, srcpath) {
                         // Add Google Analytics code to index.html
-                        content = content.replace("</body></html>",
-                            grunt.file.read("src/web/static/ga.html") + "</body></html>");
-                        return grunt.template.process(content);
-                    }
+                        if (srcpath.indexOf("index.html") >= 0) {
+                            content = content.replace("</body></html>",
+                                grunt.file.read("src/web/static/ga.html") + "</body></html>");
+                            return grunt.template.process(content, srcpath);
+                        } else {
+                            return content;
+                        }
+                    },
+                    noProcess: ["**", "!**/*.html"]
                 },
-                src: "build/prod/index.html",
-                dest: "build/prod/index.html"
+                files: [
+                    {
+                        src: "build/prod/index.html",
+                        dest: "build/prod/index.html"
+                    },
+                    {
+                        expand: true,
+                        src: "docs/**",
+                        dest: "build/prod/"
+                    }
+                ]
             }
         },
         chmod: {

diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/jsdoc.conf.json b/docs/jsdoc.conf.json
@@ -19,7 +19,7 @@
         "outputSourcePath": true,
         "dateFormat": "ddd MMM Do YYYY",
         "sort": false,
-        "logoFile": "../build/prod/images/cyberchef-32x32.png",
+        "logoFile": "cyberchef-32x32.png",
         "cleverLinks": false,
         "monospaceLinks": false,
         "protocol": "html://",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,62 +30,65 @@
   "main": "build/node/CyberChef.js",
   "bugs": "https://github.com/gchq/CyberChef/issues",
   "devDependencies": {
-    "babel-core": "^6.24.0",
-    "babel-loader": "^7.1.1",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.2",
     "babel-preset-env": "^1.6.0",
-    "css-loader": "^0.28.4",
+    "css-loader": "^0.28.7",
     "exports-loader": "^0.6.4",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
-    "grunt": ">=0.4.5",
+    "grunt": ">=1.0.1",
     "grunt-accessibility": "~5.0.0",
     "grunt-chmod": "~1.1.1",
     "grunt-contrib-clean": "~1.1.0",
     "grunt-contrib-copy": "~1.0.0",
-    "grunt-eslint": "^20.0.0",
+    "grunt-eslint": "^20.1.0",
     "grunt-exec": "~3.0.0",
     "grunt-execute": "^0.2.2",
-    "grunt-jsdoc": "^2.1.0",
+    "grunt-jsdoc": "^2.1.1",
     "grunt-webpack": "^3.0.2",
     "html-webpack-plugin": "^2.30.1",
     "imports-loader": "^0.7.1",
-    "ink-docstrap": "^1.1.4",
+    "ink-docstrap": "^1.3.0",
     "jsdoc-babel": "^0.3.0",
     "less": "^2.7.2",
     "less-loader": "^4.0.5",
-    "postcss-css-variables": "^0.7.0",
+    "postcss-css-variables": "^0.8.0",
     "postcss-import": "^10.0.0",
-    "postcss-loader": "^2.0.5",
+    "postcss-loader": "^2.0.6",
     "style-loader": "^0.18.2",
-    "url-loader": "^0.5.8",
-    "web-resource-inliner": "^4.1.0",
-    "webpack": "^3.4.1",
+    "url-loader": "^0.5.9",
+    "web-resource-inliner": "^4.1.1",
+    "webpack": "^3.5.6",
     "webpack-node-externals": "^1.6.0"
   },
   "dependencies": {
-    "babel-polyfill": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
     "bootstrap": "^3.3.7",
     "bootstrap-colorpicker": "^2.5.1",
     "bootstrap-switch": "^3.3.4",
-    "crypto-api": "^0.6.2",
+    "crypto-api": "^0.7.3",
     "crypto-js": "^3.1.9-1",
-    "diff": "^3.3.0",
-    "escodegen": "^1.8.1",
+    "diff": "^3.3.1",
+    "escodegen": "^1.9.0",
     "esmangle": "^1.0.1",
     "esprima": "^4.0.0",
     "exif-parser": "^0.1.12",
     "google-code-prettify": "^1.0.5",
-    "jquery": "^3.1.1",
+    "jquery": "^3.2.1",
+    "js-crc": "^0.2.0",
+    "js-sha3": "^0.6.1",
     "jsbn": "^1.1.0",
     "jsonpath": "^0.2.12",
     "jsrsasign": "8.0.3",
     "lodash": "^4.17.4",
-    "moment": "^2.17.1",
-    "moment-timezone": "^0.5.11",
+    "moment": "^2.18.1",
+    "moment-timezone": "^0.5.13",
+    "node-md6": "^0.1.0",
     "otp": "^0.1.3",
     "sladex-blowfish": "^0.8.1",
-    "sortablejs": "^1.5.1",
-    "split.js": "^1.2.0",
+    "sortablejs": "^1.6.1",
+    "split.js": "^1.3.5",
     "vkbeautify": "^0.99.3",
     "xmldom": "^0.1.27",
     "xpath": "0.0.24",