From 2cc0a67a9ab4f0ab9e74d291ead6918c59fa267c Mon Sep 17 00:00:00 2001
From: Der_Googler <54764558+DerGoogler@users.noreply.github.com>
Date: Sat, 14 Sep 2024 16:44:30 +0200
Subject: [PATCH] [webpack] test5

---
 package.json                                  |  4 +--
 .../components/ModConfView/libs.ts            | 30 ++++++++++++-------
 src/native/IsolatedEval/index.ts              |  8 +++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 78912e9d..8ed588e7 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
     "application_id": "com.dergoogler.mmrl",
     "min_sdk": 26,
     "target_sdk": 34,
-    "version_name": "3.24.27",
-    "version_code": 32427,
+    "version_name": "3.24.28",
+    "version_code": 32428,
     "verified_hosts": [
       [
         "mmrl",
diff --git a/src/activitys/ModConfActivity/components/ModConfView/libs.ts b/src/activitys/ModConfActivity/components/ModConfView/libs.ts
index cb32d3a8..31b009c7 100644
--- a/src/activitys/ModConfActivity/components/ModConfView/libs.ts
+++ b/src/activitys/ModConfActivity/components/ModConfView/libs.ts
@@ -21,7 +21,6 @@ import { useConfirm } from "material-ui-confirm";
 import { Markup } from "@Components/Markdown";
 import { DialogEditTextListItem } from "@Components/DialogEditTextListItem";
 import { SearchActivity } from "@Activitys/SearchActivity";
-import React from "react";
 import { withRequireNewVersion } from "../../../../hoc/withRequireNewVersion";
 import { CodeBlock } from "@Components/CodeBlock";
 import { VerifiedIcon } from "@Components/icons/VerifiedIcon";
@@ -29,8 +28,19 @@ import { IsolatedFunctionBlockError } from "@Native/IsolatedEval/IsolatedFunctio
 import { Terminal } from "@Native/Terminal";
 import { useFetch } from "@Hooks/useFetch";
 
+// Libaries
+import * as React from "react";
+import * as MUI from "@mui/material";
+import * as ICONS_MUI from "@mui/icons-material";
+import * as LAB_MUI from "@mui/lab";
+import * as FlatListReact from "flatlist-react";
+import OnsenUI from "onsenui";
+import * as DefaultComposer from "default-composer";
+import * as UseHooksTS from "usehooks-ts";
+import * as ModFS from "modfs";
+
 export const InternalReact = {
-  ...require("react"),
+  ...React,
   createElement(type: any, props: any, ...children: any[]) {
     switch (type) {
       // prevents webview url change
@@ -47,17 +57,17 @@ export const InternalReact = {
 export const libraries = {
   react: InternalReact,
 
-  "@mui/material": require("@mui/material"),
+  "@mui/material": MUI,
 
-  "@mui/lab": require("@mui/lab"),
+  "@mui/lab": LAB_MUI,
 
-  "@mui/icons-material": require("@mui/icons-material"),
+  "@mui/icons-material": ICONS_MUI,
 
   "@mmrl/terminal": os.isAndroid ? Terminal : {},
 
-  "flatlist-react": require("flatlist-react").default,
+  "flatlist-react": FlatListReact,
 
-  onsenui: require("onsenui").default,
+  onsenui: OnsenUI,
 
   "@mmrl/activity": {
     SearchActivity: SearchActivity,
@@ -106,10 +116,10 @@ export const libraries = {
     ConfigProvider: ConfigProvider,
     StringsProvider: StringsProvider,
   },
-  modfs: require("modfs"),
-  "default-composer": require("default-composer"),
+  modfs: ModFS,
+  "default-composer": DefaultComposer,
   "usehooks-ts": {
-    ...require("usehooks-ts"),
+    ...UseHooksTS,
     useLocalStorage: undefined,
     useScript: undefined,
     useSessionStorage: undefined,
diff --git a/src/native/IsolatedEval/index.ts b/src/native/IsolatedEval/index.ts
index 4bc078b7..b1e2643e 100644
--- a/src/native/IsolatedEval/index.ts
+++ b/src/native/IsolatedEval/index.ts
@@ -24,6 +24,9 @@ import { IsolatedFunctionBlockError } from "./IsolatedFunctionBlockError";
 import { InternalReact } from "@Activitys/ModConfActivity/components/ModConfView/libs";
 import ModFS from "modfs";
 
+import YAML from "yaml";
+import INI from "ini";
+
 type IsoModule = {
   exports: {
     default?: any;
@@ -45,8 +48,8 @@ class IsolatedEval<T = any> {
   private readonly _globals = {
     ...Sandbox.SAFE_GLOBALS,
     JSON: JSON,
-    YAML: require("yaml"),
-    INI: require("ini"),
+    YAML: YAML,
+    INI: INI,
     console: console,
     document: new IsoDocument(),
     Toast: Toast,
@@ -170,6 +173,7 @@ class IsolatedEval<T = any> {
 
   public require(modulePath: string) {
     // Check if the module is a core module
+    console.log(this.libraries[modulePath])
     if (this.libraries[modulePath]) {
       return this.libraries[modulePath];
     }