testing

src/equicordplugins/commandPalette/registry.tsx

@@ -6,7 +6,7 @@
 
 import { DataStore } from "@api/index";
 import { isPluginEnabled, plugins, startPlugin, stopPlugin } from "@api/PluginManager";
-import { Settings, SettingsStore } from "@api/Settings";
+import { SettingsStore } from "@api/Settings";
 import { getUserSettingLazy } from "@api/UserSettings";
 import { openPluginModal } from "@components/settings/tabs";
 import { toggleEnabled } from "@equicordplugins/equicordHelper/utils";
@@ -18,6 +18,7 @@ import { Guild } from "@vencord/discord-types";
 import { findByPropsLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
 import { Alerts, ChannelActionCreators, ChannelRouter, ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, IconUtils, MediaEngineStore, MessageStore, NavigationRouter, React, ReadStateStore, ReadStateUtils, SelectedChannelStore, SelectedGuildStore, SettingsRouter, StreamerModeStore, Toasts, useEffect, UserStore, VoiceActions } from "@webpack/common";
 import type { FC, ReactElement, ReactNode } from "react";
+import { Settings } from "Vencord";
 
 import commandPalette from ".";
 import {

src/equicordplugins/messageLoggerEnhanced/settings.tsx

@@ -4,11 +4,12 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, Settings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { Button } from "@components/Button";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { OptionType } from "@utils/types";
 import { Alerts, useState } from "@webpack/common";
+import { Settings } from "Vencord";
 
 import { clearLogs, Native } from ".";
 import { ImageCacheDir, LogsDir } from "./components/FolderSelectInput";

src/plugins/callTimer/index.tsx

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, migratePluginToSettings, migrateSettingsFromPlugin } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs, EquicordDevs } from "@utils/constants";
 import { useTimer } from "@utils/react";
@@ -106,8 +106,6 @@ let myLastChannelId: string | undefined;
 // Allow user updates on discord first load
 let runOneTime = true;
 
-migratePluginToSettings(false, "CallTimer", "AllCallTimers", "allCallTimers");
-migrateSettingsFromPlugin("CallTimer", "AllCallTimers", "showWithoutHover", "showRoleColor", "trackSelf", "showSeconds", "watchLargeGuilds");
 export default definePlugin({
     name: "CallTimer",
     description: "Add call timers for all users in voice channels and in the connection status.",

src/plugins/devCompanion.dev/initWs.tsx

@@ -5,7 +5,6 @@
  */
 
 import { popNotice, showNotice } from "@api/Notices";
-import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { loadLazyChunks } from "@debug/loadLazyChunks";
 import { reporterData } from "@debug/reporterData";
@@ -13,6 +12,7 @@ import { getIntlMessageFromHash } from "@utils/discord";
 import { canonicalizeMatch, canonicalizeReplace } from "@utils/patches";
 import { filters, findAll, search, wreq } from "@webpack";
 import { React, Toasts, useState } from "@webpack/common";
+import { Settings } from "Vencord";
 
 import { CLIENT_VERSION, logger, PORT, settings } from ".";
 import { Recieve } from "./types";

src/plugins/devCompanion.dev/util.tsx

@@ -10,8 +10,8 @@ import { Settings } from "@api/Settings";
 import { canonicalizeMatch } from "@utils/patches";
 import { CodeFilter, stringMatches, wreq } from "@webpack";
 import { Toasts } from "@webpack/common";
+import { WebpackPatcher } from "Vencord";
 
-import { WebpackPatcher } from "../../Vencord";
 import { logger, settings as companionSettings } from ".";
 import { FindNode } from "./types/recieve";
 

src/plugins/fixYoutubeEmbeds.desktop/native.ts

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { RendererSettings } from "@main/settings";
 import { app } from "electron";
+import { RendererSettings } from "main/settings";
 
 app.on("browser-window-created", (_, win) => {
     win.webContents.on("frame-created", (_, { frame }) => {

tsconfig.json

@@ -19,49 +19,51 @@
         "noImplicitAny": false,
         "target": "ESNEXT",
         "jsx": "preserve",
-        "baseUrl": "./src/",
         "paths": {
             "@main/*": [
-                "./main/*"
+                "./src/main/*"
             ],
             "@api/*": [
-                "./api/*"
+                "./src/api/*"
             ],
             "@components/*": [
-                "./components/*"
+                "./src/components/*"
             ],
             "@debug/*": [
-                "./debug/*"
+                "./src/debug/*"
             ],
             "@utils/*": [
-                "./utils/*"
+                "./src/utils/*"
             ],
             "@plugins/*": [
-                "./plugins/*"
+                "./src/plugins/*"
             ],
             "@shared/*": [
-                "./shared/*"
+                "./src/shared/*"
             ],
             "@webpack/common": [
-                "./webpack/common"
+                "./src/webpack/common"
             ],
             "@webpack/common/*": [
-                "./webpack/common/*"
+                "./src/webpack/common/*"
             ],
             "@webpack": [
-                "./webpack/webpack"
+                "./src/webpack/webpack"
             ],
             "@webpack/patcher": [
-                "./webpack/patchWebpack"
+                "./src/webpack/patchWebpack"
             ],
             "@webpack/wreq.d": [
-                "./webpack/wreq.d"
+                "./src/webpack/wreq.d"
             ],
             "@webpack/types": [
-                "./webpack/types"
+                "./src/webpack/types"
             ],
             "@equicordplugins/*": [
-                "./equicordplugins/*"
+                "./src/equicordplugins/*"
+            ],
+            "*": [
+                "./src/*"
             ]
         },
         "plugins": [