瀏覽代碼

Merge branch 'nodejs16' of https://github.com/john19696/CyberChef into nodejs16

John L 3 年之前
父節點
當前提交
2e23a33dfc
共有 2 個文件被更改,包括 10 次插入8 次删除
  1. 1 1
      .nvmrc
  2. 9 7
      Gruntfile.js

+ 1 - 1
.nvmrc

@@ -1 +1 @@
-lts/dubnium
+lts/gallium

+ 9 - 7
Gruntfile.js

@@ -6,6 +6,8 @@ const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPl
 const glob = require("glob");
 const glob = require("glob");
 const path = require("path");
 const path = require("path");
 
 
+const nodeFlags = "--experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings --no-deprecation";
+
 /**
 /**
  * Grunt configuration for building the app in various formats.
  * Grunt configuration for building the app in various formats.
  *
  *
@@ -349,15 +351,15 @@ module.exports = function (grunt) {
                 command: "git gc --prune=now --aggressive"
                 command: "git gc --prune=now --aggressive"
             },
             },
             sitemap: {
             sitemap: {
-                command: "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml",
+                command: `node ${nodeFlags} 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 --experimental-json-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/generateConfig.mjs",
+                    `node ${nodeFlags} src/core/config/scripts/generateOpsIndex.mjs`,
+                    `node ${nodeFlags} src/core/config/scripts/generateConfig.mjs`,
                     "echo '--- Config scripts finished. ---\n'"
                     "echo '--- Config scripts finished. ---\n'"
                 ]),
                 ]),
                 sync: true
                 sync: true
@@ -365,7 +367,7 @@ module.exports = function (grunt) {
             generateNodeIndex: {
             generateNodeIndex: {
                 command: chainCommands([
                 command: chainCommands([
                     "echo '\n--- Regenerating node index ---'",
                     "echo '\n--- Regenerating node index ---'",
-                    "node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs",
+                    `node ${nodeFlags} src/node/config/scripts/generateNodeIndex.mjs`,
                     "echo '--- Node index generated. ---\n'"
                     "echo '--- Node index generated. ---\n'"
                 ]),
                 ]),
                 sync: true
                 sync: true
@@ -393,21 +395,21 @@ module.exports = function (grunt) {
             testCJSNodeConsumer: {
             testCJSNodeConsumer: {
                 command: chainCommands([
                 command: chainCommands([
                     `cd ${nodeConsumerTestPath}`,
                     `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings cjs-consumer.js",
+                    `node ${nodeFlags} cjs-consumer.js`,
                 ]),
                 ]),
                 stdout: false,
                 stdout: false,
             },
             },
             testESMNodeConsumer: {
             testESMNodeConsumer: {
                 command: chainCommands([
                 command: chainCommands([
                     `cd ${nodeConsumerTestPath}`,
                     `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings --experimental-modules --experimental-json-modules esm-consumer.mjs",
+                    `node ${nodeFlags} esm-consumer.mjs`,
                 ]),
                 ]),
                 stdout: false,
                 stdout: false,
             },
             },
             testESMDeepImportNodeConsumer: {
             testESMDeepImportNodeConsumer: {
                 command: chainCommands([
                 command: chainCommands([
                     `cd ${nodeConsumerTestPath}`,
                     `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings --experimental-modules --experimental-json-modules esm-deep-import-consumer.mjs",
+                    `node ${nodeFlags} esm-deep-import-consumer.mjs`,
                 ]),
                 ]),
                 stdout: false,
                 stdout: false,
             },
             },