From 36762dcbab77d12d3687eff8565dfad342a1cf49 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 28 Sep 2019 15:09:07 -0700 Subject: [PATCH] Use common JS for stuff imported by eslint --- modern/src/maki-interpreter/objectData/stdPatched.js | 4 ++-- modern/src/maki-interpreter/objects.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modern/src/maki-interpreter/objectData/stdPatched.js b/modern/src/maki-interpreter/objectData/stdPatched.js index be78e85a..bec866ad 100644 --- a/modern/src/maki-interpreter/objectData/stdPatched.js +++ b/modern/src/maki-interpreter/objectData/stdPatched.js @@ -1,4 +1,4 @@ -import std from "./std.json"; +const std = require("./std.json"); // Between myself and the author of the decompiler, a number of manual tweaks // have been made to our current object definitions. This function recreates @@ -30,4 +30,4 @@ std.B4DCCFFF81FE4bcc961B720FD5BE0FFF.functions.push({ result: "Int", }); -export default std; +module.exports = std; diff --git a/modern/src/maki-interpreter/objects.js b/modern/src/maki-interpreter/objects.js index 2a71171b..dc4e986a 100644 --- a/modern/src/maki-interpreter/objects.js +++ b/modern/src/maki-interpreter/objects.js @@ -1,6 +1,6 @@ -import stdPatched from "./objectData/stdPatched"; -import pldir from "./objectData/pldir.json"; -import config from "./objectData/config.json"; +const stdPatched = require("./objectData/stdPatched"); +const pldir = require("./objectData/pldir.json"); +const config = require("./objectData/config.json"); const objects = { ...stdPatched, ...pldir, ...config };