Switch git submodules to Wally packages (#584)

* Switch git submodules to Wally packages * Update build snapshot * Add wally to foreman and use latest versions * Install packages in CI runners * Fix indents * Install packages in the correct directory * Install packages in correct dir of release action too * Remove submodules from ci checkout * Remove submodules from release checkout * Update selene with latest fix * Fix whitespace Co-authored-by: Lucien Greathouse <me@lpghatguy.com>
2026-04-21 21:25:16 +00:00 · 2022-08-03 15:36:58 -07:00
parent 565c12405e
commit e864cf0c7d
63 changed files with 271 additions and 190 deletions
--- a/plugin/default.project.json
+++ b/plugin/default.project.json
@@ -1,33 +1,25 @@
 {
-  "name": "Rojo",
-  "tree": {
-    "$className": "Folder",
-    "Plugin": {
-      "$path": "src"
-    },
-    "Log": {
-      "$path": "log"
-    },
-    "Http": {
-      "$path": "http"
-    },
-    "Fmt": {
-      "$path": "fmt"
-    },
-    "RbxDom": {
-      "$path": "rbx_dom_lua"
-    },
-    "Roact": {
-      "$path": "modules/roact/src"
-    },
-    "Promise": {
-      "$path": "modules/promise/lib"
-    },
-    "t": {
-      "$path": "modules/t/lib"
-    },
-    "Flipper": {
-      "$path": "modules/flipper/src"
-    }
-  }
-}
+	"name": "Rojo",
+	"tree": {
+		"$className": "Folder",
+		"Plugin": {
+			"$path": "src"
+		},
+		"Packages": {
+			"$path": "Packages",
+
+			"Log": {
+				"$path": "log"
+			},
+			"Http": {
+				"$path": "http"
+			},
+			"Fmt": {
+				"$path": "fmt"
+			},
+			"RbxDom": {
+				"$path": "rbx_dom_lua"
+			}
+		}
+	}
+}
--- a/plugin/modules/flipper
+++ b/plugin/modules/flipper
--- a/plugin/modules/promise
+++ b/plugin/modules/promise
--- a/plugin/modules/roact
+++ b/plugin/modules/roact
--- a/plugin/modules/t
+++ b/plugin/modules/t
--- a/plugin/modules/testez
+++ b/plugin/modules/testez
--- a/plugin/run-tests.server.lua
+++ b/plugin/run-tests.server.lua
@@ -1,6 +1,6 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")

-local TestEZ = require(ReplicatedStorage.TestEZ)
+local TestEZ = require(ReplicatedStorage.Packages.TestEZ)

 local Rojo = ReplicatedStorage.Rojo

@@ -16,4 +16,4 @@ require(Rojo.Plugin.runTests)(TestEZ)

 if setDevSettings then
 	DevSettings:resetValues()
-end
+end
--- a/plugin/src/ApiContext.lua
+++ b/plugin/src/ApiContext.lua
@@ -1,6 +1,7 @@
-local Http = require(script.Parent.Parent.Http)
-local Log = require(script.Parent.Parent.Log)
-local Promise = require(script.Parent.Parent.Promise)
+local Packages = script.Parent.Parent.Packages
+local Http = require(Packages.Http)
+local Log = require(Packages.Log)
+local Promise = require(Packages.Promise)

 local Config = require(script.Parent.Config)
 local Types = require(script.Parent.Types)
@@ -85,7 +86,7 @@ local ApiContext = {}
 ApiContext.__index = ApiContext

 function ApiContext.new(baseUrl)
-	assert(type(baseUrl) == "string")
+	assert(type(baseUrl) == "string", "baseUrl must be a string")

 	local self = {
 		__baseUrl = baseUrl,
@@ -248,4 +249,4 @@ function ApiContext:open(id)
 		end)
 end

-return ApiContext
+return ApiContext
--- a/plugin/src/App/Components/BorderedContainer.lua
+++ b/plugin/src/App/Components/BorderedContainer.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -38,4 +39,4 @@ local function BorderedContainer(props)
 	end)
 end

-return BorderedContainer
+return BorderedContainer
--- a/plugin/src/App/Components/Checkbox.lua
+++ b/plugin/src/App/Components/Checkbox.lua
@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
@@ -93,4 +94,4 @@ function Checkbox:render()
 	end)
 end

-return Checkbox
+return Checkbox
--- a/plugin/src/App/Components/Header.lua
+++ b/plugin/src/App/Components/Header.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -52,4 +53,4 @@ local function Header(props)
 	end)
 end

-return Header
+return Header
--- a/plugin/src/App/Components/IconButton.lua
+++ b/plugin/src/App/Components/IconButton.lua
@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local Assets = require(Plugin.Assets)
 local bindingUtil = require(Plugin.App.bindingUtil)
@@ -76,4 +77,4 @@ function IconButton:render()
 	})
 end

-return IconButton
+return IconButton
--- a/plugin/src/App/Components/ScrollingFrame.lua
+++ b/plugin/src/App/Components/ScrollingFrame.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
@@ -39,4 +40,4 @@ local function ScrollingFrame(props)
 	end)
 end

-return ScrollingFrame
+return ScrollingFrame
--- a/plugin/src/App/Components/SlicedImage.lua
+++ b/plugin/src/App/Components/SlicedImage.lua
@@ -1,6 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local e = Roact.createElement

@@ -26,4 +27,4 @@ local function SlicedImage(props)
 	}, props[Roact.Children])
 end

-return SlicedImage
+return SlicedImage
--- a/plugin/src/App/Components/Spinner.lua
+++ b/plugin/src/App/Components/Spinner.lua
@@ -2,8 +2,9 @@ local RunService = game:GetService("RunService")

 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -63,4 +64,4 @@ function Spinner:willUnmount()
 	self.stepper:Disconnect()
 end

-return Spinner
+return Spinner
--- a/plugin/src/App/Components/Studio/StudioPluginAction.lua
+++ b/plugin/src/App/Components/Studio/StudioPluginAction.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Dictionary = require(Plugin.Dictionary)

--- a/plugin/src/App/Components/Studio/StudioPluginContext.lua
+++ b/plugin/src/App/Components/Studio/StudioPluginContext.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local StudioPluginContext = Roact.createContext(nil)

-return StudioPluginContext
+return StudioPluginContext
--- a/plugin/src/App/Components/Studio/StudioPluginGui.lua
+++ b/plugin/src/App/Components/Studio/StudioPluginGui.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Dictionary = require(Plugin.Dictionary)

@@ -81,4 +82,4 @@ local function StudioPluginGuiWrapper(props)
 	})
 end

-return StudioPluginGuiWrapper
+return StudioPluginGuiWrapper
--- a/plugin/src/App/Components/Studio/StudioToggleButton.lua
+++ b/plugin/src/App/Components/Studio/StudioToggleButton.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Dictionary = require(Plugin.Dictionary)

--- a/plugin/src/App/Components/Studio/StudioToolbar.lua
+++ b/plugin/src/App/Components/Studio/StudioToolbar.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Dictionary = require(Plugin.Dictionary)

@@ -42,4 +43,4 @@ local function StudioToolbarWrapper(props)
 	})
 end

-return StudioToolbarWrapper
+return StudioToolbarWrapper
--- a/plugin/src/App/Components/Studio/StudioToolbarContext.lua
+++ b/plugin/src/App/Components/Studio/StudioToolbarContext.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local StudioToolbarContext = Roact.createContext(nil)

-return StudioToolbarContext
+return StudioToolbarContext
--- a/plugin/src/App/Components/TextButton.lua
+++ b/plugin/src/App/Components/TextButton.lua
@@ -2,9 +2,10 @@ local TextService = game:GetService("TextService")

 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -134,4 +135,4 @@ function TextButton:render()
 	end)
 end

-return TextButton
+return TextButton
--- a/plugin/src/App/Components/TouchRipple.lua
+++ b/plugin/src/App/Components/TouchRipple.lua
@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local Assets = require(Plugin.Assets)
 local bindingUtil = require(Plugin.App.bindingUtil)
@@ -142,4 +143,4 @@ function TouchRipple:render()
 	})
 end

-return TouchRipple
+return TouchRipple
--- a/plugin/src/App/Notifications.lua
+++ b/plugin/src/App/Notifications.lua
@@ -3,9 +3,10 @@ local StudioService = game:GetService("StudioService")

 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local bindingUtil = require(script.Parent.bindingUtil)

--- a/plugin/src/App/Page.lua
+++ b/plugin/src/App/Page.lua
@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
+local Roact = require(Packages.Roact)
+local Flipper = require(Packages.Flipper)

 local Dictionary = require(Plugin.Dictionary)

@@ -67,4 +68,4 @@ function Page:didUpdate(lastProps)
 	end
 end

-return Page
+return Page
--- a/plugin/src/App/StatusPages/Connected.lua
+++ b/plugin/src/App/StatusPages/Connected.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -122,4 +123,4 @@ function ConnectedPage.getDerivedStateFromProps(props)
 	}
 end

-return ConnectedPage
+return ConnectedPage
--- a/plugin/src/App/StatusPages/Connecting.lua
+++ b/plugin/src/App/StatusPages/Connecting.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Spinner = require(Plugin.App.Components.Spinner)

@@ -17,4 +18,4 @@ function ConnectingPage:render()
 	})
 end

-return ConnectingPage
+return ConnectingPage
--- a/plugin/src/App/StatusPages/Error.lua
+++ b/plugin/src/App/StatusPages/Error.lua
@@ -2,8 +2,9 @@ local TextService = game:GetService("TextService")

 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Theme = require(Plugin.App.Theme)

@@ -150,4 +151,4 @@ function ErrorPage.getDerivedStateFromProps(props)
 	}
 end

-return ErrorPage
+return ErrorPage
--- a/plugin/src/App/StatusPages/NotConnected.lua
+++ b/plugin/src/App/StatusPages/NotConnected.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Config = require(Plugin.Config)

@@ -148,4 +149,4 @@ function NotConnectedPage:render()
 	})
 end

-return NotConnectedPage
+return NotConnectedPage
--- a/plugin/src/App/StatusPages/Settings/Setting.lua
+++ b/plugin/src/App/StatusPages/Settings/Setting.lua
@@ -2,8 +2,9 @@ local TextService = game:GetService("TextService")

 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Settings = require(Plugin.Settings)
 local Theme = require(Plugin.App.Theme)
--- a/plugin/src/App/StatusPages/Settings/init.lua
+++ b/plugin/src/App/StatusPages/Settings/init.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)

 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
--- a/plugin/src/App/Theme.lua
+++ b/plugin/src/App/Theme.lua
@@ -16,9 +16,10 @@ local function getStudio()
 end

 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Log = require(Rojo.Log)
+local Roact = require(Packages.Roact)
+local Log = require(Packages.Log)

 local strict = require(script.Parent.Parent.strict)

--- a/plugin/src/App/bindingUtil.lua
+++ b/plugin/src/App/bindingUtil.lua
@@ -1,7 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Log = require(Rojo.Log)
+local Roact = require(Packages.Roact)
+local Log = require(Packages.Log)

 local LERP_DATA_TYPES = {
 	Color3 = true,
@@ -55,4 +56,4 @@ return {
 	mapLerp = mapLerp,
 	deriveProperty = deriveProperty,
 	blendAlpha = blendAlpha,
-}
+}
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages

-local Roact = require(Rojo.Roact)
-local Log = require(Rojo.Log)
+local Roact = require(Packages.Roact)
+local Log = require(Packages.Log)

 local Assets = require(Plugin.Assets)
 local Version = require(Plugin.Version)
--- a/plugin/src/ChangeBatcher/createPatchSet.lua
+++ b/plugin/src/ChangeBatcher/createPatchSet.lua
@@ -5,7 +5,8 @@
 	of instances) and return the patch.
 ]]

-local Log = require(script.Parent.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)

 local PatchSet = require(script.Parent.Parent.PatchSet)

--- a/plugin/src/ChangeBatcher/encodePatchUpdate.lua
+++ b/plugin/src/ChangeBatcher/encodePatchUpdate.lua
@@ -1,5 +1,6 @@
-local Log = require(script.Parent.Parent.Parent.Log)
-local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)
+local RbxDom = require(Packages.RbxDom)

 local encodeProperty = require(script.Parent.encodeProperty)

--- a/plugin/src/ChangeBatcher/encodeProperty.lua
+++ b/plugin/src/ChangeBatcher/encodeProperty.lua
@@ -1,5 +1,6 @@
-local Log = require(script.Parent.Parent.Parent.Log)
-local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)
+local RbxDom = require(Packages.RbxDom)

 return function(instance, propertyName, propertyDescriptor)
 	local readSuccess, readResult = propertyDescriptor:read(instance)
--- a/plugin/src/InstanceMap.lua
+++ b/plugin/src/InstanceMap.lua
@@ -1,6 +1,7 @@
 local RunService = game:GetService("RunService")

-local Log = require(script.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Packages
+local Log = require(Packages.Log)

 --[[
 	A bidirectional map between instance IDs and Roblox instances. It lets us
--- a/plugin/src/PatchSet.lua
+++ b/plugin/src/PatchSet.lua
@@ -3,7 +3,8 @@
 	patch returned from the API.
 ]]

-local t = require(script.Parent.Parent.t)
+local Packages = script.Parent.Parent.Packages
+local t = require(Packages.t)

 local Types = require(script.Parent.Types)

@@ -181,4 +182,4 @@ function PatchSet.humanSummary(instanceMap, patchSet)
 	return table.concat(statements, "\n")
 end

-return PatchSet
+return PatchSet
--- a/plugin/src/Reconciler/Error.lua
+++ b/plugin/src/Reconciler/Error.lua
@@ -2,7 +2,8 @@
 	Defines the errors that can be returned by the reconciler.
 ]]

-local Fmt = require(script.Parent.Parent.Parent.Fmt)
+local Packages = script.Parent.Parent.Parent.Packages
+local Fmt = require(Packages.Fmt)

 local Error = {}

@@ -34,4 +35,4 @@ function Error:__tostring()
 	return Fmt.fmt("Error({}): {:#?}", self.kind, self.details)
 end

-return Error
+return Error
--- a/plugin/src/Reconciler/applyPatch.lua
+++ b/plugin/src/Reconciler/applyPatch.lua
@@ -5,7 +5,8 @@
 	Patches can come from the server or be generated by the client.
 ]]

-local Log = require(script.Parent.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)

 local PatchSet = require(script.Parent.Parent.PatchSet)
 local Types = require(script.Parent.Parent.Types)
--- a/plugin/src/Reconciler/decodeValue.lua
+++ b/plugin/src/Reconciler/decodeValue.lua
@@ -3,7 +3,8 @@
 	usable by Rojo's reconciler, potentially using RbxDom.
 ]]

-local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
+local Packages = script.Parent.Parent.Parent.Packages
+local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)

 local function decodeValue(encodedValue, instanceMap)
@@ -38,4 +39,4 @@ local function decodeValue(encodedValue, instanceMap)
 	return true, decodedValue
 end

-return decodeValue
+return decodeValue
--- a/plugin/src/Reconciler/diff.lua
+++ b/plugin/src/Reconciler/diff.lua
@@ -3,7 +3,9 @@
 	patch that can be later applied.
 ]]

-local Log = require(script.Parent.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)
+
 local invariant = require(script.Parent.Parent.invariant)
 local getProperty = require(script.Parent.getProperty)
 local Error = require(script.Parent.Error)
@@ -152,4 +154,4 @@ local function diff(instanceMap, virtualInstances, rootId)
 	return true, patch
 end

-return diff
+return diff
--- a/plugin/src/Reconciler/diff.spec.lua
+++ b/plugin/src/Reconciler/diff.spec.lua
@@ -1,5 +1,6 @@
 return function()
-	local Log = require(script.Parent.Parent.Parent.Log)
+	local Packages = script.Parent.Parent.Parent.Packages
+	local Log = require(Packages.Log)

 	local InstanceMap = require(script.Parent.Parent.InstanceMap)
 	local PatchSet = require(script.Parent.Parent.PatchSet)
@@ -286,4 +287,4 @@ return function()
 		expect(size(patch.added)).to.equal(1)
 		expect(patch.added["CHILD"]).to.equal(virtualInstances["CHILD"])
 	end)
-end
+end
--- a/plugin/src/Reconciler/getProperty.lua
+++ b/plugin/src/Reconciler/getProperty.lua
@@ -2,7 +2,8 @@
 	Attempts to read a property from the given instance.
 ]]

-local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
+local Packages = script.Parent.Parent.Parent.Packages
+local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)

 local function getProperty(instance, propertyName)
@@ -56,4 +57,4 @@ local function getProperty(instance, propertyName)
 	return true, valueOrErr
 end

-return getProperty
+return getProperty
--- a/plugin/src/Reconciler/setProperty.lua
+++ b/plugin/src/Reconciler/setProperty.lua
@@ -2,8 +2,9 @@
 	Attempts to set a property on the given instance.
 ]]

-local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local Log = require(script.Parent.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(Packages.Log)
+local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)

 local function setProperty(instance, propertyName, value)
@@ -45,4 +46,4 @@ local function setProperty(instance, propertyName, value)
 	return true
 end

-return setProperty
+return setProperty
--- a/plugin/src/ServeSession.lua
+++ b/plugin/src/ServeSession.lua
@@ -1,9 +1,10 @@
 local StudioService = game:GetService("StudioService")
 local RunService = game:GetService("RunService")

-local Log = require(script.Parent.Parent.Log)
-local Fmt = require(script.Parent.Parent.Fmt)
-local t = require(script.Parent.Parent.t)
+local Packages = script.Parent.Parent.Packages
+local Log = require(Packages.Log)
+local Fmt = require(Packages.Fmt)
+local t = require(Packages.t)

 local ChangeBatcher = require(script.Parent.ChangeBatcher)
 local InstanceMap = require(script.Parent.InstanceMap)
--- a/plugin/src/Settings.lua
+++ b/plugin/src/Settings.lua
@@ -4,8 +4,9 @@

 local plugin = plugin or script:FindFirstAncestorWhichIsA("Plugin")
 local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages

-local Log = require(Rojo.Log)
+local Log = require(Packages.Log)

 local defaultSettings = {
 	openScriptsExternally = false,
--- a/plugin/src/Types.lua
+++ b/plugin/src/Types.lua
@@ -1,5 +1,5 @@
-local t = require(script.Parent.Parent.t)
-
+local Packages = script.Parent.Parent.Packages
+local t = require(Packages.t)
 local DevSettings = require(script.Parent.DevSettings)
 local strict = require(script.Parent.strict)

--- a/plugin/src/init.server.lua
+++ b/plugin/src/init.server.lua
@@ -2,19 +2,20 @@ if not plugin then
 	return
 end

-local Log = require(script.Parent.Log)
+local Rojo = script:FindFirstAncestor("Rojo")
+local Packages = Rojo.Packages
+
+local Log = require(Packages.Log)
+local Roact = require(Packages.Roact)

 local DevSettings = require(script.DevSettings)
+local Config = require(script.Config)
+local App = require(script.App)

 Log.setLogLevelThunk(function()
 	return DevSettings:getLogLevel()
 end)

-local Roact = require(script.Parent.Roact)
-
-local Config = require(script.Config)
-local App = require(script.App)
-
 local app = Roact.createElement(App, {
 	plugin = plugin
 })
--- a/plugin/src/invariant.lua
+++ b/plugin/src/invariant.lua
@@ -1,4 +1,6 @@
-local Fmt = require(script.Parent.Parent.Fmt)
+
+local Packages = script.Parent.Parent.Packages
+local Fmt = require(Packages.Fmt)

 local Config = require(script.Parent.Config)

@@ -26,4 +28,4 @@ else
 	end
 end

-return invariant
+return invariant
--- a/plugin/src/preloadAssets.lua
+++ b/plugin/src/preloadAssets.lua
@@ -1,6 +1,7 @@
 local ContentProvider = game:GetService("ContentProvider")

-local Log = require(script.Parent.Parent.Log)
+local Packages = script.Parent.Parent.Packages
+local Log = require(Packages.Log)

 local Assets = require(script.Parent.Assets)

@@ -29,4 +30,4 @@ local function preloadAssets()
 	end)()
 end

-return preloadAssets
+return preloadAssets
--- a/plugin/src/runTests.lua
+++ b/plugin/src/runTests.lua
@@ -1,5 +1,6 @@
 return function(TestEZ)
 	local Rojo = script.Parent.Parent
+	local Packages = Rojo.Packages

-	TestEZ.TestBootstrap:run({ Rojo.Plugin, Rojo.Http, Rojo.Log })
-end
+	TestEZ.TestBootstrap:run({ Rojo.Plugin, Packages.Http, Packages.Log, Packages.RbxDom })
+end
--- a/plugin/src/soundPlayer.lua
+++ b/plugin/src/soundPlayer.lua
@@ -1,13 +1,16 @@
 -- Sounds only play in Edit mode when parented to a plugin widget, for some reason
 local plugin = plugin or script:FindFirstAncestorWhichIsA("Plugin")
-local widget = plugin:CreateDockWidgetPluginGui("Rojo_soundPlayer", DockWidgetPluginGuiInfo.new(
-	Enum.InitialDockState.Float,
-	false, true,
-	10, 10,
-	10, 10
-))
-widget.Name = "Rojo_soundPlayer"
-widget.Title = "Rojo Sound Player"
+local widget = nil
+if plugin then
+	widget = plugin:CreateDockWidgetPluginGui("Rojo_soundPlayer", DockWidgetPluginGuiInfo.new(
+		Enum.InitialDockState.Float,
+		false, true,
+		10, 10,
+		10, 10
+	))
+	widget.Name = "Rojo_soundPlayer"
+	widget.Title = "Rojo Sound Player"
+end

 local SoundPlayer = {}
 SoundPlayer.__index = SoundPlayer
--- a/plugin/test-place.project.json
+++ b/plugin/test-place.project.json
@@ -8,8 +8,8 @@
        "$path": "default.project.json"
      },

-      "TestEZ": {
-        "$path": "modules/testez"
+      "Packages": {
+        "$path": "DevPackages"
      }
    },

--- a/plugin/wally.lock
+++ b/plugin/wally.lock
@@ -0,0 +1,33 @@
+# This file is automatically @generated by Wally.
+# It is not intended for manual editing.
+registry = "test"
+
+[[package]]
+name = "evaera/promise"
+version = "4.0.0"
+dependencies = []
+
+[[package]]
+name = "osyrisrblx/t"
+version = "3.0.0"
+dependencies = []
+
+[[package]]
+name = "reselim/flipper"
+version = "2.0.0"
+dependencies = []
+
+[[package]]
+name = "roblox/roact"
+version = "1.4.4"
+dependencies = []
+
+[[package]]
+name = "roblox/testez"
+version = "0.4.1"
+dependencies = []
+
+[[package]]
+name = "rojo-rbx/rojo"
+version = "7.2.1"
+dependencies = [["Flipper", "reselim/flipper@2.0.0"], ["Promise", "evaera/promise@4.0.0"], ["Roact", "roblox/roact@1.4.4"], ["t", "osyrisrblx/t@3.0.0"]]
--- a/plugin/wally.toml
+++ b/plugin/wally.toml
@@ -0,0 +1,17 @@
+[package]
+name = "rojo-rbx/rojo"
+description = "Rojo enables Roblox developers to use professional-grade software engineering tools"
+version = "7.2.1"
+license = "MPL-2.0"
+authors = ["LPGhatguy (https://lpg.space/)"]
+registry = "https://github.com/upliftgames/wally-index"
+realm = "shared"
+
+[dependencies]
+Flipper = "reselim/flipper@2.0.0"
+Promise = "evaera/promise@4.0.0"
+Roact = "roblox/roact@1.4.4"
+t = "osyrisrblx/t@3.0.0"
+
+[dev-dependencies]
+TestEZ = "roblox/testez@0.4.1"