Skip to content

Commit

Permalink
more packages
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Grainger committed Nov 29, 2016
1 parent 19c4b86 commit 8c9d885
Show file tree
Hide file tree
Showing 11 changed files with 46 additions and 144 deletions.
4 changes: 4 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,20 @@
"dependencies": {
"core-js": "^2.4.1",
"crypto-js": "^3.1.8",
"dojox": "^1.11.2",
"escodegen": "^1.8.1",
"esmangle": "^1.0.1",
"esprima": "^3.1.2",
"estraverse": "^4.2.0",
"google-code-prettify": "^1.0.5",
"jquery": "^3.1.1",
"json-loader": "^0.5.4",
"jsrsasign": "^6.2.2",
"moment": "^2.17.0",
"moment-timezone": "^0.5.10",
"node-bzip": "^0.0.1-2",
"split.js": "^1.1.1",
"vkbeautify": "^0.99.1",
"zlibjs": "^0.2.0"
}
}
4 changes: 2 additions & 2 deletions src/js/core/Utils.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';


import CryptoJS from 'crypto-js';
import moment from 'moment';

/**
* Utility functions for use in operations, the core framework and the stage.
Expand Down
132 changes: 0 additions & 132 deletions src/js/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,135 +1,3 @@
import './core/Ingredient.js';
import './core/Dish.js';
import './core/FlowControl.js';
import './core/Operation.js';
import './core/Recipe.js';
import './core/Utils.js';
import './core/Chef.js';
import './lib/canvas_components.js';
import './lib/punycode.js';
import './lib/rawinflate.js';
import './lib/unzip.js';
import './lib/zlib_and_gzip.js';
import './lib/split.js';
import './lib/rawdeflate.js';
import 'moment-timezone';
import './lib/diff.js';
import './lib/prettify.js';
import './lib/bootstrap-3.3.6.js';
import './lib/Sortable.js';
import './lib/snowfall.jquery.js';
import './lib/zip.js';
import './lib/escodegen.browser.js';
import './lib/bootstrap-switch.js';
import './lib/yahoo.js';
import './lib/vkbeautify.js';
import 'moment';
import './lib/bootstrap-colorpicker.js';
import './lib/cryptojs/format-hex.js';
import './lib/cryptojs/hmac.js';
import './lib/cryptojs/pad-iso10126.js';
import './lib/cryptojs/sha384.js';
import './lib/cryptojs/aes.js';
import './lib/cryptojs/pad-nopadding.js';
import './lib/cryptojs/core.js';
import './lib/cryptojs/pad-zeropadding.js';
import './lib/cryptojs/mode-ctr.js';
import './lib/cryptojs/sha1.js';
import './lib/cryptojs/md5.js';
import './lib/cryptojs/evpkdf.js';
import './lib/cryptojs/rabbit.js';
import './lib/cryptojs/rc4.js';
import './lib/cryptojs/lib-typedarrays.js';
import './lib/cryptojs/enc-base64.js';
import './lib/cryptojs/sha3.js';
import './lib/cryptojs/sha224.js';
import './lib/cryptojs/mode-ofb.js';
import './lib/cryptojs/rabbit-legacy.js';
import './lib/cryptojs/ripemd160.js';
import './lib/cryptojs/cipher-core.js';
import './lib/cryptojs/pbkdf2.js';
import './lib/cryptojs/pad-iso97971.js';
import './lib/cryptojs/sha256.js';
import './lib/cryptojs/x64-core.js';
import './lib/cryptojs/mode-ecb.js';
import './lib/cryptojs/sha512.js';
import './lib/cryptojs/mode-ctr-gladman.js';
import './lib/cryptojs/enc-utf16.js';
import './lib/cryptojs/tripledes.js';
import './lib/cryptojs/mode-cfb.js';
import './lib/cryptojs/pad-ansix923.js';
import './lib/bzip2.js';
import './lib/jsbn/rsa.js';
import './lib/jsbn/jsbn2.js';
import './lib/jsbn/ec.js';
import './lib/jsbn/prng4.js';
import './lib/jsbn/jsbn.js';
import './lib/jsbn/rng.js';
import './lib/jsbn/base64.js';
import './lib/jsbn/sec.js';
import './lib/esmangle.min.js';
import './lib/blowfish.dojo.js';
import 'jquery';
import 'esprima';
import './lib/jsrasign/ecdsa-modified-1.0.js';
import './lib/jsrasign/asn1-1.0.js';
import './lib/jsrasign/x509-1.1.js';
import './lib/jsrasign/asn1hex-1.1.js';
import './lib/jsrasign/dsa-modified-1.0.js';
import './lib/jsrasign/crypto-1.1.js';
import './lib/jsrasign/asn1x509-1.0.js';
import './lib/jsrasign/base64x-1.1.js';
import './lib/jsrasign/ecparam-1.0.js';
import './lib/jsrasign/keyutil-1.0.js';
import './lib/uas_parser.js';
import './config/OperationConfig.js';
import './config/Categories.js';
import './views/html/InputWaiter.js';
import './views/html/HTMLCategory.js';
import './views/html/OperationsWaiter.js';
import './views/html/main.js';
import './views/html/ControlsWaiter.js';
import './views/html/HTMLOperation.js';
import './views/html/OptionsWaiter.js';
import './views/html/OutputWaiter.js';
import './views/html/SeasonalWaiter.js';
import './views/html/Manager.js';
import './views/html/HighlighterWaiter.js';
import './views/html/WindowWaiter.js';
import './views/html/HTMLApp.js';
import './views/html/HTMLIngredient.js';
import './views/html/RecipeWaiter.js';
import './operations/IP.js';
import './operations/MAC.js';
import './operations/Code.js';
import './operations/Checksum.js';
import './operations/CharEnc.js';
import './operations/Extract.js';
import './operations/URL.js';
import './operations/FileType.js';
import './operations/Cipher.js';
import './operations/PublicKey.js';
import './operations/Punycode.js';
import './operations/OS.js';
import './operations/Convert.js';
import './operations/HTTP.js';
import './operations/SeqUtils.js';
import './operations/Rotate.js';
import './operations/Unicode.js';
import './operations/Endian.js';
import './operations/Tidy.js';
import './operations/StrUtils.js';
import './operations/Numberwang.js';
import './operations/HTML.js';
import './operations/QuotedPrintable.js';
import './operations/DateTime.js';
import './operations/JS.js';
import './operations/Base.js';
import './operations/Hash.js';
import './operations/Entropy.js';
import './operations/Hexdump.js';
import './operations/BitwiseOp.js';
import './operations/ByteRepr.js';
import './operations/UUID.js';
import './operations/Base64.js';
import './operations/Compress.js';
6 changes: 3 additions & 3 deletions src/js/operations/ByteRepr.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ const ByteRepr = {
else if (ordinal < 4294967296) padding = 8;
else padding = 2;

if (padding > 2) app.options.attempt_highlight = false;
if (padding > 2) window.app.options.attempt_highlight = false;

output += Utils.hex(ordinal, padding) + delim;
} else {
app.options.attempt_highlight = false;
window.app.options.attempt_highlight = false;
output += ordinal.toString(base) + delim;
}
}
Expand All @@ -120,7 +120,7 @@ const ByteRepr = {
}

if (base != 16) {
app.options.attempt_highlight = false;
window.app.options.attempt_highlight = false;
}

// Split into groups of 2 if the whole string is concatenated and
Expand Down
3 changes: 1 addition & 2 deletions src/js/operations/CharEnc.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import CryptoJS from 'crypto-js';
import Utils from '../core/Utils';



/**
* Character encoding operations.
*
Expand Down
2 changes: 2 additions & 0 deletions src/js/operations/Cipher.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import CryptoJS from 'crypto-js';
import blowfish from 'dojox/encoding/crypto/Blowfish';
import Utils from '../core/Utils';


Expand Down
4 changes: 2 additions & 2 deletions src/js/operations/Code.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Utils from '../core/Utils';


import { prettyPrintOne } from 'google-code-prettify/src/prettify';
import vkbeautify from 'vkbeautify';

/**
* Code operations.
Expand Down
2 changes: 1 addition & 1 deletion src/js/operations/PublicKey.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Utils from '../core/Utils';
import { X509, KJUR, ASN1HEX, BigInteger, KEYUTIL } from 'jrsasign';
import { X509, KJUR, ASN1HEX, BigInteger, KEYUTIL } from 'jsrsasign';


/**
Expand Down
2 changes: 1 addition & 1 deletion src/js/views/html/HTMLApp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Chef from '../../core/Chef';
import Manager from './Manager';
import HTMLCategory from './HTMLCategory';
import HTMLOperation from './HTMLOperation';
import Split from '../lib/split';
import Split from 'split.js';


/**
Expand Down
2 changes: 1 addition & 1 deletion src/js/views/html/main.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import moment from './moment';
import moment from 'moment';
import HTMLApp from './HTMLApp';
import Categories from '../../config/Categories';
import OperationConfig from '../../config/OperationConfig';
Expand Down
29 changes: 29 additions & 0 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1447,13 +1447,30 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"

dijit@1.11.2:
version "1.11.2"
resolved "https://registry.yarnpkg.com/dijit/-/dijit-1.11.2.tgz#22c6a3041deeb5a9b5ed31b5b6f80f4b877eb695"
dependencies:
dojo "1.11.2"

doctrine@1.5.0, doctrine@^1.2.2:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
dependencies:
esutils "^2.0.2"
isarray "^1.0.0"

dojo@1.11.2:
version "1.11.2"
resolved "https://registry.yarnpkg.com/dojo/-/dojo-1.11.2.tgz#3e713cab40093aba9120304f0ca5053ac4d4193d"

dojox@^1.11.2:
version "1.11.2"
resolved "https://registry.yarnpkg.com/dojox/-/dojox-1.11.2.tgz#fc79a410c6e96952bc28a638a6eefece0e1b0309"
dependencies:
dijit "1.11.2"
dojo "1.11.2"

dom-converter@~0.1:
version "0.1.4"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
Expand Down Expand Up @@ -2220,6 +2237,10 @@ globule@~0.1.0:
lodash "~1.0.1"
minimatch "~0.2.11"

google-code-prettify@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/google-code-prettify/-/google-code-prettify-1.0.5.tgz#9f477f224dbfa62372e5ef803a7e157410400084"

graceful-fs@^4.1.2, graceful-fs@^4.1.9:
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
Expand Down Expand Up @@ -4532,6 +4553,10 @@ spdy@^3.4.1:
select-hose "^2.0.0"
spdy-transport "^2.0.15"

split.js@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/split.js/-/split.js-1.1.1.tgz#81a039050cf108d297fbdf6b571a0f087ec6c7a7"

sprintf-js@~1.0.2:
version "1.0.3"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
Expand Down Expand Up @@ -4968,6 +4993,10 @@ verror@1.3.6:
dependencies:
extsprintf "1.0.2"

vkbeautify@^0.99.1:
version "0.99.1"
resolved "https://registry.yarnpkg.com/vkbeautify/-/vkbeautify-0.99.1.tgz#203f69e07facc04f3cfdafaa0525f865aa7d3fe1"

vm-browserify@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
Expand Down

0 comments on commit 8c9d885

Please sign in to comment.