Skip to content

Commit e43e010

Browse files
committed
Merge branch 'nodejs16' of https://github.com/john19696/CyberChef into john19696-nodejs16
2 parents 2a5cee0 + 2e23a33 commit e43e010

File tree

12 files changed

+18641
-246
lines changed

12 files changed

+18641
-246
lines changed

.github/workflows/master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set node version
1515
uses: actions/setup-node@v1
1616
with:
17-
node-version: '10.x'
17+
node-version: '16.x'
1818

1919
- name: Install
2020
run: |

.github/workflows/pull_requests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set node version
1414
uses: actions/setup-node@v1
1515
with:
16-
node-version: '10.x'
16+
node-version: '16.x'
1717

1818
- name: Install
1919
run: |

.github/workflows/releases.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set node version
1515
uses: actions/setup-node@v1
1616
with:
17-
node-version: '10.x'
17+
node-version: '16.x'
1818

1919
- name: Install
2020
run: |

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/dubnium
1+
lts/gallium

Gruntfile.js

+9-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPl
66
const glob = require("glob");
77
const path = require("path");
88

9+
const nodeFlags = "--experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings --no-deprecation";
10+
911
/**
1012
* Grunt configuration for building the app in various formats.
1113
*
@@ -349,23 +351,23 @@ module.exports = function (grunt) {
349351
command: "git gc --prune=now --aggressive"
350352
},
351353
sitemap: {
352-
command: "node --experimental-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml",
354+
command: `node ${nodeFlags} src/web/static/sitemap.mjs > build/prod/sitemap.xml`,
353355
sync: true
354356
},
355357
generateConfig: {
356358
command: chainCommands([
357359
"echo '\n--- Regenerating config files. ---'",
358360
"echo [] > src/core/config/OperationConfig.json",
359-
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs",
360-
"node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs",
361+
`node ${nodeFlags} src/core/config/scripts/generateOpsIndex.mjs`,
362+
`node ${nodeFlags} src/core/config/scripts/generateConfig.mjs`,
361363
"echo '--- Config scripts finished. ---\n'"
362364
]),
363365
sync: true
364366
},
365367
generateNodeIndex: {
366368
command: chainCommands([
367369
"echo '\n--- Regenerating node index ---'",
368-
"node --experimental-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs",
370+
`node ${nodeFlags} src/node/config/scripts/generateNodeIndex.mjs`,
369371
"echo '--- Node index generated. ---\n'"
370372
]),
371373
sync: true
@@ -393,21 +395,21 @@ module.exports = function (grunt) {
393395
testCJSNodeConsumer: {
394396
command: chainCommands([
395397
`cd ${nodeConsumerTestPath}`,
396-
"node --no-warnings cjs-consumer.js",
398+
`node ${nodeFlags} cjs-consumer.js`,
397399
]),
398400
stdout: false,
399401
},
400402
testESMNodeConsumer: {
401403
command: chainCommands([
402404
`cd ${nodeConsumerTestPath}`,
403-
"node --no-warnings --experimental-modules esm-consumer.mjs",
405+
`node ${nodeFlags} esm-consumer.mjs`,
404406
]),
405407
stdout: false,
406408
},
407409
testESMDeepImportNodeConsumer: {
408410
command: chainCommands([
409411
`cd ${nodeConsumerTestPath}`,
410-
"node --no-warnings --experimental-modules esm-deep-import-consumer.mjs",
412+
`node ${nodeFlags} esm-deep-import-consumer.mjs`,
411413
]),
412414
stdout: false,
413415
},

0 commit comments

Comments
 (0)