...and build with submodules for other builds too

.github/FUNDING.yml

@@ -1 +0,0 @@
-patreon: lpghatguy

.github/workflows/ci.yml

@@ -3,11 +3,11 @@ name: CI
 on:
   push:
     branches:
-    - master
+    - main
 
   pull_request:
     branches:
-    - master
+    - main
 
 jobs:
   build:
@@ -16,12 +16,10 @@ jobs:
 
     strategy:
       matrix:
-        rust_version: [stable, 1.57.0]
+        rust_version: [stable, 1.55.0]
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: true
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
@@ -42,8 +40,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: true
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1

.github/workflows/release.yml

@@ -67,7 +67,7 @@ jobs:
         # -x86_64 to each release.
         include:
           - host: linux
-            os: ubuntu-18.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             label: linux
 
@@ -150,4 +150,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.BIN }}-${{ env.PROJECT_VERSION }}-${{ matrix.label }}.zip
-          path: release.zip
+          path: release.zip

.gitignore

@@ -19,3 +19,6 @@
 
 # Snapshot files from the 'insta' Rust crate
 **/*.snap.new
+
+# Selene generates a roblox.toml file that should not be checked in.
+/roblox.toml

.luacheckrc

@@ -0,0 +1,58 @@
+stds.roblox = {
+	read_globals = {
+		game = {
+			other_fields = true,
+		},
+
+		-- Roblox globals
+		"script",
+
+		-- Extra functions
+		"tick", "warn", "spawn",
+		"wait", "settings", "typeof",
+
+		-- Types
+		"Vector2", "Vector3",
+		"Vector2int16", "Vector3int16",
+		"Color3",
+		"UDim", "UDim2",
+		"Rect",
+		"CFrame",
+		"Enum",
+		"Instance",
+		"DockWidgetPluginGuiInfo",
+	}
+}
+
+stds.plugin = {
+	read_globals = {
+		"plugin",
+	}
+}
+
+stds.testez = {
+	read_globals = {
+		"describe",
+		"it", "itFOCUS", "itSKIP", "itFIXME",
+		"FOCUS", "SKIP", "HACK_NO_XPCALL",
+		"expect",
+	}
+}
+
+ignore = {
+	"212", -- unused arguments
+	"421", -- shadowing local variable
+	"422", -- shadowing argument
+	"431", -- shadowing upvalue
+	"432", -- shadowing upvalue argument
+}
+
+std = "lua51+roblox"
+
+files["**/*.server.lua"] = {
+	std = "+plugin",
+}
+
+files["**/*.spec.lua"] = {
+	std = "+testez",
+}

CHANGELOG.md

@@ -2,37 +2,6 @@
 
 ## Unreleased Changes
 
-## [7.2.0] - June 29, 2022
-* Added support for `.luau` files. ([#552])
-* Added support for live syncing Attributes and Tags. ([#553])
-* Added notification popups in the Roblox Studio plugin. ([#540])
-* Fixed `init.meta.json` when used with `init.lua` and related files. ([#549])
-* Fixed incorrect output when serving from a non-default address or port ([#556])
-* Fixed Linux binaries not running on systems with older glibc. ([#561])
-* Added `camelCase` casing for JSON models, deprecating `PascalCase` names. ([#563])
-* Switched from structopt to clap for command line argument parsing.
-* Significantly improved performance of building and serving. ([#548])
-* Increased minimum supported Rust version to 1.57.0. ([#564])
-
-[#540]: https://github.com/rojo-rbx/rojo/pull/540
-[#548]: https://github.com/rojo-rbx/rojo/pull/548
-[#549]: https://github.com/rojo-rbx/rojo/pull/549
-[#552]: https://github.com/rojo-rbx/rojo/pull/552
-[#553]: https://github.com/rojo-rbx/rojo/pull/553
-[#556]: https://github.com/rojo-rbx/rojo/pull/556
-[#561]: https://github.com/rojo-rbx/rojo/pull/561
-[#563]: https://github.com/rojo-rbx/rojo/pull/563
-[#564]: https://github.com/rojo-rbx/rojo/pull/564
-[7.2.0]: https://github.com/rojo-rbx/rojo/releases/tag/v7.2.0
-
-## [7.1.1] - May 26, 2022
-* Fixed sourcemap command not stripping paths correctly ([#544])
-* Fixed Studio plugin settings not saving correctly.
-
-[#544]: https://github.com/rojo-rbx/rojo/pull/544
-[#545]: https://github.com/rojo-rbx/rojo/pull/545
-[7.1.1]: https://github.com/rojo-rbx/rojo/releases/tag/v7.1.1
-
 ## [7.1.0] - May 22, 2022
 * Added support for specifying an address to be used by default in project files. ([#507])
 * Added support for optional paths in project files. ([#472])

CONTRIBUTING.md

@@ -49,9 +49,11 @@ The Rojo release process is pretty manual right now. If you need to do it, here'
     * `cargo publish`
 8. Publish the Plugin
     * `cargo run -- upload plugin --asset_id 6415005344`
+    * `cargo run -- build plugin --output Rojo.rbxm`
 9. Push commits and tags
     * `git push && git push --tags`
 10. Copy GitHub release content from previous release
     * Update the leading text with a summary about the release
     * Paste the changelog notes (as-is!) from [`CHANGELOG.md`](CHANGELOG.md)
-    * Write a small summary of each major feature
+    * Write a small summary of each major feature
+    * Attach release artifacts from GitHub Actions for each platform

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rojo"
-version = "7.2.0"
-rust-version = "1.57.0"
+version = "7.1.0"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "Enables professional-grade development tools for Roblox developers"
 license = "MPL-2.0"
@@ -9,7 +8,7 @@ homepage = "https://rojo.space"
 documentation = "https://rojo.space/docs"
 repository = "https://github.com/rojo-rbx/rojo"
 readme = "README.md"
-edition = "2021"
+edition = "2018"
 build = "build.rs"
 
 exclude = [
@@ -28,10 +27,11 @@ default = []
 # Enable this feature to live-reload assets from the web UI.
 dev_live_assets = []
 
-profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"]
-
 [workspace]
-members = ["crates/*"]
+members = [
+    "rojo-insta-ext",
+    "memofs",
+]
 
 [lib]
 name = "librojo"
@@ -42,7 +42,7 @@ name = "build"
 harness = false
 
 [dependencies]
-memofs = { version = "0.2.0", path = "crates/memofs" }
+memofs = { version = "0.2.0", path = "memofs" }
 
 # These dependencies can be uncommented when working on rbx-dom simultaneously
 # rbx_binary = { path = "../rbx-dom/rbx_binary" }
@@ -51,8 +51,8 @@ memofs = { version = "0.2.0", path = "crates/memofs" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "0.6.5"
-rbx_dom_weak = "2.4.0"
+rbx_binary = "0.6.4"
+rbx_dom_weak = "2.3.0"
 rbx_reflection = "4.2.0"
 rbx_reflection_database = "0.2.2"
 rbx_xml = "0.12.3"
@@ -78,19 +78,17 @@ ritz = "0.1.0"
 roblox_install = "1.0.0"
 serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_json = "1.0.68"
+structopt = "0.3.23"
 termcolor = "1.1.2"
 thiserror = "1.0.30"
 tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
 uuid = { version = "1.0.0", features = ["v4", "serde"] }
-clap = { version = "3.1.18", features = ["derive"] }
-profiling = "1.0.6"
-tracy-client = { version = "0.13.2", optional = true }
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
 
 [build-dependencies]
-memofs = { version = "0.2.0", path = "crates/memofs" }
+memofs = { version = "0.2.0", path = "memofs" }
 
 embed-resource = "1.6.4"
 anyhow = "1.0.44"
@@ -99,7 +97,7 @@ fs-err = "2.6.0"
 maplit = "1.0.2"
 
 [dev-dependencies]
-rojo-insta-ext = { path = "crates/rojo-insta-ext" }
+rojo-insta-ext = { path = "rojo-insta-ext" }
 
 criterion = "0.3.5"
 insta = { version = "1.8.0", features = ["redactions"] }

README.md

@@ -40,7 +40,7 @@ Check out our [contribution guide](CONTRIBUTING.md) for detailed instructions fo
 
 Pull requests are welcome!
 
-Rojo supports Rust 1.57.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
+Rojo supports Rust 1.46.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
 
 ## License
 Rojo is available under the terms of the Mozilla Public License, Version 2.0. See [LICENSE.txt](LICENSE.txt) for details.

bin/dev-plugin.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+watchexec -c -w plugin "sh -c './bin/install-dev-plugin.sh'"

bin/install-dev-plugin.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+DIR="$( mktemp -d )"
+PLUGIN_FILE="$DIR/Rojo.rbxm"
+TESTEZ_FILE="$DIR/TestEZ.rbxm"
+
+rojo build plugin -o "$PLUGIN_FILE"
+rojo build plugin/testez.project.json -o "$TESTEZ_FILE"
+remodel bin/mark-plugin-as-dev.lua "$PLUGIN_FILE" "$TESTEZ_FILE" 2>/dev/null
+
+cp "$PLUGIN_FILE" "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm"

bin/install-release-plugin.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+rojo build plugin -o "$LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm"

bin/mark-plugin-as-dev.lua

@@ -0,0 +1,12 @@
+local pluginPath, testezPath = ...
+
+local plugin = remodel.readModelFile(pluginPath)[1]
+local testez = remodel.readModelFile(testezPath)[1]
+
+local marker = Instance.new("Folder")
+marker.Name = "ROJO_DEV_BUILD"
+marker.Parent = plugin
+
+testez.Parent = plugin
+
+remodel.writeModelFile(plugin, pluginPath)

bin/put-plugin-in-test-place.lua

@@ -0,0 +1,8 @@
+local pluginPath, placePath = ...
+
+local plugin = remodel.readModelFile(pluginPath)[1]
+local place = remodel.readPlaceFile(placePath)
+
+plugin.Parent = place:GetService("ReplicatedStorage")
+
+remodel.writePlaceFile(place, placePath)

bin/run-all-tests.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+./bin/run-cli-tests.sh
+./bin/run-plugin-tests.sh

bin/run-cli-tests.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+cargo test --all --locked
+cargo fmt -- --check
+
+touch src/lib.rs # Nudge Rust source to make Clippy actually check things
+cargo clippy

bin/run-plugin-tests.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+DIR="$( mktemp -d )"
+PLUGIN_FILE="$DIR/Rojo.rbxmx"
+PLACE_FILE="$DIR/RojoTestPlace.rbxlx"
+
+rojo build plugin -o "$PLUGIN_FILE"
+rojo build plugin/place.project.json -o "$PLACE_FILE"
+
+remodel bin/put-plugin-in-test-place.lua "$PLUGIN_FILE" "$PLACE_FILE"
+
+run-in-roblox -s plugin/testBootstrap.server.lua "$PLACE_FILE"
+
+luacheck plugin/src plugin/log plugin/http

build.rs

@@ -21,7 +21,7 @@ fn snapshot_from_fs_path(path: &Path) -> io::Result<VfsSnapshot> {
 
             // We can skip any TestEZ test files since they aren't necessary for
             // the plugin to run.
-            if file_name.ends_with(".spec.lua") || file_name.ends_with(".spec.luau") {
+            if file_name.ends_with(".spec.lua") {
                 continue;
             }
 

foreman.toml

@@ -1,4 +1,3 @@
 [tools]
-rojo = { source = "rojo-rbx/rojo", version = "7.1.1" }
+rojo = { source = "rojo-rbx/rojo", version = "6.1.0" }
 run-in-roblox = { source = "rojo-rbx/run-in-roblox", version = "0.3.0" }
-selene = { source = "Kampfkarren/selene", version = "0.18.2" }

plugin/rbx_dom_lua/EncodedValue.lua

@@ -23,45 +23,8 @@ end
 local ALL_AXES = {"X", "Y", "Z"}
 local ALL_FACES = {"Right", "Top", "Back", "Left", "Bottom", "Front"}
 
-local EncodedValue = {}
-
 local types
 types = {
-	Attributes = {
-		fromPod = function(pod)
-			local output = {}
-
-			for key, value in pairs(pod) do
-				local ok, result = EncodedValue.decode(value)
-
-				if ok then
-					output[key] = result
-				else
-					local warning = ("Could not decode attribute value of type %q: %s"):format(typeof(value), tostring(result))
-					warn(warning)
-				end
-			end
-
-			return output
-		end,
-		toPod = function(roblox)
-			local output = {}
-
-			for key, value in pairs(roblox) do
-				local ok, result = EncodedValue.encodeNaive(value)
-
-				if ok then
-					output[key] = result
-				else
-					local warning = ("Could not encode attribute value of type %q: %s"):format(typeof(value), tostring(result))
-					warn(warning)
-				end
-			end
-
-			return output
-		end,
-	},
-
 	Axes = {
 		fromPod = function(pod)
 			local axes = {}
@@ -470,6 +433,8 @@ types = {
 	},
 }
 
+local EncodedValue = {}
+
 function EncodedValue.decode(encodedValue)
 	local ty, value = next(encodedValue)
 
@@ -494,19 +459,4 @@ function EncodedValue.encode(rbxValue, propertyType)
 	}
 end
 
-local propertyTypeRenames = {
-	number = "Float64",
-	boolean = "Bool",
-	string = "String",
-}
-
-function EncodedValue.encodeNaive(rbxValue)
-	local propertyType = typeof(rbxValue)
-	if propertyTypeRenames[propertyType] ~= nil then
-		propertyType = propertyTypeRenames[propertyType]
-	end
-
-	return EncodedValue.encode(rbxValue, propertyType)
-end
-
 return EncodedValue

plugin/rbx_dom_lua/allValues.json

@@ -1,73 +1,4 @@
 {
-  "Attributes": {
-    "value": {
-      "Attributes": {
-        "TestBool": {
-          "Bool": true
-        },
-        "TestBrickColor": {
-          "BrickColor": 24
-        },
-        "TestColor3": {
-          "Color3": [
-            1.0,
-            0.5,
-            0.0
-          ]
-        },
-        "TestNumber": {
-          "Float64": 1337.0
-        },
-        "TestRect": {
-          "Rect": [
-            [
-              1.0,
-              2.0
-            ],
-            [
-              3.0,
-              4.0
-            ]
-          ]
-        },
-        "TestString": {
-          "String": "Test"
-        },
-        "TestUDim": {
-          "UDim": [
-            1.0,
-            2
-          ]
-        },
-        "TestUDim2": {
-          "UDim2": [
-            [
-              1.0,
-              2
-            ],
-            [
-              3.0,
-              4
-            ]
-          ]
-        },
-        "TestVector2": {
-          "Vector2": [
-            1.0,
-            2.0
-          ]
-        },
-        "TestVector3": {
-          "Vector3": [
-            1.0,
-            2.0,
-            3.0
-          ]
-        }
-      }
-    },
-    "ty": "Attributes"
-  },
   "Axes": {
     "value": {
       "Axes": [

plugin/rbx_dom_lua/customProperties.lua

@@ -5,26 +5,6 @@ local CollectionService = game:GetService("CollectionService")
 -- The reflection database refers to these as having scriptability = "Custom"
 return {
 	Instance = {
-		Attributes = {
-			read = function(instance)
-				return true, instance:GetAttributes()
-			end,
-			write = function(instance, _, value)
-				local existing = instance:GetAttributes()
-
-				for key, attr in pairs(value) do
-					instance:SetAttribute(key, attr)
-				end
-
-				for key in pairs(existing) do
-					if value[key] == nil then
-						instance:SetAttribute(key, nil)
-					end
-				end
-
-				return true
-			end,
-		},
 		Tags = {
 			read = function(instance)
 				return true, CollectionService:GetTags(instance)

plugin/src/App/Notifications.lua

@@ -1,198 +0,0 @@
-local TextService = game:GetService("TextService")
-local StudioService = game:GetService("StudioService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-
-local Roact = require(Rojo.Roact)
-local Flipper = require(Rojo.Flipper)
-
-local bindingUtil = require(script.Parent.bindingUtil)
-
-local Theme = require(Plugin.App.Theme)
-local Assets = require(Plugin.Assets)
-local playSound = require(Plugin.playSound)
-
-local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-
-local baseClock = DateTime.now().UnixTimestampMillis
-
-local e = Roact.createElement
-
-local Notification = Roact.Component:extend("Notification")
-
-function Notification:init()
-	self.motor = Flipper.SingleMotor.new(0)
-	self.binding = bindingUtil.fromMotor(self.motor)
-
-	self.lifetime = self.props.timeout
-
-	self.motor:onStep(function(value)
-		if value <= 0 then
-			if self.props.onClose then
-				self.props.onClose()
-			end
-		end
-	end)
-end
-
-function Notification:dismiss()
-	self.motor:setGoal(
-		Flipper.Spring.new(0, {
-			frequency = 5,
-			dampingRatio = 1,
-		})
-	)
-end
-
-function Notification:didMount()
-	self.motor:setGoal(
-		Flipper.Spring.new(1, {
-			frequency = 3,
-			dampingRatio = 1,
-		})
-	)
-
-	playSound(Assets.Sounds.Notification)
-
-	self.timeout = task.spawn(function()
-		local clock = os.clock()
-		local seen = false
-		while task.wait(1/10) do
-			local now = os.clock()
-			local dt = now - clock
-			clock = now
-
-			if not seen then
-				seen = StudioService.ActiveScript == nil
-			end
-
-			if not seen then
-				-- Don't run down timer before being viewed
-				continue
-			end
-
-			self.lifetime -= dt
-			if self.lifetime <= 0 then
-				self:dismiss()
-				break
-			end
-		end
-	end)
-end
-
-function Notification:willUnmount()
-	task.cancel(self.timeout)
-end
-
-function Notification:render()
-	local time = DateTime.fromUnixTimestampMillis(self.props.timestamp)
-
-	local textBounds = TextService:GetTextSize(
-		self.props.text,
-		15,
-		Enum.Font.GothamSemibold,
-		Vector2.new(350, 700)
-	)
-
-	local transparency = self.binding:map(function(value)
-		return 1 - value
-	end)
-
-	local size = self.binding:map(function(value)
-		return UDim2.fromOffset(
-			(35+40+textBounds.X)*value,
-			math.max(14+20+textBounds.Y, 32+20)
-		)
-	end)
-
-	return Theme.with(function(theme)
-		return e("TextButton", {
-			BackgroundTransparency = 1,
-			Size = size,
-			LayoutOrder = self.props.layoutOrder,
-			Text = "",
-			ClipsDescendants = true,
-
-			[Roact.Event.Activated] = function()
-				self:dismiss()
-			end,
-		}, {
-			e(BorderedContainer, {
-				transparency = transparency,
-				size = UDim2.new(1, 0, 1, 0),
-			}, {
-				TextContainer = e("Frame", {
-					Size = UDim2.new(0, 35+textBounds.X, 1, -20),
-					Position = UDim2.new(0, 0, 0, 10),
-					BackgroundTransparency = 1
-				}, {
-					Logo = e("ImageLabel", {
-						ImageTransparency = transparency,
-						Image = Assets.Images.PluginButton,
-						BackgroundTransparency = 1,
-						Size = UDim2.new(0, 32, 0, 32),
-						Position = UDim2.new(0, 0, 0.5, 0),
-						AnchorPoint = Vector2.new(0, 0.5),
-					}),
-					Info = e("TextLabel", {
-						Text = self.props.text,
-						Font = Enum.Font.GothamSemibold,
-						TextSize = 15,
-						TextColor3 = theme.Notification.InfoColor,
-						TextTransparency = transparency,
-						TextXAlignment = Enum.TextXAlignment.Left,
-						TextWrapped = true,
-
-						Size = UDim2.new(0, textBounds.X, 0, textBounds.Y),
-						Position = UDim2.fromOffset(35, 0),
-
-						LayoutOrder = 1,
-						BackgroundTransparency = 1,
-					}),
-					Time = e("TextLabel", {
-						Text = time:FormatLocalTime("LTS", "en-us"),
-						Font = Enum.Font.Code,
-						TextSize = 12,
-						TextColor3 = theme.Notification.InfoColor,
-						TextTransparency = transparency,
-						TextXAlignment = Enum.TextXAlignment.Left,
-
-						Size = UDim2.new(1, -35, 0, 14),
-						Position = UDim2.new(0, 35, 1, -14),
-
-						LayoutOrder = 1,
-						BackgroundTransparency = 1,
-					}),
-				}),
-
-				Padding = e("UIPadding", {
-					PaddingLeft = UDim.new(0, 17),
-					PaddingRight = UDim.new(0, 15),
-				}),
-			})
-		})
-	end)
-end
-
-local Notifications = Roact.Component:extend("Notifications")
-
-function Notifications:render()
-	local notifs = {}
-
-	for index, notif in ipairs(self.props.notifications) do
-		notifs[notif] = e(Notification, {
-			text = notif.text,
-			timestamp = notif.timestamp,
-			timeout = notif.timeout,
-			layoutOrder = (notif.timestamp - baseClock),
-			onClose = function()
-				self.props.onClose(index)
-			end,
-		})
-	end
-
-	return Roact.createFragment(notifs)
-end
-
-return Notifications

plugin/src/App/PluginSettings.lua

@@ -9,7 +9,6 @@ local Roact = require(Rojo.Roact)
 local defaultSettings = {
 	openScriptsExternally = false,
 	twoWaySync = false,
-	showNotifications = true,
 }
 
 local Settings = {}
@@ -119,4 +118,4 @@ end
 return {
 	StudioProvider = StudioProvider,
 	with = with,
-}
+}

plugin/src/App/StatusPages/Settings.lua

@@ -202,20 +202,12 @@ function SettingsPage:render()
 				layoutOrder = 1,
 			}),
 
-			ShowNotifications = e(Setting, {
-				id = "showNotifications",
-				name = "Show Notifications",
-				description = "Popup notifications in viewport",
-				transparency = self.props.transparency,
-				layoutOrder = 2,
-			}),
-
 			TwoWaySync = e(Setting, {
 				id = "twoWaySync",
 				name = "Two-Way Sync",
 				description = "EXPERIMENTAL! Editing files in Studio will sync them into the filesystem",
 				transparency = self.props.transparency,
-				layoutOrder = 3,
+				layoutOrder = 2,
 			}),
 
 			Layout = e("UIListLayout", {
@@ -235,4 +227,4 @@ function SettingsPage:render()
 	end)
 end
 
-return SettingsPage
+return SettingsPage

plugin/src/App/Theme.lua

@@ -103,10 +103,6 @@ local lightTheme = strict("LightTheme", {
 		LogoColor = BRAND_COLOR,
 		VersionColor = hexColor(0x727272),
 	},
-	Notification = {
-		InfoColor = hexColor(0x00000),
-		CloseColor = BRAND_COLOR,
-	},
 	ErrorColor = hexColor(0x000000),
 	ScrollBarColor = hexColor(0x000000),
 })
@@ -181,10 +177,6 @@ local darkTheme = strict("DarkTheme", {
 		LogoColor = BRAND_COLOR,
 		VersionColor = hexColor(0xD3D3D3)
 	},
-	Notification = {
-		InfoColor = hexColor(0xFFFFFF),
-		CloseColor = hexColor(0xFFFFFF),
-	},
 	ErrorColor = hexColor(0xFFFFFF),
 	ScrollBarColor = hexColor(0xFFFFFF),
 })

plugin/src/App/init.lua

@@ -16,7 +16,6 @@ local Theme = require(script.Theme)
 local PluginSettings = require(script.PluginSettings)
 
 local Page = require(script.Page)
-local Notifications = require(script.Notifications)
 local StudioPluginAction = require(script.Components.Studio.StudioPluginAction)
 local StudioToolbar = require(script.Components.Studio.StudioToolbar)
 local StudioToggleButton = require(script.Components.Studio.StudioToggleButton)
@@ -45,37 +44,10 @@ function App:init()
 	self:setState({
 		appStatus = AppStatus.NotConnected,
 		guiEnabled = false,
-		notifications = {},
 		toolbarIcon = Assets.Images.PluginButton,
 	})
 end
 
-function App:addNotification(text: string, timeout: number?)
-	if not self.props.settings:get("showNotifications") then
-		return
-	end
-
-	local notifications = table.clone(self.state.notifications)
-	table.insert(notifications, {
-		text = text,
-		timestamp = DateTime.now().UnixTimestampMillis,
-		timeout = timeout or 3,
-	})
-
-	self:setState({
-		notifications = notifications,
-	})
-end
-
-function App:closeNotification(index: number)
-	local notifications = table.clone(self.state.notifications)
-	table.remove(notifications, index)
-
-	self:setState({
-		notifications = notifications,
-	})
-end
-
 function App:getHostAndPort()
 	local host = self.host:getValue()
 	local port = self.port:getValue()
@@ -109,7 +81,6 @@ function App:startSession()
 				appStatus = AppStatus.Connecting,
 				toolbarIcon = Assets.Images.PluginButton,
 			})
-			self:addNotification("Connecting to session...")
 		elseif status == ServeSession.Status.Connected then
 			local address = ("%s:%s"):format(host, port)
 			self:setState({
@@ -118,7 +89,8 @@ function App:startSession()
 				address = address,
 				toolbarIcon = Assets.Images.PluginButtonConnected,
 			})
-			self:addNotification(string.format("Connected to session '%s' at %s.", details, address), 5)
+
+			Log.info("Connected to session '{}' at {}", details, address)
 		elseif status == ServeSession.Status.Disconnected then
 			self.serveSession = nil
 
@@ -132,13 +104,13 @@ function App:startSession()
 					errorMessage = tostring(details),
 					toolbarIcon = Assets.Images.PluginButtonWarning,
 				})
-				self:addNotification(tostring(details), 10)
 			else
 				self:setState({
 					appStatus = AppStatus.NotConnected,
 					toolbarIcon = Assets.Images.PluginButton,
 				})
-				self:addNotification("Disconnected from session.")
+
+				Log.info("Disconnected session")
 			end
 		end
 	end)
@@ -264,21 +236,6 @@ function App:render()
 				end),
 			}),
 
-			RojoNotifications = e("ScreenGui", {}, {
-				layout = e("UIListLayout", {
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					HorizontalAlignment = Enum.HorizontalAlignment.Right,
-					VerticalAlignment = Enum.VerticalAlignment.Bottom,
-					Padding = UDim.new(0, 5),
-				}),
-				notifs = e(Notifications, {
-					notifications = self.state.notifications,
-					onClose = function(index)
-						self:closeNotification(index)
-					end,
-				}),
-			}),
-
 			toggleAction = e(StudioPluginAction, {
 				name = "RojoConnection",
 				title = "Rojo: Connect/Disconnect",

plugin/src/Assets.lua

@@ -45,9 +45,6 @@ local Assets = {
 			[500] = "rbxassetid://2609138523"
 		},
 	},
-	Sounds = {
-		Notification = "rbxassetid://9716079936",
-	},
 	StartSession = "",
 	SessionActive = "",
 	Configure = "",
@@ -65,4 +62,4 @@ end
 
 guardForTypos("Assets", Assets)
 
-return Assets
+return Assets

plugin/src/Config.lua

@@ -5,7 +5,7 @@ local isDevBuild = script.Parent.Parent:FindFirstChild("ROJO_DEV_BUILD") ~= nil
 return strict("Config", {
 	isDevBuild = isDevBuild,
 	codename = "Epiphany",
-	version = {7, 2, 0},
+	version = {7, 1, 0},
 	expectedServerVersionString = "7.0 or newer",
 	protocolVersion = 4,
 	defaultHost = "localhost",

plugin/src/init.server.lua

@@ -18,7 +18,7 @@ local App = require(script.App)
 local app = Roact.createElement(App, {
 	plugin = plugin
 })
-local tree = Roact.mount(app, game:GetService("CoreGui"), "Rojo UI")
+local tree = Roact.mount(app, nil, "Rojo UI")
 
 plugin.Unloading:Connect(function()
 	Roact.unmount(tree)
@@ -28,4 +28,4 @@ if Config.isDevBuild then
 	local TestEZ = require(script.Parent.TestEZ)
 
 	require(script.runTests)(TestEZ)
-end
+end

plugin/src/playSound.lua

@@ -1,22 +0,0 @@
--- Roblox decided that 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"
-
-return function(soundId)
-	local sound = Instance.new("Sound")
-	sound.SoundId = soundId
-	sound.Parent = widget
-
-	sound.Ended:Connect(function()
-		sound:Destroy()
-	end)
-
-	sound:Play()
-end

rojo-test/build-test-snapshots/end_to_end__tests__build__attributes.snap

@@ -1,24 +0,0 @@
----
-source: tests/tests/build.rs
-assertion_line: 99
-expression: contents
----
-<roblox version="4">
-  <Item class="Folder" referent="0">
-    <Properties>
-      <string name="Name">attributes</string>
-    </Properties>
-    <Item class="Folder" referent="1">
-      <Properties>
-        <string name="Name">Explicit</string>
-        <BinaryString name="AttributesSerialize">AgAAAAUAAABIZWxsbwIFAAAAV29ybGQGAAAAVmVjdG9yEQAAgD8AAABAAABAQA==</BinaryString>
-      </Properties>
-    </Item>
-    <Item class="Folder" referent="2">
-      <Properties>
-        <string name="Name">ImplicitAttributes</string>
-        <BinaryString name="AttributesSerialize">AgAAAAMAAABIZXkCBwAAAEdyYW5kbWEGAAAAVmVjdG9yEQAAgEAAAKBAAADAQA==</BinaryString>
-      </Properties>
-    </Item>
-  </Item>
-</roblox>

rojo-test/build-test-snapshots/end_to_end__tests__build__issue_546.snap

@@ -1,14 +0,0 @@
----
-source: tests/tests/build.rs
-assertion_line: 98
-expression: contents
----
-<roblox version="4">
-  <Item class="LocalScript" referent="0">
-    <Properties>
-      <string name="Name">issue_546</string>
-      <bool name="Disabled">true</bool>
-      <string name="Source">print("Hello, world!")</string>
-    </Properties>
-  </Item>
-</roblox>

rojo-test/build-test-snapshots/end_to_end__tests__build__weldconstraint.snap

@@ -1,13 +1,14 @@
 ---
 source: tests/tests/build.rs
-assertion_line: 99
 expression: contents
+
 ---
 <roblox version="4">
   <Item class="Folder" referent="0">
     <Properties>
       <string name="Name">weldconstraint</string>
-      <BinaryString name="AttributesSerialize"></BinaryString>
+      <BinaryString name="AttributesSerialize">
+      </BinaryString>
       <int64 name="SourceAssetId">-1</int64>
       <BinaryString name="Tags"></BinaryString>
     </Properties>
@@ -15,7 +16,8 @@ expression: contents
       <Properties>
         <string name="Name">A</string>
         <bool name="Anchored">false</bool>
-        <BinaryString name="AttributesSerialize"></BinaryString>
+        <BinaryString name="AttributesSerialize">
+        </BinaryString>
         <float name="BackParamA">-0.5</float>
         <float name="BackParamB">0.5</float>
         <token name="BackSurface">0</token>
@@ -106,7 +108,8 @@ expression: contents
       <Item class="WeldConstraint" referent="2">
         <Properties>
           <string name="Name">WeldConstraint</string>
-          <BinaryString name="AttributesSerialize"></BinaryString>
+          <BinaryString name="AttributesSerialize">
+          </BinaryString>
           <CoordinateFrame name="CFrame0">
             <X>7</X>
             <Y>0.000001013279</Y>
@@ -133,7 +136,8 @@ expression: contents
       <Properties>
         <string name="Name">B</string>
         <bool name="Anchored">false</bool>
-        <BinaryString name="AttributesSerialize"></BinaryString>
+        <BinaryString name="AttributesSerialize">
+        </BinaryString>
         <float name="BackParamA">-0.5</float>
         <float name="BackParamB">0.5</float>
         <token name="BackSurface">0</token>

rojo-test/build-tests/attributes/default.project.json

@@ -1,36 +0,0 @@
-{
-  "name": "attributes",
-  "tree": {
-    "$className": "Folder",
-
-    "Explicit": {
-      "$className": "Folder",
-      "$properties": {
-        "Attributes": {
-          "Attributes": {
-            "Hello": {
-              "String": "World"
-            },
-            "Vector": {
-              "Vector3": [1, 2, 3]
-            }
-          }
-        }
-      }
-    },
-
-    "ImplicitAttributes": {
-      "$className": "Folder",
-      "$properties": {
-        "Attributes": {
-          "Hey": {
-            "String": "Grandma"
-          },
-          "Vector": {
-            "Vector3": [4, 5, 6]
-          }
-        }
-      }
-    }
-  }
-}

rojo-test/build-tests/issue_546/README.md

@@ -1,2 +0,0 @@
-# Issue #546 (https://github.com/rojo-rbx/rojo/issues/546)
-Regression from Rojo 6.2.0 to Rojo 7.0.0. Meta files named as init.meta.json should apply after init.client.lua and other init files.

rojo-test/build-tests/issue_546/default.project.json

@@ -1,6 +0,0 @@
-{
-  "name": "issue_546",
-  "tree": {
-    "$path": "hello"
-  }
-}

rojo-test/build-tests/issue_546/hello/init.client.lua

@@ -1 +0,0 @@
-print("Hello, world!")

rojo-test/build-tests/issue_546/hello/init.meta.json

@@ -1,5 +0,0 @@
-{
-  "properties": {
-    "Disabled": true
-  }
-}

src/change_processor.rs

@@ -291,7 +291,7 @@ fn compute_and_apply_changes(tree: &mut RojoTree, vfs: &Vfs, id: Ref) -> Option<
                     }
                 };
 
-                let patch_set = compute_patch_set(snapshot, &tree, id);
+                let patch_set = compute_patch_set(snapshot.as_ref(), &tree, id);
                 apply_patch_set(tree, patch_set)
             }
             Ok(None) => {
@@ -334,7 +334,7 @@ fn compute_and_apply_changes(tree: &mut RojoTree, vfs: &Vfs, id: Ref) -> Option<
                 }
             };
 
-            let patch_set = compute_patch_set(snapshot, &tree, id);
+            let patch_set = compute_patch_set(snapshot.as_ref(), &tree, id);
             apply_patch_set(tree, patch_set)
         }
     };

src/cli/build.rs

@@ -1,13 +1,12 @@
 use std::{
     io::{BufWriter, Write},
-    mem::forget,
     path::{Path, PathBuf},
 };
 
 use anyhow::Context;
-use clap::Parser;
 use fs_err::File;
 use memofs::Vfs;
+use structopt::StructOpt;
 use tokio::runtime::Runtime;
 
 use crate::serve_session::ServeSession;
@@ -18,20 +17,20 @@ const UNKNOWN_OUTPUT_KIND_ERR: &str = "Could not detect what kind of file to bui
                                        Expected output file to end in .rbxl, .rbxlx, .rbxm, or .rbxmx.";
 
 /// Generates a model or place file from the Rojo project.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct BuildCommand {
     /// Path to the project to serve. Defaults to the current directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub project: PathBuf,
 
     /// Where to output the result.
     ///
     /// Should end in .rbxm, .rbxl, .rbxmx, or .rbxlx.
-    #[clap(long, short)]
+    #[structopt(long, short)]
     pub output: PathBuf,
 
     /// Whether to automatically rebuild when any input files change.
-    #[clap(long)]
+    #[structopt(long)]
     pub watch: bool,
 }
 
@@ -62,10 +61,6 @@ impl BuildCommand {
             }
         }
 
-        // Avoid dropping ServeSession: it's potentially VERY expensive to drop
-        // and we're about to exit anyways.
-        forget(session);
-
         Ok(())
     }
 }
@@ -102,7 +97,6 @@ fn xml_encode_config() -> rbx_xml::EncodeOptions {
     rbx_xml::EncodeOptions::new().property_behavior(rbx_xml::EncodePropertyBehavior::WriteUnknown)
 }
 
-#[profiling::function]
 fn write_model(
     session: &ServeSession,
     output: &Path,

src/cli/doc.rs

@@ -1,7 +1,7 @@
-use clap::Parser;
+use structopt::StructOpt;
 
 /// Open Rojo's documentation in your browser.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct DocCommand {}
 
 impl DocCommand {

src/cli/fmt_project.rs

@@ -1,15 +1,15 @@
 use std::path::PathBuf;
 
 use anyhow::Context;
-use clap::Parser;
+use structopt::StructOpt;
 
 use crate::project::Project;
 
 /// Reformat a Rojo project using the standard JSON formatting rules.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct FmtProjectCommand {
     /// Path to the project to format. Defaults to the current directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub project: PathBuf,
 }
 

src/cli/init.rs

@@ -4,9 +4,9 @@ use std::process::{Command, Stdio};
 use std::str::FromStr;
 
 use anyhow::{bail, format_err};
-use clap::Parser;
 use fs_err as fs;
 use fs_err::OpenOptions;
+use structopt::StructOpt;
 
 use super::resolve_path;
 
@@ -22,14 +22,14 @@ static PLACE_README: &str = include_str!("../../assets/default-place-project/REA
 static PLACE_GIT_IGNORE: &str = include_str!("../../assets/default-place-project/gitignore.txt");
 
 /// Initializes a new Rojo project.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct InitCommand {
     /// Path to the place to create the project. Defaults to the current directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub path: PathBuf,
 
     /// The kind of project to create, 'place' or 'model'. Defaults to place.
-    #[clap(long, default_value = "place")]
+    #[structopt(long, default_value = "place")]
     pub kind: InitKind,
 }
 

src/cli/mod.rs

@@ -1,4 +1,4 @@
-//! Defines Rojo's CLI through clap types.
+//! Defines Rojo's CLI through structopt types.
 
 mod build;
 mod doc;
@@ -11,7 +11,7 @@ mod upload;
 
 use std::{borrow::Cow, env, path::Path, str::FromStr};
 
-use clap::Parser;
+use structopt::StructOpt;
 use thiserror::Error;
 
 pub use self::build::BuildCommand;
@@ -23,15 +23,15 @@ pub use self::serve::ServeCommand;
 pub use self::sourcemap::SourcemapCommand;
 pub use self::upload::UploadCommand;
 
-/// Command line options that Rojo accepts, defined using the clap crate.
-#[derive(Debug, Parser)]
-#[clap(name = "Rojo", version, about, author)]
+/// Command line options that Rojo accepts, defined using the structopt crate.
+#[derive(Debug, StructOpt)]
+#[structopt(name = "Rojo", about, author)]
 pub struct Options {
-    #[clap(flatten)]
+    #[structopt(flatten)]
     pub global: GlobalOptions,
 
     /// Subcommand to run in this invocation.
-    #[clap(subcommand)]
+    #[structopt(subcommand)]
     pub subcommand: Subcommand,
 }
 
@@ -50,14 +50,14 @@ impl Options {
     }
 }
 
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct GlobalOptions {
     /// Sets verbosity level. Can be specified multiple times.
-    #[clap(long("verbose"), short, global(true), parse(from_occurrences))]
+    #[structopt(long("verbose"), short, global(true), parse(from_occurrences))]
     pub verbosity: u8,
 
     /// Set color behavior. Valid values are auto, always, and never.
-    #[clap(long("color"), global(true), default_value("auto"))]
+    #[structopt(long("color"), global(true), default_value("auto"))]
     pub color: ColorChoice,
 }
 
@@ -109,7 +109,7 @@ pub struct ColorChoiceParseError {
     attempted: String,
 }
 
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub enum Subcommand {
     Init(InitCommand),
     Serve(ServeCommand),

src/cli/plugin.rs

@@ -3,9 +3,9 @@ use std::{
     io::BufWriter,
 };
 
-use clap::Parser;
 use memofs::{InMemoryFs, Vfs, VfsSnapshot};
 use roblox_install::RobloxStudio;
+use structopt::StructOpt;
 
 use crate::serve_session::ServeSession;
 
@@ -13,14 +13,14 @@ static PLUGIN_BINCODE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/plugin.
 static PLUGIN_FILE_NAME: &str = "RojoManagedPlugin.rbxm";
 
 /// Install Rojo's plugin.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct PluginCommand {
-    #[clap(subcommand)]
+    #[structopt(subcommand)]
     subcommand: PluginSubcommand,
 }
 
 /// Manages Rojo's Roblox Studio plugin.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub enum PluginSubcommand {
     /// Install the plugin in Roblox Studio's plugins folder. If the plugin is
     /// already installed, installing it again will overwrite the current plugin

src/cli/serve.rs

@@ -5,8 +5,8 @@ use std::{
     sync::Arc,
 };
 
-use clap::Parser;
 use memofs::Vfs;
+use structopt::StructOpt;
 use termcolor::{BufferWriter, Color, ColorChoice, ColorSpec, WriteColor};
 
 use crate::{serve_session::ServeSession, web::LiveServer};
@@ -17,19 +17,19 @@ const DEFAULT_BIND_ADDRESS: Ipv4Addr = Ipv4Addr::new(127, 0, 0, 1);
 const DEFAULT_PORT: u16 = 34872;
 
 /// Expose a Rojo project to the Rojo Studio plugin.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct ServeCommand {
     /// Path to the project to serve. Defaults to the current directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub project: PathBuf,
 
     /// The IP address to listen on. Defaults to `127.0.0.1`.
-    #[clap(long)]
+    #[structopt(long)]
     pub address: Option<IpAddr>,
 
     /// The port to listen on. Defaults to the project's preference, or `34872` if
     /// it has none.
-    #[clap(long)]
+    #[structopt(long)]
     pub port: Option<u16>,
 }
 
@@ -67,17 +67,15 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io
     let writer = BufferWriter::stdout(color);
     let mut buffer = writer.buffer();
 
-    let address_string = if bind_address.is_loopback() {
-        "localhost".to_owned()
-    } else {
-        bind_address.to_string()
-    };
-
     writeln!(&mut buffer, "Rojo server listening:")?;
 
     write!(&mut buffer, "  Address: ")?;
     buffer.set_color(&green)?;
-    writeln!(&mut buffer, "{}", address_string)?;
+    if bind_address.is_loopback() {
+        writeln!(&mut buffer, "localhost")?;
+    } else {
+        writeln!(&mut buffer, "{}", bind_address)?;
+    }
 
     buffer.set_color(&ColorSpec::new())?;
     write!(&mut buffer, "  Port:    ")?;
@@ -90,7 +88,7 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io
     write!(&mut buffer, "Visit ")?;
 
     buffer.set_color(&green)?;
-    write!(&mut buffer, "http://{}:{}/", address_string, port)?;
+    write!(&mut buffer, "http://localhost:{}/", port)?;
 
     buffer.set_color(&ColorSpec::new())?;
     writeln!(&mut buffer, " in your browser for more information.")?;

src/cli/sourcemap.rs

@@ -3,11 +3,11 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use clap::Parser;
 use fs_err::File;
 use memofs::Vfs;
 use rbx_dom_weak::types::Ref;
 use serde::Serialize;
+use structopt::StructOpt;
 
 use crate::{
     serve_session::ServeSession,
@@ -33,22 +33,22 @@ struct SourcemapNode {
 }
 
 /// Generates a sourcemap file from the Rojo project.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct SourcemapCommand {
     /// Path to the project to use for the sourcemap. Defaults to the current
     /// directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub project: PathBuf,
 
     /// Where to output the sourcemap. Omit this to use stdout instead of
     /// writing to a file.
     ///
     /// Should end in .json.
-    #[clap(long, short)]
+    #[structopt(long, short)]
     pub output: Option<PathBuf>,
 
     /// If non-script files should be included or not. Defaults to false.
-    #[clap(long)]
+    #[structopt(long)]
     pub include_non_scripts: bool,
 }
 

src/cli/upload.rs

@@ -2,38 +2,38 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use anyhow::{bail, format_err, Context};
-use clap::Parser;
 use memofs::Vfs;
 use reqwest::{
     header::{ACCEPT, CONTENT_TYPE, COOKIE, USER_AGENT},
     StatusCode,
 };
+use structopt::StructOpt;
 
 use crate::{auth_cookie::get_auth_cookie, serve_session::ServeSession};
 
 use super::resolve_path;
 
 /// Builds the project and uploads it to Roblox.
-#[derive(Debug, Parser)]
+#[derive(Debug, StructOpt)]
 pub struct UploadCommand {
     /// Path to the project to upload. Defaults to the current directory.
-    #[clap(default_value = "")]
+    #[structopt(default_value = "")]
     pub project: PathBuf,
 
     /// Authenication cookie to use. If not specified, Rojo will attempt to find one from the system automatically.
-    #[clap(long)]
+    #[structopt(long)]
     pub cookie: Option<String>,
 
     /// API key obtained from create.roblox.com/credentials. Rojo will use the Open Cloud API when this is provided. Only supports uploading to a place.
-    #[clap(long = "api_key")]
+    #[structopt(long = "api_key")]
     pub api_key: Option<String>,
 
     /// The Universe ID of the given place. Required when using the Open Cloud API.
-    #[clap(long = "universe_id")]
+    #[structopt(long = "universe_id")]
     pub universe_id: Option<u64>,
 
     /// Asset ID to upload to.
-    #[clap(long = "asset_id")]
+    #[structopt(long = "asset_id")]
     pub asset_id: u64,
 }
 

src/main.rs

@@ -1,14 +1,11 @@
 use std::{env, panic, process};
 
 use backtrace::Backtrace;
-use clap::Parser;
+use structopt::StructOpt;
 
 use librojo::cli::Options;
 
 fn main() {
-    #[cfg(feature = "profile-with-tracy")]
-    tracy_client::Client::start();
-
     panic::set_hook(Box::new(|panic_info| {
         // PanicInfo's payload is usually a &'static str or String.
         // See: https://doc.rust-lang.org/beta/std/panic/struct.PanicInfo.html#method.payload
@@ -52,7 +49,7 @@ fn main() {
         process::exit(1);
     }));
 
-    let options = Options::parse();
+    let options = Options::from_args();
 
     let log_filter = match options.global.verbosity {
         0 => "info",

src/resolution.rs

@@ -2,8 +2,7 @@ use std::borrow::Borrow;
 
 use anyhow::format_err;
 use rbx_dom_weak::types::{
-    Attributes, CFrame, Color3, Content, Enum, Matrix3, Tags, Variant, VariantType, Vector2,
-    Vector3,
+    CFrame, Color3, Content, Enum, Matrix3, Tags, Variant, VariantType, Vector2, Vector3,
 };
 use rbx_reflection::{DataType, PropertyDescriptor};
 use serde::{Deserialize, Serialize};
@@ -41,7 +40,6 @@ pub enum AmbiguousValue {
     Array3([f64; 3]),
     Array4([f64; 4]),
     Array12([f64; 12]),
-    Attributes(Attributes),
 }
 
 impl AmbiguousValue {
@@ -130,8 +128,6 @@ impl AmbiguousValue {
                     Ok(CFrame::new(pos, orientation).into())
                 }
 
-                (VariantType::Attributes, AmbiguousValue::Attributes(value)) => Ok(value.into()),
-
                 (_, unresolved) => Err(format_err!(
                     "Wrong type of value for property {}.{}. Expected {:?}, got {}",
                     class_name,
@@ -158,7 +154,6 @@ impl AmbiguousValue {
             AmbiguousValue::Array3(_) => "an array of three numbers",
             AmbiguousValue::Array4(_) => "an array of four numbers",
             AmbiguousValue::Array12(_) => "an array of twelve numbers",
-            AmbiguousValue::Attributes(_) => "an object containing attributes",
         }
     }
 }

src/serve_session.rs

@@ -130,7 +130,7 @@ impl ServeSession {
         let snapshot = snapshot_from_vfs(&instance_context, &vfs, &start_path)?;
 
         log::trace!("Computing initial patch set");
-        let patch_set = compute_patch_set(snapshot, &tree, root_id);
+        let patch_set = compute_patch_set(snapshot.as_ref(), &tree, root_id);
 
         log::trace!("Applying initial patch set");
         apply_patch_set(&mut tree, patch_set);

src/snapshot/instance_snapshot.rs

@@ -4,7 +4,7 @@ use std::{borrow::Cow, collections::HashMap};
 
 use rbx_dom_weak::{
     types::{Ref, Variant},
-    Instance, WeakDom,
+    WeakDom,
 };
 use serde::{Deserialize, Serialize};
 
@@ -102,29 +102,22 @@ impl InstanceSnapshot {
         }
     }
 
-    #[profiling::function]
-    pub fn from_tree(tree: WeakDom, id: Ref) -> Self {
-        let (_, mut raw_tree) = tree.into_raw();
-        Self::from_raw_tree(&mut raw_tree, id)
-    }
-
-    fn from_raw_tree(raw_tree: &mut HashMap<Ref, Instance>, id: Ref) -> Self {
-        let instance = raw_tree
-            .remove(&id)
-            .expect("instance did not exist in tree");
+    pub fn from_tree(tree: &WeakDom, id: Ref) -> Self {
+        let instance = tree.get_by_ref(id).expect("instance did not exist in tree");
 
         let children = instance
             .children()
             .iter()
-            .map(|&id| Self::from_raw_tree(raw_tree, id))
+            .copied()
+            .map(|id| Self::from_tree(tree, id))
             .collect();
 
         Self {
             snapshot_id: Some(id),
             metadata: InstanceMetadata::default(),
-            name: Cow::Owned(instance.name),
-            class_name: Cow::Owned(instance.class),
-            properties: instance.properties,
+            name: Cow::Owned(instance.name.clone()),
+            class_name: Cow::Owned(instance.class.clone()),
+            properties: instance.properties.clone(),
             children,
         }
     }

src/snapshot/patch_apply.rs

@@ -1,9 +1,6 @@
 //! Defines the algorithm for applying generated patches.
 
-use std::{
-    collections::{HashMap, HashSet},
-    mem::take,
-};
+use std::collections::HashMap;
 
 use rbx_dom_weak::types::{Ref, Variant};
 
@@ -15,31 +12,21 @@ use super::{
 /// Consumes the input `PatchSet`, applying all of its prescribed changes to the
 /// tree and returns an `AppliedPatchSet`, which can be used to keep another
 /// tree in sync with Rojo's.
-#[profiling::function]
 pub fn apply_patch_set(tree: &mut RojoTree, patch_set: PatchSet) -> AppliedPatchSet {
     let mut context = PatchApplyContext::default();
 
-    {
-        profiling::scope!("removals");
-        for removed_id in patch_set.removed_instances {
-            apply_remove_instance(&mut context, tree, removed_id);
-        }
+    for removed_id in patch_set.removed_instances {
+        apply_remove_instance(&mut context, tree, removed_id);
     }
 
-    {
-        profiling::scope!("additions");
-        for add_patch in patch_set.added_instances {
-            apply_add_child(&mut context, tree, add_patch.parent_id, add_patch.instance);
-        }
+    for add_patch in patch_set.added_instances {
+        apply_add_child(&mut context, tree, add_patch.parent_id, add_patch.instance);
     }
 
-    {
-        profiling::scope!("updates");
-        // Updates need to be applied after additions, which reduces the complexity
-        // of updates significantly.
-        for update_patch in patch_set.updated_instances {
-            apply_update_child(&mut context, tree, update_patch);
-        }
+    // Updates need to be applied after additions, which reduces the complexity
+    // of updates significantly.
+    for update_patch in patch_set.updated_instances {
+        apply_update_child(&mut context, tree, update_patch);
     }
 
     finalize_patch_application(context, tree)
@@ -68,9 +55,20 @@ struct PatchApplyContext {
     /// eachother.
     snapshot_id_to_instance_id: HashMap<Ref, Ref>,
 
-    /// Tracks all of the instances added by this patch that have refs that need
-    /// to be rewritten.
-    has_refs_to_rewrite: HashSet<Ref>,
+    /// The properties of instances added by the current `PatchSet`.
+    ///
+    /// Instances added to the tree can refer to eachother via Ref properties,
+    /// but we need to make sure they're correctly transformed from snapshot
+    /// space into tree space (via `snapshot_id_to_instance_id`).
+    ///
+    /// It's not possible to do that transformation for refs that refer to added
+    /// instances until all the instances have actually been inserted into the
+    /// tree. For simplicity, we defer application of _all_ properties on added
+    /// instances instead of just Refs.
+    ///
+    /// This doesn't affect updated instances, since they're always applied
+    /// after we've added all the instances from the patch.
+    added_instance_properties: HashMap<Ref, HashMap<String, Variant>>,
 
     /// The current applied patch result, describing changes made to the tree.
     applied_patch_set: AppliedPatchSet,
@@ -86,22 +84,23 @@ struct PatchApplyContext {
 /// The remaining Ref properties need to be handled during patch application,
 /// where we build up a map of snapshot IDs to instance IDs as they're created,
 /// then apply properties all at once at the end.
-#[profiling::function]
 fn finalize_patch_application(context: PatchApplyContext, tree: &mut RojoTree) -> AppliedPatchSet {
-    for id in context.has_refs_to_rewrite {
+    for (id, properties) in context.added_instance_properties {
         // This should always succeed since instances marked as added in our
         // patch should be added without fail.
         let mut instance = tree
             .get_instance_mut(id)
             .expect("Invalid instance ID in deferred property map");
 
-        for value in instance.properties_mut().values_mut() {
-            if let Variant::Ref(referent) = value {
+        for (key, mut property_value) in properties {
+            if let Variant::Ref(referent) = property_value {
                 if let Some(&instance_referent) = context.snapshot_id_to_instance_id.get(&referent)
                 {
-                    *value = Variant::Ref(instance_referent);
+                    property_value = Variant::Ref(instance_referent);
                 }
             }
+
+            instance.properties_mut().insert(key, property_value);
         }
     }
 
@@ -117,24 +116,24 @@ fn apply_add_child(
     context: &mut PatchApplyContext,
     tree: &mut RojoTree,
     parent_id: Ref,
-    mut snapshot: InstanceSnapshot,
+    snapshot: InstanceSnapshot,
 ) {
     let snapshot_id = snapshot.snapshot_id;
-    let children = take(&mut snapshot.children);
+    let properties = snapshot.properties;
+    let children = snapshot.children;
 
-    // If an object we're adding has a non-null referent, we'll note this
-    // instance down as needing to be revisited later.
-    let has_refs = snapshot.properties.values().any(|value| match value {
-        Variant::Ref(value) => value.is_some(),
-        _ => false,
-    });
+    // Property application is deferred until after all children
+    // are constructed. This helps apply referents correctly.
+    let remaining_snapshot = InstanceSnapshot::new()
+        .name(snapshot.name)
+        .class_name(snapshot.class_name)
+        .metadata(snapshot.metadata)
+        .snapshot_id(snapshot.snapshot_id);
 
-    let id = tree.insert_instance(parent_id, snapshot);
+    let id = tree.insert_instance(parent_id, remaining_snapshot);
     context.applied_patch_set.added.push(id);
 
-    if has_refs {
-        context.has_refs_to_rewrite.insert(id);
-    }
+    context.added_instance_properties.insert(id, properties);
 
     if let Some(snapshot_id) = snapshot_id {
         context.snapshot_id_to_instance_id.insert(snapshot_id, id);

src/snapshot/patch_compute.rs

@@ -1,10 +1,7 @@
 //! Defines the algorithm for computing a roughly-minimal patch set given an
 //! existing instance tree and an instance snapshot.
 
-use std::{
-    collections::{HashMap, HashSet},
-    mem::take,
-};
+use std::collections::{HashMap, HashSet};
 
 use rbx_dom_weak::types::{Ref, Variant};
 
@@ -13,8 +10,11 @@ use super::{
     InstanceSnapshot, InstanceWithMeta, RojoTree,
 };
 
-#[profiling::function]
-pub fn compute_patch_set(snapshot: Option<InstanceSnapshot>, tree: &RojoTree, id: Ref) -> PatchSet {
+pub fn compute_patch_set(
+    snapshot: Option<&InstanceSnapshot>,
+    tree: &RojoTree,
+    id: Ref,
+) -> PatchSet {
     let mut patch_set = PatchSet::new();
 
     if let Some(snapshot) = snapshot {
@@ -74,7 +74,7 @@ fn rewrite_refs_in_snapshot(context: &ComputePatchContext, snapshot: &mut Instan
 
 fn compute_patch_set_internal(
     context: &mut ComputePatchContext,
-    mut snapshot: InstanceSnapshot,
+    snapshot: &InstanceSnapshot,
     tree: &RojoTree,
     id: Ref,
     patch_set: &mut PatchSet,
@@ -87,12 +87,12 @@ fn compute_patch_set_internal(
         .get_instance(id)
         .expect("Instance did not exist in tree");
 
-    compute_property_patches(&mut snapshot, &instance, patch_set);
-    compute_children_patches(context, &mut snapshot, tree, id, patch_set);
+    compute_property_patches(snapshot, &instance, patch_set);
+    compute_children_patches(context, snapshot, tree, id, patch_set);
 }
 
 fn compute_property_patches(
-    snapshot: &mut InstanceSnapshot,
+    snapshot: &InstanceSnapshot,
     instance: &InstanceWithMeta,
     patch_set: &mut PatchSet,
 ) {
@@ -102,32 +102,32 @@ fn compute_property_patches(
     let changed_name = if snapshot.name == instance.name() {
         None
     } else {
-        Some(take(&mut snapshot.name).into_owned())
+        Some(snapshot.name.clone().into_owned())
     };
 
     let changed_class_name = if snapshot.class_name == instance.class_name() {
         None
     } else {
-        Some(take(&mut snapshot.class_name).into_owned())
+        Some(snapshot.class_name.clone().into_owned())
     };
 
     let changed_metadata = if &snapshot.metadata == instance.metadata() {
         None
     } else {
-        Some(take(&mut snapshot.metadata))
+        Some(snapshot.metadata.clone())
     };
 
-    for (name, snapshot_value) in take(&mut snapshot.properties) {
-        visited_properties.insert(name.clone());
+    for (name, snapshot_value) in &snapshot.properties {
+        visited_properties.insert(name.as_str());
 
-        match instance.properties().get(&name) {
+        match instance.properties().get(name) {
             Some(instance_value) => {
-                if &snapshot_value != instance_value {
-                    changed_properties.insert(name, Some(snapshot_value));
+                if snapshot_value != instance_value {
+                    changed_properties.insert(name.clone(), Some(snapshot_value.clone()));
                 }
             }
             None => {
-                changed_properties.insert(name, Some(snapshot_value));
+                changed_properties.insert(name.clone(), Some(snapshot_value.clone()));
             }
         }
     }
@@ -159,7 +159,7 @@ fn compute_property_patches(
 
 fn compute_children_patches(
     context: &mut ComputePatchContext,
-    snapshot: &mut InstanceSnapshot,
+    snapshot: &InstanceSnapshot,
     tree: &RojoTree,
     id: Ref,
     patch_set: &mut PatchSet,
@@ -172,7 +172,7 @@ fn compute_children_patches(
 
     let mut paired_instances = vec![false; instance_children.len()];
 
-    for snapshot_child in take(&mut snapshot.children) {
+    for snapshot_child in snapshot.children.iter() {
         let matching_instance =
             instance_children
                 .iter()
@@ -209,7 +209,7 @@ fn compute_children_patches(
             None => {
                 patch_set.added_instances.push(PatchAdd {
                     parent_id: id,
-                    instance: snapshot_child,
+                    instance: snapshot_child.clone(),
                 });
             }
         }
@@ -257,7 +257,7 @@ mod test {
             children: Vec::new(),
         };
 
-        let patch_set = compute_patch_set(Some(snapshot), &tree, root_id);
+        let patch_set = compute_patch_set(Some(&snapshot), &tree, root_id);
 
         let expected_patch_set = PatchSet {
             updated_instances: vec![PatchUpdate {
@@ -307,7 +307,7 @@ mod test {
             class_name: Cow::Borrowed("foo"),
         };
 
-        let patch_set = compute_patch_set(Some(snapshot), &tree, root_id);
+        let patch_set = compute_patch_set(Some(&snapshot), &tree, root_id);
 
         let expected_patch_set = PatchSet {
             added_instances: vec![PatchAdd {

src/snapshot/tests/compute.rs

@@ -23,7 +23,7 @@ fn set_name_and_class_name() {
         children: Vec::new(),
     };
 
-    let patch_set = compute_patch_set(Some(snapshot), &tree, tree.get_root_id());
+    let patch_set = compute_patch_set(Some(&snapshot), &tree, tree.get_root_id());
     let patch_value = redactions.redacted_yaml(patch_set);
 
     assert_yaml_snapshot!(patch_value);
@@ -47,7 +47,7 @@ fn set_property() {
         children: Vec::new(),
     };
 
-    let patch_set = compute_patch_set(Some(snapshot), &tree, tree.get_root_id());
+    let patch_set = compute_patch_set(Some(&snapshot), &tree, tree.get_root_id());
     let patch_value = redactions.redacted_yaml(patch_set);
 
     assert_yaml_snapshot!(patch_value);
@@ -78,7 +78,7 @@ fn remove_property() {
         children: Vec::new(),
     };
 
-    let patch_set = compute_patch_set(Some(snapshot), &tree, tree.get_root_id());
+    let patch_set = compute_patch_set(Some(&snapshot), &tree, tree.get_root_id());
     let patch_value = redactions.redacted_yaml(patch_set);
 
     assert_yaml_snapshot!(patch_value);
@@ -107,7 +107,7 @@ fn add_child() {
         }],
     };
 
-    let patch_set = compute_patch_set(Some(snapshot), &tree, tree.get_root_id());
+    let patch_set = compute_patch_set(Some(&snapshot), &tree, tree.get_root_id());
     let patch_value = redactions.redacted_yaml(patch_set);
 
     assert_yaml_snapshot!(patch_value);
@@ -139,7 +139,7 @@ fn remove_child() {
         children: Vec::new(),
     };
 
-    let patch_set = compute_patch_set(Some(snapshot), &tree, tree.get_root_id());
+    let patch_set = compute_patch_set(Some(&snapshot), &tree, tree.get_root_id());
     let patch_value = redactions.redacted_yaml(patch_set);
 
     assert_yaml_snapshot!(patch_value);

src/snapshot/tree.rs

@@ -87,9 +87,8 @@ impl RojoTree {
     }
 
     pub fn insert_instance(&mut self, parent_ref: Ref, snapshot: InstanceSnapshot) -> Ref {
-        let builder = InstanceBuilder::empty()
-            .with_class(snapshot.class_name.into_owned())
-            .with_name(snapshot.name.into_owned())
+        let builder = InstanceBuilder::new(snapshot.class_name.to_owned())
+            .with_name(snapshot.name.to_owned())
             .with_properties(snapshot.properties);
 
         let referent = self.inner.insert(parent_ref, builder);

src/snapshot_middleware/dir.rs

@@ -10,40 +10,6 @@ pub fn snapshot_dir(
     context: &InstanceContext,
     vfs: &Vfs,
     path: &Path,
-) -> anyhow::Result<Option<InstanceSnapshot>> {
-    let mut snapshot = match snapshot_dir_no_meta(context, vfs, path)? {
-        Some(snapshot) => snapshot,
-        None => return Ok(None),
-    };
-
-    if let Some(mut meta) = dir_meta(vfs, path)? {
-        meta.apply_all(&mut snapshot)?;
-    }
-
-    Ok(Some(snapshot))
-}
-
-/// Retrieves the meta file that should be applied for this directory, if it
-/// exists.
-pub fn dir_meta(vfs: &Vfs, path: &Path) -> anyhow::Result<Option<DirectoryMetadata>> {
-    let meta_path = path.join("init.meta.json");
-
-    if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? {
-        let metadata = DirectoryMetadata::from_slice(&meta_contents, meta_path)?;
-        Ok(Some(metadata))
-    } else {
-        Ok(None)
-    }
-}
-
-/// Snapshot a directory without applying meta files; useful for if the
-/// directory's ClassName will change before metadata should be applied. For
-/// example, this can happen if the directory contains an `init.client.lua`
-/// file.
-pub fn snapshot_dir_no_meta(
-    context: &InstanceContext,
-    vfs: &Vfs,
-    path: &Path,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
     let passes_filter_rules = |child: &DirEntry| {
         context
@@ -82,14 +48,11 @@ pub fn snapshot_dir_no_meta(
         // middleware. Should we figure out a way for that function to add
         // relevant paths to this middleware?
         path.join("init.lua"),
-        path.join("init.luau"),
         path.join("init.server.lua"),
-        path.join("init.server.luau"),
         path.join("init.client.lua"),
-        path.join("init.client.luau"),
     ];
 
-    let snapshot = InstanceSnapshot::new()
+    let mut snapshot = InstanceSnapshot::new()
         .name(instance_name)
         .class_name("Folder")
         .children(snapshot_children)
@@ -100,6 +63,11 @@ pub fn snapshot_dir_no_meta(
                 .context(context),
         );
 
+    if let Some(meta_contents) = vfs.read(&meta_path).with_not_found()? {
+        let mut metadata = DirectoryMetadata::from_slice(&meta_contents, meta_path)?;
+        metadata.apply_all(&mut snapshot)?;
+    }
+
     Ok(Some(snapshot))
 }
 

src/snapshot_middleware/json_model.rs

@@ -26,25 +26,12 @@ pub fn snapshot_json_model(
         return Ok(None);
     }
 
-    let mut instance: JsonModel = serde_json::from_str(contents_str)
+    let instance: JsonModel = serde_json::from_str(contents_str)
         .with_context(|| format!("File is not a valid JSON model: {}", path.display()))?;
 
-    if let Some(top_level_name) = &instance.name {
-        let new_name = format!("{}.model.json", top_level_name);
-
-        log::warn!(
-            "Model at path {} had a top-level Name field. \
-            This field has been ignored since Rojo 6.0.\n\
-            Consider removing this field and renaming the file to {}.",
-            new_name,
-            path.display()
-        );
-    }
-
-    instance.name = Some(name.to_owned());
-
     let mut snapshot = instance
-        .into_snapshot()
+        .core
+        .into_snapshot(name.to_owned())
         .with_context(|| format!("Could not load JSON model: {}", path.display()))?;
 
     snapshot.metadata = snapshot
@@ -57,37 +44,42 @@ pub fn snapshot_json_model(
 }
 
 #[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "PascalCase")]
 struct JsonModel {
-    #[serde(alias = "Name")]
     name: Option<String>,
 
-    #[serde(alias = "ClassName")]
+    #[serde(flatten)]
+    core: JsonModelCore,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+struct JsonModelInstance {
+    name: String,
+
+    #[serde(flatten)]
+    core: JsonModelCore,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+struct JsonModelCore {
     class_name: String,
 
-    #[serde(
-        alias = "Children",
-        default = "Vec::new",
-        skip_serializing_if = "Vec::is_empty"
-    )]
-    children: Vec<JsonModel>,
+    #[serde(default = "Vec::new", skip_serializing_if = "Vec::is_empty")]
+    children: Vec<JsonModelInstance>,
 
-    #[serde(
-        alias = "Properties",
-        default = "HashMap::new",
-        skip_serializing_if = "HashMap::is_empty"
-    )]
+    #[serde(default = "HashMap::new", skip_serializing_if = "HashMap::is_empty")]
     properties: HashMap<String, UnresolvedValue>,
 }
 
-impl JsonModel {
-    fn into_snapshot(self) -> anyhow::Result<InstanceSnapshot> {
-        let name = self.name.unwrap_or_else(|| self.class_name.clone());
+impl JsonModelCore {
+    fn into_snapshot(self, name: String) -> anyhow::Result<InstanceSnapshot> {
         let class_name = self.class_name;
 
         let mut children = Vec::with_capacity(self.children.len());
         for child in self.children {
-            children.push(child.into_snapshot()?);
+            children.push(child.core.into_snapshot(child.name)?);
         }
 
         let mut properties = HashMap::with_capacity(self.properties.len());
@@ -121,43 +113,7 @@ mod test {
             VfsSnapshot::file(
                 r#"
                     {
-                      "className": "IntValue",
-                      "properties": {
-                        "Value": 5
-                      },
-                      "children": [
-                        {
-                          "name": "The Child",
-                          "className": "StringValue"
-                        }
-                      ]
-                    }
-                "#,
-            ),
-        )
-        .unwrap();
-
-        let vfs = Vfs::new(imfs);
-
-        let instance_snapshot = snapshot_json_model(
-            &InstanceContext::default(),
-            &vfs,
-            Path::new("/foo.model.json"),
-        )
-        .unwrap()
-        .unwrap();
-
-        insta::assert_yaml_snapshot!(instance_snapshot);
-    }
-
-    #[test]
-    fn model_from_vfs_legacy() {
-        let mut imfs = InMemoryFs::new();
-        imfs.load_snapshot(
-            "/foo.model.json",
-            VfsSnapshot::file(
-                r#"
-                    {
+                      "Name": "children",
                       "ClassName": "IntValue",
                       "Properties": {
                         "Value": 5
@@ -174,11 +130,11 @@ mod test {
         )
         .unwrap();
 
-        let vfs = Vfs::new(imfs);
+        let mut vfs = Vfs::new(imfs);
 
         let instance_snapshot = snapshot_json_model(
             &InstanceContext::default(),
-            &vfs,
+            &mut vfs,
             Path::new("/foo.model.json"),
         )
         .unwrap()

src/snapshot_middleware/lua.rs

@@ -6,11 +6,7 @@ use memofs::{IoResultExt, Vfs};
 
 use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
 
-use super::{
-    dir::{dir_meta, snapshot_dir_no_meta},
-    meta_file::AdjacentMetadata,
-    util::match_trailing,
-};
+use super::{dir::snapshot_dir, meta_file::AdjacentMetadata, util::match_trailing};
 
 /// Core routine for turning Lua files into snapshots.
 pub fn snapshot_lua(
@@ -27,12 +23,6 @@ pub fn snapshot_lua(
         ("LocalScript", name)
     } else if let Some(name) = match_trailing(&file_name, ".lua") {
         ("ModuleScript", name)
-    } else if let Some(name) = match_trailing(&file_name, ".server.luau") {
-        ("Script", name)
-    } else if let Some(name) = match_trailing(&file_name, ".client.luau") {
-        ("LocalScript", name)
-    } else if let Some(name) = match_trailing(&file_name, ".luau") {
-        ("ModuleScript", name)
     } else {
         return Ok(None);
     };
@@ -76,7 +66,7 @@ pub fn snapshot_lua_init(
     init_path: &Path,
 ) -> anyhow::Result<Option<InstanceSnapshot>> {
     let folder_path = init_path.parent().unwrap();
-    let dir_snapshot = snapshot_dir_no_meta(context, vfs, folder_path)?.unwrap();
+    let dir_snapshot = snapshot_dir(context, vfs, folder_path)?.unwrap();
 
     if dir_snapshot.class_name != "Folder" {
         anyhow::bail!(
@@ -96,10 +86,6 @@ pub fn snapshot_lua_init(
     init_snapshot.children = dir_snapshot.children;
     init_snapshot.metadata = dir_snapshot.metadata;
 
-    if let Some(mut meta) = dir_meta(vfs, folder_path)? {
-        meta.apply_all(&mut init_snapshot)?;
-    }
-
     Ok(Some(init_snapshot))
 }
 

src/snapshot_middleware/mod.rs

@@ -40,7 +40,6 @@ pub use self::project::snapshot_project_node;
 
 /// The main entrypoint to the snapshot function. This function can be pointed
 /// at any path and will return something if Rojo knows how to deal with it.
-#[profiling::function]
 pub fn snapshot_from_vfs(
     context: &InstanceContext,
     vfs: &Vfs,
@@ -57,31 +56,16 @@ pub fn snapshot_from_vfs(
             return snapshot_project(context, vfs, &project_path);
         }
 
-        let init_path = path.join("init.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
         }
 
-        let init_path = path.join("init.server.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.server.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
         }
 
-        let init_path = path.join("init.client.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.client.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
@@ -89,11 +73,7 @@ pub fn snapshot_from_vfs(
 
         snapshot_dir(context, vfs, path)
     } else {
-        let script_name = path
-            .file_name_trim_end(".lua")
-            .or_else(|_| path.file_name_trim_end(".luau"));
-
-        if let Ok(name) = script_name {
+        if let Ok(name) = path.file_name_trim_end(".lua") {
             match name {
                 // init scripts are handled elsewhere and should not turn into
                 // their own children.

src/snapshot_middleware/rbxm.rs

@@ -7,7 +7,6 @@ use crate::snapshot::{InstanceContext, InstanceMetadata, InstanceSnapshot};
 
 use super::util::PathExt;
 
-#[profiling::function]
 pub fn snapshot_rbxm(
     context: &InstanceContext,
     vfs: &Vfs,
@@ -22,8 +21,7 @@ pub fn snapshot_rbxm(
     let children = root_instance.children();
 
     if children.len() == 1 {
-        let child = children[0];
-        let snapshot = InstanceSnapshot::from_tree(temp_tree, child)
+        let snapshot = InstanceSnapshot::from_tree(&temp_tree, children[0])
             .name(name)
             .metadata(
                 InstanceMetadata::new()

src/snapshot_middleware/rbxmx.rs

@@ -24,8 +24,7 @@ pub fn snapshot_rbxmx(
     let children = root_instance.children();
 
     if children.len() == 1 {
-        let child = children[0];
-        let snapshot = InstanceSnapshot::from_tree(temp_tree, child)
+        let snapshot = InstanceSnapshot::from_tree(&temp_tree, children[0])
             .name(name)
             .metadata(
                 InstanceMetadata::new()

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap

@@ -11,14 +11,10 @@ metadata:
     - /foo
     - /foo/init.meta.json
     - /foo/init.lua
-    - /foo/init.luau
     - /foo/init.server.lua
-    - /foo/init.server.luau
     - /foo/init.client.lua
-    - /foo/init.client.luau
   context: {}
 name: foo
 class_name: Folder
 properties: {}
 children: []
-

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap

@@ -11,11 +11,8 @@ metadata:
     - /foo
     - /foo/init.meta.json
     - /foo/init.lua
-    - /foo/init.luau
     - /foo/init.server.lua
-    - /foo/init.server.luau
     - /foo/init.client.lua
-    - /foo/init.client.luau
   context: {}
 name: foo
 class_name: Folder
@@ -30,14 +27,10 @@ children:
         - /foo/Child
         - /foo/Child/init.meta.json
         - /foo/Child/init.lua
-        - /foo/Child/init.luau
         - /foo/Child/init.server.lua
-        - /foo/Child/init.server.luau
         - /foo/Child/init.client.lua
-        - /foo/Child/init.client.luau
       context: {}
     name: Child
     class_name: Folder
     properties: {}
     children: []
-

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap

@@ -1,29 +0,0 @@
----
-source: src/snapshot_middleware/json_model.rs
-assertion_line: 186
-expression: instance_snapshot
----
-snapshot_id: ~
-metadata:
-  ignore_unknown_instances: false
-  instigating_source:
-    Path: /foo.model.json
-  relevant_paths:
-    - /foo.model.json
-  context: {}
-name: foo
-class_name: IntValue
-properties:
-  Value:
-    Int64: 5
-children:
-  - snapshot_id: ~
-    metadata:
-      ignore_unknown_instances: false
-      relevant_paths: []
-      context: {}
-    name: The Child
-    class_name: StringValue
-    properties: {}
-    children: []
-

src/web/api.rs

@@ -244,7 +244,7 @@ impl ApiService {
     }
 }
 
-/// If this instance is represented by a script, try to find the correct .lua or .luau
+/// If this instance is represented by a script, try to find the correct .lua
 /// file to open to edit it.
 fn pick_script_path(instance: InstanceWithMeta<'_>) -> Option<PathBuf> {
     match instance.class_name() {
@@ -252,17 +252,16 @@ fn pick_script_path(instance: InstanceWithMeta<'_>) -> Option<PathBuf> {
         _ => return None,
     }
 
-    // Pick the first listed relevant path that has an extension of .lua or .luau that
+    // Pick the first listed relevant path that has an extension of .lua that
     // exists.
     instance
         .metadata()
         .relevant_paths
         .iter()
         .find(|path| {
-            // We should only ever open Lua or Luau files to be safe.
+            // We should only ever open Lua files to be safe.
             match path.extension().and_then(|ext| ext.to_str()) {
                 Some("lua") => {}
-                Some("luau") => {}
                 _ => return false,
             }
 

test-projects/attributes/default.project.json

@@ -1,16 +0,0 @@
-{
-  "name": "attributes",
-  "tree": {
-    "$className": "DataModel",
-    "Workspace": {
-      "Folder": {
-        "$className": "Folder",
-        "$properties": {
-          "Attributes": {
-            "Hello": { "Vector3": [1, 2, 3] }
-          }
-        }
-      }
-    }
-  }
-}

test-projects/tags/default.project.json

@@ -1,14 +0,0 @@
-{
-  "name": "tags",
-  "tree": {
-    "$className": "DataModel",
-    "Workspace": {
-      "Folder": {
-        "$className": "Folder",
-        "$properties": {
-          "Tags": ["Hello", "World"]
-        }
-      }
-    }
-  }
-}

testez.toml

@@ -0,0 +1,66 @@
+[[afterAll.args]]
+type = "function"
+
+[[afterEach.args]]
+type = "function"
+
+[[beforeAll.args]]
+type = "function"
+
+[[beforeEach.args]]
+type = "function"
+
+[[describe.args]]
+type = "string"
+
+[[describe.args]]
+type = "function"
+
+[[describeFOCUS.args]]
+type = "string"
+
+[[describeFOCUS.args]]
+type = "function"
+
+[[describeSKIP.args]]
+type = "string"
+
+[[describeSKIP.args]]
+type = "function"
+
+[[expect.args]]
+type = "any"
+
+[[FIXME.args]]
+type = "string"
+required = false
+
+[FOCUS]
+args = []
+
+[[it.args]]
+type = "string"
+
+[[it.args]]
+type = "function"
+
+[[itFIXME.args]]
+type = "string"
+
+[[itFIXME.args]]
+type = "function"
+
+[[itFOCUS.args]]
+type = "string"
+
+[[itFOCUS.args]]
+type = "function"
+
+[[itSKIP.args]]
+type = "string"
+
+[[itSKIP.args]]
+type = "function"
+
+[SKIP]
+args = []

testez.yml

@@ -1,53 +0,0 @@
----
-globals:
-  FIXME:
-    args:
-      - required: false
-        type: string
-  FOCUS:
-    args: []
-  SKIP:
-    args: []
-  afterAll:
-    args:
-      - type: function
-  afterEach:
-    args:
-      - type: function
-  beforeAll:
-    args:
-      - type: function
-  beforeEach:
-    args:
-      - type: function
-  describe:
-    args:
-      - type: string
-      - type: function
-  describeFOCUS:
-    args:
-      - type: string
-      - type: function
-  describeSKIP:
-    args:
-      - type: string
-      - type: function
-  expect:
-    args:
-      - type: any
-  it:
-    args:
-      - type: string
-      - type: function
-  itFIXME:
-    args:
-      - type: string
-      - type: function
-  itFOCUS:
-    args:
-      - type: string
-      - type: function
-  itSKIP:
-    args:
-      - type: string
-      - type: function

tests/tests/build.rs

@@ -21,7 +21,6 @@ macro_rules! gen_build_tests {
 }
 
 gen_build_tests! {
-    attributes,
     client_in_folder,
     client_init,
     csv_bug_145,
@@ -37,13 +36,11 @@ gen_build_tests! {
     init_meta_class_name,
     init_meta_properties,
     init_with_children,
-    issue_546,
     json_as_lua,
     json_model_in_folder,
     json_model_legacy_name,
     module_in_folder,
     module_init,
-    optional,
     project_composed_default,
     project_composed_file,
     project_root_name,
@@ -56,6 +53,7 @@ gen_build_tests! {
     txt,
     txt_in_folder,
     unresolved_values,
+    optional,
     weldconstraint,
 }