Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 14:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from t-8ch/nodejs16

Browse Source 
Node 16 compatibility
This commit is contained in:
john19696 2022-01-21 15:05:16 +00:00 committed by GitHub
commit 1fac8c1cea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gruntfile.js
View File

@ -349,15 +349,15 @@ module.exports = function (grunt) {
command: "git gc --prune=now --aggressive" command: "git gc --prune=now --aggressive"
}, },
sitemap: { sitemap: {
command: "node --experimental-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml", command: "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml",
sync: true sync: true
}, },
generateConfig: { generateConfig: {
command: chainCommands([ command: chainCommands([
"echo '\n--- Regenerating config files. ---'", "echo '\n--- Regenerating config files. ---'",
"echo [] > src/core/config/OperationConfig.json", "echo [] > src/core/config/OperationConfig.json",
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs", "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs",
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs", "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs",
"echo '--- Config scripts finished. ---\n'" "echo '--- Config scripts finished. ---\n'"
]), ]),
sync: true sync: true
@ -365,7 +365,7 @@ module.exports = function (grunt) {
generateNodeIndex: { generateNodeIndex: {
command: chainCommands([ command: chainCommands([
"echo '\n--- Regenerating node index ---'", "echo '\n--- Regenerating node index ---'",
"node --experimental-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs", "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs",
"echo '--- Node index generated. ---\n'" "echo '--- Node index generated. ---\n'"
]), ]),
sync: true sync: true
@ -400,14 +400,14 @@ module.exports = function (grunt) {
testESMNodeConsumer: { testESMNodeConsumer: {
command: chainCommands([ command: chainCommands([
`cd ${nodeConsumerTestPath}`, `cd ${nodeConsumerTestPath}`,
"node --no-warnings --experimental-modules esm-consumer.mjs", "node --no-warnings --experimental-modules --experimental-json-modules esm-consumer.mjs",
]), ]),
stdout: false, stdout: false,
}, },
testESMDeepImportNodeConsumer: { testESMDeepImportNodeConsumer: {
command: chainCommands([ command: chainCommands([
`cd ${nodeConsumerTestPath}`, `cd ${nodeConsumerTestPath}`,
"node --no-warnings --experimental-modules esm-deep-import-consumer.mjs", "node --no-warnings --experimental-modules --experimental-json-modules esm-deep-import-consumer.mjs",
]), ]),
stdout: false, stdout: false,
}, },

6
package.json
View File

@ -66,7 +66,7 @@
"imports-loader": "^3.0.0", "imports-loader": "^3.0.0",
"mini-css-extract-plugin": "1.3.7", "mini-css-extract-plugin": "1.3.7",
"nightwatch": "^1.7.8", "nightwatch": "^1.7.8",
"node-sass": "^5.0.0", "node-sass": "^6.0.0",
"postcss": "^8.3.6", "postcss": "^8.3.6",
"postcss-css-variables": "^0.18.0", "postcss-css-variables": "^0.18.0",
"postcss-import": "^14.0.2", "postcss-import": "^14.0.2",
@ -169,13 +169,13 @@
"start": "npx grunt dev", "start": "npx grunt dev",
"build": "npx grunt prod", "build": "npx grunt prod",
"repl": "node src/node/repl.js", "repl": "node src/node/repl.js",
"test": "npx grunt configTests && node --experimental-modules --no-warnings --no-deprecation tests/node/index.mjs && node --experimental-modules --no-warnings --no-deprecation tests/operations/index.mjs", "test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation tests/operations/index.mjs",
"test-node-consumer": "npx grunt testnodeconsumer", "test-node-consumer": "npx grunt testnodeconsumer",
"testui": "npx grunt testui", "testui": "npx grunt testui",
"testuidev": "npx nightwatch --env=dev", "testuidev": "npx nightwatch --env=dev",
"lint": "npx grunt lint", "lint": "npx grunt lint",
"postinstall": "npx grunt exec:fixCryptoApiImports", "postinstall": "npx grunt exec:fixCryptoApiImports",
"newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs", "newop": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newOperation.mjs",
"getheapsize": "node -e 'console.log(`node heap limit = ${require(\"v8\").getHeapStatistics().heap_size_limit / (1024 * 1024)} Mb`)'", "getheapsize": "node -e 'console.log(`node heap limit = ${require(\"v8\").getHeapStatistics().heap_size_limit / (1024 * 1024)} Mb`)'",
"setheapsize": "export NODE_OPTIONS=--max_old_space_size=2048" "setheapsize": "export NODE_OPTIONS=--max_old_space_size=2048"
} }

2
src/core/errors/index.mjs
View File

@ -1,6 +1,6 @@
import OperationError from "./OperationError.mjs"; import OperationError from "./OperationError.mjs";
import DishError from "./DishError.mjs"; import DishError from "./DishError.mjs";
import ExcludedOperationError from "./ExcludedOperationError"; import ExcludedOperationError from "./ExcludedOperationError.mjs";
export { export {
OperationError, OperationError,

4
src/node/config/scripts/generateNodeIndex.mjs
View File

@ -41,7 +41,7 @@ let code = `/**
import NodeDish from "./NodeDish.mjs"; import NodeDish from "./NodeDish.mjs";
import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs"; import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs";
import File from "./File.mjs"; import File from "./File.mjs";
import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index"; import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index.mjs";
import { import {
// import as core_ to avoid name clashes after wrap. // import as core_ to avoid name clashes after wrap.
`; `;
@ -52,7 +52,7 @@ includedOperations.forEach((op) => {
}); });
code +=` code +=`
} from "../core/operations/index"; } from "../core/operations/index.mjs";
global.File = File; global.File = File;

2
tests/node/tests/operations.mjs
View File

@ -32,7 +32,7 @@ import {
CSSMinify, CSSMinify,
toBase64, toBase64,
toHex toHex
} from "../../../src/node/index"; } from "../../../src/node/index.mjs";
import chef from "../../../src/node/index.mjs"; import chef from "../../../src/node/index.mjs";
import TestRegister from "../../lib/TestRegister.mjs"; import TestRegister from "../../lib/TestRegister.mjs";
import File from "../../../src/node/File.mjs"; import File from "../../../src/node/File.mjs";

2
tests/operations/tests/AvroToJSON.mjs
View File

@ -6,7 +6,7 @@
* @license Apache-2.0 * @license Apache-2.0
*/ */
import TestRegister from "../../lib/TestRegister"; import TestRegister from "../../lib/TestRegister.mjs";
TestRegister.addTests([ TestRegister.addTests([
{ {

4
tests/operations/tests/BaconCipher.mjs
View File

@ -5,8 +5,8 @@
* @copyright Karsten Silkenbäumer 2019 * @copyright Karsten Silkenbäumer 2019
* @license Apache-2.0 * @license Apache-2.0
*/ */
import TestRegister from "../../lib/TestRegister"; import TestRegister from "../../lib/TestRegister.mjs";
import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon"; import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon.mjs";
const alphabets = Object.keys(BACON_ALPHABETS); const alphabets = Object.keys(BACON_ALPHABETS);
const translations = BACON_TRANSLATIONS; const translations = BACON_TRANSLATIONS;