Refactor codebase for returning script from main module

ImAvafe · Jun 8, 2024 · 3c476fe · 3c476fe
1 parent d2ab586
commit 3c476fe
Show file tree

Hide file tree

Showing 48 changed files with 114 additions and 114 deletions.
diff --git a/src/Components/AutoScaleFrame.lua b/src/Components/AutoScaleFrame.lua
@@ -1,8 +1,8 @@
 local Workspace = game:GetService("Workspace")
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 
 local Value = Fusion.Value
 local Computed = Fusion.Computed

diff --git a/src/Components/Avatar.lua b/src/Components/Avatar.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
 local Colors = require(OnyxUI.Utils.Colors)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Children = Fusion.Children

diff --git a/src/Components/Avatar.story.lua b/src/Components/Avatar.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local Colors = require(OnyxUI.Utils.Colors)
 

diff --git a/src/Components/Badge.lua b/src/Components/Badge.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local ColorUtils = require(OnyxUI.Packages.ColorUtils)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local ColorUtils = require(OnyxUI.Parent.ColorUtils)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Children = Fusion.Children

diff --git a/src/Components/Badge.story.lua b/src/Components/Badge.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local Colors = require(OnyxUI.Utils.Colors)
 

diff --git a/src/Components/Base.lua b/src/Components/Base.lua
@@ -1,6 +1,6 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local EnsureValue = require(script.Parent.Parent.Utils.EnsureValue)
 local Themer = require(script.Parent.Parent.Utils.Themer)
 local GetValue = require(OnyxUI.Utils.GetValue)

diff --git a/src/Components/Base.story.lua b/src/Components/Base.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local Children = Fusion.Children

diff --git a/src/Components/BaseButton.lua b/src/Components/BaseButton.lua
@@ -1,10 +1,10 @@
 local SoundService = game:GetService("SoundService")
 
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local OnEvent = Fusion.OnEvent

diff --git a/src/Components/Button.lua b/src/Components/Button.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
-local ColorUtils = require(OnyxUI.Packages.ColorUtils)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
+local ColorUtils = require(OnyxUI.Parent.ColorUtils)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Children = Fusion.Children

diff --git a/src/Components/Button.story.lua b/src/Components/Button.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local New = Fusion.New

diff --git a/src/Components/CanvasGroup.lua b/src/Components/CanvasGroup.lua
@@ -1,6 +1,6 @@
-local OnyxUI = require(script.Parent.Parent)
+local OnyxUI = script.Parent.Parent
 local CombineProps = require(OnyxUI.Utils.CombineProps)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 
 local Base = require(script.Parent.Base)
 

diff --git a/src/Components/Card.lua b/src/Components/Card.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 

diff --git a/src/Components/Card.story.lua b/src/Components/Card.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local New = Fusion.New

diff --git a/src/Components/Checkbox.lua b/src/Components/Checkbox.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local ColorUtils = require(OnyxUI.Packages.ColorUtils)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local ColorUtils = require(OnyxUI.Parent.ColorUtils)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 
 local Children = Fusion.Children
 local Computed = Fusion.Computed

diff --git a/src/Components/Checkbox.story.lua b/src/Components/Checkbox.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local Colors = require(OnyxUI.Utils.Colors)
 

diff --git a/src/Components/Divider.lua b/src/Components/Divider.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 
 local Children = Fusion.Children
 local Computed = Fusion.Computed

diff --git a/src/Components/Divider.story.lua b/src/Components/Divider.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local New = Fusion.New
 local Children = Fusion.Children

diff --git a/src/Components/Frame.lua b/src/Components/Frame.lua
@@ -1,4 +1,4 @@
-local OnyxUI = require(script.Parent.Parent)
+local OnyxUI = script.Parent.Parent
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Base = require(script.Parent.Base)

diff --git a/src/Components/Icon.lua b/src/Components/Icon.lua
@@ -1,6 +1,6 @@
-local OnyxUI = require(script.Parent.Parent)
+local OnyxUI = script.Parent.Parent
 local CombineProps = require(script.Parent.Parent.Utils.CombineProps)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local Computed = Fusion.Computed
 

diff --git a/src/Components/IconButton.lua b/src/Components/IconButton.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 
 local Computed = Fusion.Computed
 

diff --git a/src/Components/IconButton.story.lua b/src/Components/IconButton.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local Colors = require(OnyxUI.Utils.Colors)
 

diff --git a/src/Components/Image.lua b/src/Components/Image.lua
@@ -1,7 +1,7 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(script.Parent.Parent.Utils.CombineProps)
 
 local Computed = Fusion.Computed

diff --git a/src/Components/Image.story.lua b/src/Components/Image.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local New = Fusion.New

diff --git a/src/Components/MenuFrame.lua b/src/Components/MenuFrame.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 

diff --git a/src/Components/MenuFrame.story.lua b/src/Components/MenuFrame.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local Children = Fusion.Children

diff --git a/src/Components/NumberSpinner.story.lua b/src/Components/NumberSpinner.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local New = Fusion.New
 local Children = Fusion.Children

diff --git a/src/Components/NumberSpinner/init.lua b/src/Components/NumberSpinner/init.lua
@@ -1,9 +1,9 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local NumberSpinner = require(script.NumberSpinner)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Cleanup = Fusion.Cleanup

diff --git a/src/Components/ProgressBar.lua b/src/Components/ProgressBar.lua
@@ -1,8 +1,8 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Children = Fusion.Children

diff --git a/src/Components/ProgressBar.story.lua b/src/Components/ProgressBar.story.lua
@@ -1,6 +1,6 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
-local ColorUtils = require(OnyxUI.Packages.ColorUtils)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
+local ColorUtils = require(OnyxUI.Parent.ColorUtils)
 
 local Children = Fusion.Children
 local Value = Fusion.Value

diff --git a/src/Components/ScrollingFrame.lua b/src/Components/ScrollingFrame.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)

diff --git a/src/Components/SettingToggle.lua b/src/Components/SettingToggle.lua
@@ -1,6 +1,6 @@
-local OnyxUI = require(script.Parent.Parent)
+local OnyxUI = script.Parent.Parent
 local Themer = require(script.Parent.Parent.Utils.Themer)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 
 local Children = Fusion.Children

diff --git a/src/Components/SwitchGroup.lua b/src/Components/SwitchGroup.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)

diff --git a/src/Components/SwitchInput.lua b/src/Components/SwitchInput.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)

diff --git a/src/Components/SwitchInput.story.lua b/src/Components/SwitchInput.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local New = Fusion.New

diff --git a/src/Components/Text.lua b/src/Components/Text.lua
@@ -1,13 +1,13 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local Computed = Fusion.Computed
 local Hydrate = Fusion.Hydrate
 
 local Base = require(script.Parent.Base)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(script.Parent.Parent.Utils.CombineProps)
 
 export type Props = Base.Props & {

diff --git a/src/Components/TextInput.lua b/src/Components/TextInput.lua
@@ -1,7 +1,7 @@
 local SoundService = game:GetService("SoundService")
 
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
 local Modifier = require(OnyxUI.Utils.Modifier)

diff --git a/src/Components/TextInput.story.lua b/src/Components/TextInput.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local Children = Fusion.Children

diff --git a/src/Components/TitleBar.lua b/src/Components/TitleBar.lua
@@ -1,8 +1,8 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local EnsureValue = require(OnyxUI.Utils.EnsureValue)
 local Themer = require(OnyxUI.Utils.Themer)
-local PubTypes = require(script.Parent.Parent.PubTypes)
+local PubTypes = require(OnyxUI.Utils.PubTypes)
 local CombineProps = require(OnyxUI.Utils.CombineProps)
 
 local Children = Fusion.Children

diff --git a/src/Components/TitleBar.story.lua b/src/Components/TitleBar.story.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local New = Fusion.New

diff --git a/src/Examples/SettingsMenu.lua b/src/Examples/SettingsMenu.lua
@@ -1,5 +1,5 @@
-local OnyxUI = require(script.Parent.Parent)
-local Fusion = require(OnyxUI.Packages.Fusion)
+local OnyxUI = script.Parent.Parent
+local Fusion = require(OnyxUI.Parent.Fusion)
 local Themer = require(OnyxUI.Utils.Themer)
 
 local Children = Fusion.Children