Merge branch 'pr/2'

# Conflicts: # .gitignore # Gruntfile.js # README.md # package.json # src/web/static/images/breakpoint-16x16.png # src/web/static/images/bug-16x16.png # src/web/static/images/clean-16x16.png # src/web/static/images/code-16x16.png # src/web/static/images/cook_female-32x32.png # src/web/static/images/cook_male-32x32.png # src/web/static/images/cyberchef-128x128.png # src/web/static/images/cyberchef-16x16.png # src/web/static/images/cyberchef-256x256.png # src/web/static/images/cyberchef-32x32.png # src/web/static/images/cyberchef-512x512.png # src/web/static/images/cyberchef-64x64.png # src/web/static/images/disable_deselected-16x16.png # src/web/static/images/disable_selected-16x16.png # src/web/static/images/download-24x24.png # src/web/static/images/erase-16x16.png # src/web/static/images/favicon.ico # src/web/static/images/favourite-16x16.png # src/web/static/images/favourite-24x24.png # src/web/static/images/fork_me.png # src/web/static/images/help-16x16.png # src/web/static/images/help-22x22.png # src/web/static/images/info-16x16.png # src/web/static/images/layout-16x16.png # src/web/static/images/mail-16x16.png # src/web/static/images/maximise-16x16.png # src/web/static/images/open_yellow-16x16.png # src/web/static/images/open_yellow-24x24.png # src/web/static/images/recycle-16x16.png # src/web/static/images/remove-16x16.png # src/web/static/images/restore-16x16.png # src/web/static/images/save-16x16.png # src/web/static/images/save-22x22.png # src/web/static/images/save_as-16x16.png # src/web/static/images/settings-22x22.png # src/web/static/images/speech-16x16.png # src/web/static/images/stats-16x16.png # src/web/static/images/step-16x16.png # src/web/static/images/switch-16x16.png # src/web/static/images/thumb_down-16x16.png # src/web/static/images/thumb_up-16x16.png # src/web/static/images/undo-16x16.png
2025-05-11 16:51:31 -04:00 · 2017-06-06 14:59:33 +01:00 · 2017-06-06 14:59:33 +01:00 · 3ee01f7dc4
commit 3ee01f7dc4
parent 1a29493210 57dcd961d5
250 changed files with 7675 additions and 71622 deletions
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "cyberchef",
-  "version": "4.0.0",
-  "description": "CyberChef is a simple, intuitive web app for analysing and decoding data within a web browser.",
+  "version": "5.7.2",
+  "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
  "author": "n1474335 <n1474335@gmail.com>",
  "homepage": "https://gchq.github.io/CyberChef",
  "copyright": "Crown copyright 2016",
@ -19,29 +19,79 @@
    "hex",
    "encoding",
    "format",
-    "cybersecurity"
+    "cybersecurity",
+    "data manipulation",
+    "data analysis"
  ],
  "repository": {
    "type": "git",
    "url": "https://github.com/gchq/CyberChef/"
  },
+  "main": "build/node/CyberChef.js",
+  "bugs": "https://github.com/gchq/CyberChef/issues",
  "devDependencies": {
-    "grunt": "~1.0.1",
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.0",
+    "babel-polyfill": "^6.23.0",
+    "babel-preset-env": "^1.2.2",
+    "css-loader": "^0.27.3",
+    "exports-loader": "^0.6.4",
+    "extract-text-webpack-plugin": "^2.1.0",
+    "file-loader": "^0.10.1",
+    "grunt": ">=0.4.5",
+    "grunt-accessibility": "~5.0.0",
    "grunt-chmod": "~1.1.1",
    "grunt-contrib-clean": "~1.0.0",
-    "grunt-contrib-concat": "~1.0.0",
    "grunt-contrib-copy": "~1.0.0",
-    "grunt-contrib-cssmin": "~1.0.2",
-    "grunt-contrib-htmlmin": "~2.0.0",
-    "grunt-contrib-uglify": "~2.0.0",
-    "grunt-contrib-watch": "~1.0.0",
    "grunt-eslint": "^19.0.0",
    "grunt-exec": "~1.0.1",
    "grunt-execute": "^0.2.2",
-    "grunt-inline-alt": "~0.3.10",
    "grunt-jsdoc": "^2.1.0",
+    "grunt-webpack": "^2.0.1",
+    "html-webpack-plugin": "^2.28.0",
+    "imports-loader": "^0.7.1",
    "ink-docstrap": "^1.1.4",
-    "phantomjs-prebuilt": "^2.1.14"
+    "jsdoc-babel": "^0.3.0",
+    "less": "^2.7.2",
+    "less-loader": "^4.0.3",
+    "postcss-css-variables": "^0.7.0",
+    "postcss-import": "^10.0.0",
+    "postcss-loader": "^2.0.5",
+    "style-loader": "^0.15.0",
+    "url-loader": "^0.5.8",
+    "web-resource-inliner": "^4.1.0",
+    "webpack": "^2.2.1"
+  },
+  "dependencies": {
+    "bootstrap": "^3.3.7",
+    "bootstrap-colorpicker": "^2.5.1",
+    "bootstrap-switch": "^3.3.4",
+    "crypto-api": "^0.6.2",
+    "crypto-js": "^3.1.9-1",
+    "diff": "^3.2.0",
+    "escodegen": "^1.8.1",
+    "esmangle": "^1.0.1",
+    "esprima": "^3.1.3",
+    "exif-parser": "^0.1.9",
+    "google-code-prettify": "^1.0.5",
+    "jquery": "^3.1.1",
+    "jsbn": "^1.1.0",
+    "jsrsasign": "7.1.3",
+    "lodash": "^4.17.4",
+    "moment": "^2.17.1",
+    "moment-timezone": "^0.5.11",
+    "sladex-blowfish": "^0.8.1",
+    "sortablejs": "^1.5.1",
+    "split.js": "^1.2.0",
+    "vkbeautify": "^0.99.1",
+    "xmldom": "^0.1.27",
+    "xpath": "0.0.24",
+    "zlibjs": "^0.2.0"
+  },
+  "scripts": {
+    "build": "grunt prod",
+    "test": "grunt test",
+    "docs": "grunt docs"
  },
  "dependencies": {
    "grunt-cli": "^1.2.0"