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>
This commit is contained in:
boatbomber
2022-08-03 15:36:58 -07:00
committed by GitHub
parent 565c12405e
commit e864cf0c7d
63 changed files with 271 additions and 190 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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,
}
}

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)

View File

@@ -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,

View File

@@ -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)

View File

@@ -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
})

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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