From 9a471d2a266fcc16b29c483b259bc85caa7e9ce6 Mon Sep 17 00:00:00 2001
From: d98762625 <d98762625@gmail.com>
Date: Fri, 25 May 2018 12:20:56 +0100
Subject: [PATCH] remove extra preamble for grunt task. improve index script

---
 Gruntfile.js                                  | 10 ++--------
 src/core/config/scripts/generateNodeIndex.mjs |  3 ++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index d1488182..0bf5ff00 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,7 +26,7 @@ module.exports = function (grunt) {
 
     grunt.registerTask("node",
         "Compiles CyberChef into a single NodeJS module.",
-        ["clean:node", "clean:config", "exec:generateConfig", "exec:generateNodeIndex", "webpack:node", "chmod:build"]);
+        ["clean:node", "clean:config", "exec:generateConfig", "webpack:node", "chmod:build"]);
 
     grunt.registerTask("test",
         "A task which runs all the tests in test/tests.",
@@ -382,6 +382,7 @@ module.exports = function (grunt) {
                     "mkdir -p src/core/config/modules",
                     "echo 'export default {};\n' > src/core/config/modules/OpModules.mjs",
                     "echo '[]\n' > src/core/config/OperationConfig.json",
+                    "node --experimental-modules src/core/config/scripts/generateNodeIndex.mjs",
                     "node --experimental-modules src/core/config/scripts/generateOpsIndex.mjs",
                     "node --experimental-modules src/core/config/scripts/generateConfig.mjs",
                     "echo '--- Config scripts finished. ---\n'"
@@ -393,14 +394,7 @@ module.exports = function (grunt) {
                     "mkdir -p src/core/config/modules",
                     "echo 'export default {};\n' > src/core/config/modules/OpModules.mjs",
                     "echo '[]\n' > src/core/config/OperationConfig.json",
-                    // Magic and Arithmetic libs 'mocked' for when called with wrap()
-                    "cp src/core/lib/Magic.mjs src/core/lib/Magic2.mjs",
-                    "cp src/core/lib/Arithmetic.mjs src/core/lib/Arithmetic2.mjs",
-                    "echo 'export default {};\n' > src/core/lib/Magic.mjs",
-                    "echo 'const div = () => 2;\n const createNumArray = () => 2;\n const mean = () => 2;\n const median = () => 2;\n const multi = () => 2;\n const stdDev = () => 2;\n const sub = () => 2;\n const sum = () => 2;\n export { div, createNumArray, mean, median, multi, stdDev, sub, sum };\n export default {};\n' > src/core/lib/Arithmetic.mjs",
                     "node --experimental-modules src/core/config/scripts/generateNodeIndex.mjs",
-                    "mv src/core/lib/Magic2.mjs src/core/lib/Magic.mjs",
-                    "mv src/core/lib/Arithmetic2.mjs src/core/lib/Arithmetic.mjs",
                     "echo '--- Node index finished. ---\n'"
                 ].join(";"),
             },
diff --git a/src/core/config/scripts/generateNodeIndex.mjs b/src/core/config/scripts/generateNodeIndex.mjs
index 37386260..00b2470b 100644
--- a/src/core/config/scripts/generateNodeIndex.mjs
+++ b/src/core/config/scripts/generateNodeIndex.mjs
@@ -33,6 +33,7 @@ let code = `/**
 * @license Apache-2.0
 */
 
+import "babel-polyfill";
 import { wrap } from "./apiUtils";
 import {
 `;
@@ -43,7 +44,7 @@ Object.keys(operations).forEach((op) => {
 });
 
 code +=`
-} from "../node/operations/index";
+} from "../core/operations/index";
 
 // Define global environment functions
 global.ENVIRONMENT_IS_WORKER = function() {