From aa8d105e141f2183a1447a79e47a2d868dde9110 Mon Sep 17 00:00:00 2001 From: tobspr Date: Thu, 3 Feb 2022 20:26:29 +0100 Subject: [PATCH] Revert being able to override exports since it breaks in prod --- gulp/webpack.config.js | 3 --- gulp/webpack.production.config.js | 3 --- src/js/mods/modloader.js | 5 ++--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gulp/webpack.config.js b/gulp/webpack.config.js index 3c07d7cc..7db0bf0b 100644 --- a/gulp/webpack.config.js +++ b/gulp/webpack.config.js @@ -93,9 +93,6 @@ module.exports = ({ watch = false, standalone = false, chineseVersion = false, w end: "typehints:end", }, }, - { - loader: path.resolve(__dirname, "mod.js"), - }, ], }, { diff --git a/gulp/webpack.production.config.js b/gulp/webpack.production.config.js index 567ca38c..fdd477b9 100644 --- a/gulp/webpack.production.config.js +++ b/gulp/webpack.production.config.js @@ -230,9 +230,6 @@ module.exports = ({ { pattern: /globalConfig\.debug/g, replacement: () => "''" }, ], }), - { - loader: path.resolve(__dirname, "mod.js"), - }, ], }, { diff --git a/src/js/mods/modloader.js b/src/js/mods/modloader.js index 356b7d6b..daf0766e 100644 --- a/src/js/mods/modloader.js +++ b/src/js/mods/modloader.js @@ -112,8 +112,7 @@ export class ModLoader { // @ts-ignore const module = modules(key); for (const member in module) { - if (member === "default" || member === "$s") { - // Setter + if (member === "default") { continue; } if (exports[member]) { @@ -125,7 +124,7 @@ export class ModLoader { return module[member]; }, set(v) { - module["$s"](member, v); + throw new Error("Overriding the shapez exports is currently not possible"); }, }); }