Refactor project file into its own crate

.github/workflows/ci.yml

@@ -16,10 +16,12 @@ jobs:
 
     strategy:
       matrix:
-        rust_version: [stable, 1.69.0]
+        rust_version: [stable, 1.55.0]
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
@@ -28,17 +30,6 @@ jobs:
         override: true
         profile: minimal
 
-    - name: Setup Aftman
-      uses: ok-nick/setup-aftman@v0.3.0
-      with:
-        version: 'v0.2.7'
-
-    - name: Install packages
-      run: |
-        cd plugin
-        wally install
-        cd ..
-
     - name: Build
       run: cargo build --locked --verbose
 
@@ -51,6 +42,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+        submodules: true
 
     - name: Install Rust
       uses: actions-rs/toolchain@v1
@@ -59,17 +52,6 @@ jobs:
         override: true
         components: rustfmt, clippy
 
-    - name: Setup Aftman
-      uses: ok-nick/setup-aftman@v0.3.0
-      with:
-        version: 'v0.2.7'
-
-    - name: Install packages
-      run: |
-        cd plugin
-        wally install
-        cd ..
-
     - name: Rustfmt
       run: cargo fmt -- --check
 

.github/workflows/release.yml

@@ -28,19 +28,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
 
-      - name: Setup Aftman
+      - name: Setup Foreman
-        uses: ok-nick/setup-aftman@v0.1.0
+        uses: Roblox/setup-foreman@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          trust-check: false
-          version: 'v0.2.6'
-
-      - name: Install packages
-        run: |
-          cd plugin
-          wally install
-          cd ..
 
       - name: Build Plugin
         run: rojo build plugin --output Rojo.rbxm
@@ -67,21 +61,25 @@ jobs:
       fail-fast: false
       matrix:
         # https://doc.rust-lang.org/rustc/platform-support.html
+        #
+        # FIXME: After the Rojo VS Code extension updates, add architecture
+        # names to each of these releases. We'll rename win64 to windows and add
+        # -x86_64 to each release.
         include:
           - host: linux
-            os: ubuntu-20.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-            label: linux-x86_64
+            label: linux
 
           - host: windows
             os: windows-latest
             target: x86_64-pc-windows-msvc
-            label: windows-x86_64
+            label: win64
 
           - host: macos
             os: macos-latest
             target: x86_64-apple-darwin
-            label: macos-x86_64
+            label: macos
 
           - host: macos
             os: macos-latest
@@ -94,6 +92,8 @@ jobs:
       BIN: rojo
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: true
 
       - name: Get Version from Tag
         shell: bash
@@ -110,20 +110,6 @@ jobs:
           override: true
           profile: minimal
 
-      - name: Setup Aftman
-        uses: ok-nick/setup-aftman@v0.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          trust-check: false
-          version: 'v0.2.6'
-
-      - name: Install packages
-        run: |
-          cd plugin
-          wally install
-          cd ..
-        shell: bash
-
       - name: Build Release
         run: cargo build --release --locked --verbose
         env:

.gitignore

@@ -13,12 +13,12 @@
 # Test places for the Roblox Studio Plugin
 /plugin/*.rbxlx
 
-# Packages for the Roblox Studio Plugin
-/plugin/*Packages
-
 # Roblox Studio holds 'lock' files on places
 *.rbxl.lock
 *.rbxlx.lock
 
 # Snapshot files from the 'insta' Rust crate
 **/*.snap.new
+
+# Selene generates a roblox.toml file that should not be checked in.
+/roblox.toml

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "plugin/modules/roact"]
+	path = plugin/modules/roact
+	url = https://github.com/Roblox/roact.git
+[submodule "plugin/modules/testez"]
+	path = plugin/modules/testez
+	url = https://github.com/Roblox/testez.git
+[submodule "plugin/modules/promise"]
+	path = plugin/modules/promise
+	url = https://github.com/LPGhatguy/roblox-lua-promise.git
+[submodule "plugin/modules/t"]
+	path = plugin/modules/t
+	url = https://github.com/osyrisrblx/t.git
+[submodule "plugin/modules/flipper"]
+	path = plugin/modules/flipper
+	url = https://github.com/Reselim/Flipper

.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

@@ -1,73 +1,7 @@
 # Rojo Changelog
 
 ## Unreleased Changes
-
-## [7.3.0] - April 22, 2023
-* Added `$attributes` to project format. ([#574])
-* Added `--watch` flag to `rojo sourcemap`. ([#602])
-* Added support for `init.csv` files. ([#594])
-* Added real-time sync status to the Studio plugin. ([#569])
-* Added support for copying error messages to the clipboard. ([#614])
-* Added sync locking for Team Create. ([#590])
-* Added support for specifying HTTP or HTTPS protocol in plugin. ([#642])
-* Added tooltips to buttons in the Studio plugin. ([#637])
-* Added visual diffs when connecting from the Studio plugin. ([#603])
-* Host and port are now saved in the Studio plugin. ([#613])
-* Improved padding on notifications in Studio plugin. ([#589])
-* Renamed `Common` to `Shared` in the default Rojo project. ([#611])
-* Reduced the minimum size of the Studio plugin widget. ([#606])
-* Fixed current directory in `rojo fmt-project`. ([#581])
-* Fixed errors after a session has already ended. ([#587])
-* Fixed an uncommon security permission error ([#619])
-
-[#569]: https://github.com/rojo-rbx/rojo/pull/569
-[#574]: https://github.com/rojo-rbx/rojo/pull/574
-[#581]: https://github.com/rojo-rbx/rojo/pull/581
-[#587]: https://github.com/rojo-rbx/rojo/pull/587
-[#589]: https://github.com/rojo-rbx/rojo/pull/589
-[#590]: https://github.com/rojo-rbx/rojo/pull/590
-[#594]: https://github.com/rojo-rbx/rojo/pull/594
-[#602]: https://github.com/rojo-rbx/rojo/pull/602
-[#603]: https://github.com/rojo-rbx/rojo/pull/603
-[#606]: https://github.com/rojo-rbx/rojo/pull/606
-[#611]: https://github.com/rojo-rbx/rojo/pull/611
-[#613]: https://github.com/rojo-rbx/rojo/pull/613
-[#614]: https://github.com/rojo-rbx/rojo/pull/614
-[#619]: https://github.com/rojo-rbx/rojo/pull/619
-[#637]: https://github.com/rojo-rbx/rojo/pull/637
-[#642]: https://github.com/rojo-rbx/rojo/pull/642
-[7.3.0]: https://github.com/rojo-rbx/rojo/releases/tag/v7.3.0
-
-## [7.2.1] - July 8, 2022
-* Fixed notification sound by changing it to a generic sound. ([#566])
-* Added setting to turn off sound effects. ([#568])
-
-[#566]: https://github.com/rojo-rbx/rojo/pull/566
-[#568]: https://github.com/rojo-rbx/rojo/pull/568
-[7.2.1]: https://github.com/rojo-rbx/rojo/releases/tag/v7.2.1
-
-## [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])

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rojo"
-version = "7.3.0"
+version = "7.1.1"
-rust-version = "1.68.2"
 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,8 +27,6 @@ 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/*"]
 
@@ -42,6 +39,7 @@ name = "build"
 harness = false
 
 [dependencies]
+rojo-project = { path = "crates/rojo-project" }
 memofs = { version = "0.2.0", path = "crates/memofs" }
 
 # These dependencies can be uncommented when working on rbx-dom simultaneously
@@ -51,11 +49,11 @@ 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.7.0"
+rbx_binary = "0.6.4"
-rbx_dom_weak = "2.4.0"
+rbx_dom_weak = "2.3.0"
 rbx_reflection = "4.2.0"
-rbx_reflection_database = "0.2.6"
+rbx_reflection_database = "0.2.2"
-rbx_xml = "0.13.0"
+rbx_xml = "0.12.3"
 
 anyhow = "1.0.44"
 backtrace = "0.3.61"
@@ -73,7 +71,7 @@ log = "0.4.14"
 maplit = "1.0.2"
 notify = "4.0.17"
 opener = "0.5.0"
-reqwest = { version = "0.11.10", features = ["blocking", "json", "native-tls-vendored"] }
+reqwest = { version = "0.11.10", features = ["blocking", "json"] }
 ritz = "0.1.0"
 roblox_install = "1.0.0"
 serde = { version = "1.0.130", features = ["derive", "rc"] }
@@ -83,8 +81,6 @@ 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"
@@ -102,7 +98,7 @@ maplit = "1.0.2"
 rojo-insta-ext = { path = "crates/rojo-insta-ext" }
 
 criterion = "0.3.5"
-insta = { version = "1.8.0", features = ["redactions", "yaml"] }
+insta = { version = "1.8.0", features = ["redactions"] }
 paste = "1.0.5"
 pretty_assertions = "1.2.1"
 serde_yaml = "0.8.21"

README.md

@@ -8,7 +8,6 @@
     <a href="https://github.com/rojo-rbx/rojo/actions"><img src="https://github.com/rojo-rbx/rojo/workflows/CI/badge.svg" alt="Actions status" /></a>
     <a href="https://crates.io/crates/rojo"><img src="https://img.shields.io/crates/v/rojo.svg?label=latest%20release" alt="Latest server version" /></a>
     <a href="https://rojo.space/docs"><img src="https://img.shields.io/badge/docs-website-brightgreen.svg" alt="Rojo Documentation" /></a>
-    <a href="https://www.patreon.com/lpghatguy"><img src="https://img.shields.io/badge/sponsor-patreon-red" alt="Patreon" /></a>
 </div>
 
 <hr />
@@ -41,7 +40,7 @@ Check out our [contribution guide](CONTRIBUTING.md) for detailed instructions fo
 
 Pull requests are welcome!
 
-Rojo supports Rust 1.58.1 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.

aftman.toml

@@ -1,5 +0,0 @@
-[tools]
-wally = "UpliftGames/wally@0.3.1"
-rojo = "rojo-rbx/rojo@7.2.1"
-selene = "Kampfkarren/selene@0.20.0"
-run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0"

assets/default-place-project/default.project.json

@@ -4,7 +4,7 @@
     "$className": "DataModel",
 
     "ReplicatedStorage": {
-      "Shared": {
+      "Common": {
         "$path": "src/shared"
       }
     },

benches/build.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
 use tempfile::{tempdir, TempDir};
 
-use librojo::cli::BuildCommand;
+use librojo::cli::{build, BuildCommand};
 
 pub fn benchmark_small_place(c: &mut Criterion) {
     bench_build_place(c, "Small Place", "test-projects/benchmark_small_place")
@@ -20,7 +20,7 @@ fn bench_build_place(c: &mut Criterion, name: &str, path: &str) {
     group.bench_function("build", |b| {
         b.iter_batched(
             || place_setup(path),
-            |(_dir, options)| options.run().unwrap(),
+            |(_dir, options)| build(options).unwrap(),
             BatchSize::SmallInput,
         )
     });

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;
             }
 
@@ -43,6 +43,8 @@ fn main() -> Result<(), anyhow::Error> {
     let root_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
     let plugin_root = PathBuf::from(root_dir).join("plugin");
 
+    let plugin_modules = plugin_root.join("modules");
+
     let snapshot = VfsSnapshot::dir(hashmap! {
         "default.project.json" => snapshot_from_fs_path(&plugin_root.join("default.project.json"))?,
         "fmt" => snapshot_from_fs_path(&plugin_root.join("fmt"))?,
@@ -50,7 +52,20 @@ fn main() -> Result<(), anyhow::Error> {
         "log" => snapshot_from_fs_path(&plugin_root.join("log"))?,
         "rbx_dom_lua" => snapshot_from_fs_path(&plugin_root.join("rbx_dom_lua"))?,
         "src" => snapshot_from_fs_path(&plugin_root.join("src"))?,
-        "Packages" => snapshot_from_fs_path(&plugin_root.join("Packages"))?,
+        "modules" => VfsSnapshot::dir(hashmap! {
+            "roact" => VfsSnapshot::dir(hashmap! {
+                "src" => snapshot_from_fs_path(&plugin_modules.join("roact").join("src"))?
+            }),
+            "promise" => VfsSnapshot::dir(hashmap! {
+                "lib" => snapshot_from_fs_path(&plugin_modules.join("promise").join("lib"))?
+            }),
+            "t" => VfsSnapshot::dir(hashmap! {
+                "lib" => snapshot_from_fs_path(&plugin_modules.join("t").join("lib"))?
+            }),
+            "flipper" => VfsSnapshot::dir(hashmap! {
+                "src" => snapshot_from_fs_path(&plugin_modules.join("flipper").join("src"))?
+            }),
+        }),
     });
 
     let out_path = Path::new(&out_dir).join("plugin.bincode");

crates/rojo-project/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "rojo-project"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.57"
+globset = { version = "0.4.8", features = ["serde1"] }
+log = "0.4.17"
+rbx_dom_weak = "2.3.0"
+rbx_reflection = "4.2.0"
+rbx_reflection_database = "0.2.4"
+serde = { version = "1.0.137", features = ["derive"] }
+serde_json = "1.0.81"

crates/rojo-project/README.md

@@ -0,0 +1,4 @@
+# rojo-project
+Project file format crate for [Rojo].
+
+[Rojo]: https://rojo.space

crates/rojo-project/src/glob.rs

@@ -1,6 +1,3 @@
-//! Wrapper around globset's Glob type that has better serialization
-//! characteristics by coupling Glob and GlobMatcher into a single type.
-
 use std::path::Path;
 
 use globset::{Glob as InnerGlob, GlobMatcher};
@@ -8,6 +5,8 @@ use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 
 pub use globset::Error;
 
+/// Wrapper around globset's Glob type that has better serialization
+/// characteristics by coupling Glob and GlobMatcher into a single type.
 #[derive(Debug, Clone)]
 pub struct Glob {
     inner: InnerGlob,

crates/rojo-project/src/lib.rs

@@ -0,0 +1,7 @@
+pub mod glob;
+mod path_serializer;
+mod project;
+mod resolution;
+
+pub use project::{OptionalPathNode, PathNode, Project, ProjectNode};
+pub use resolution::{AmbiguousValue, UnresolvedValue};

crates/rojo-project/src/path_serializer.rs

@@ -0,0 +1,21 @@
+//! Path serializer is used to serialize absolute paths in a cross-platform way,
+//! by replacing all directory separators with /.
+
+use std::path::Path;
+
+use serde::Serializer;
+
+pub fn serialize_absolute<S, T>(path: T, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: AsRef<Path>,
+{
+    let as_str = path
+        .as_ref()
+        .as_os_str()
+        .to_str()
+        .expect("Invalid Unicode in file path, cannot serialize");
+    let replaced = as_str.replace("\\", "/");
+
+    serializer.serialize_str(&replaced)
+}

crates/rojo-project/src/project.rs

@@ -0,0 +1,363 @@
+use std::collections::{BTreeMap, HashMap, HashSet};
+use std::fs;
+use std::net::IpAddr;
+use std::path::{Path, PathBuf};
+
+use anyhow::Context;
+use serde::{Deserialize, Serialize};
+
+use crate::glob::Glob;
+use crate::resolution::UnresolvedValue;
+
+static PROJECT_FILENAME: &str = "default.project.json";
+
+/// Contains all of the configuration for a Rojo-managed project.
+///
+/// Rojo project files are stored in `.project.json` files.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(deny_unknown_fields, rename_all = "camelCase")]
+pub struct Project {
+    /// The name of the top-level instance described by the project.
+    pub name: String,
+
+    /// The tree of instances described by this project. Projects always
+    /// describe at least one instance.
+    pub tree: ProjectNode,
+
+    /// If specified, sets the default port that `rojo serve` should use when
+    /// using this project for live sync.
+    ///
+    /// Can be overriden with the `--port` flag.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub serve_port: Option<u16>,
+
+    /// If specified, sets the default IP address that `rojo serve` should use
+    /// when using this project for live sync.
+    ///
+    /// Can be overridden with the `--address` flag.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub serve_address: Option<IpAddr>,
+
+    /// If specified, contains the set of place IDs that this project is
+    /// compatible with when doing live sync.
+    ///
+    /// This setting is intended to help prevent syncing a Rojo project into the
+    /// wrong Roblox place.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub serve_place_ids: Option<HashSet<u64>>,
+
+    /// If specified, sets the current place's place ID when connecting to the
+    /// Rojo server from Roblox Studio.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub place_id: Option<u64>,
+
+    /// If specified, sets the current place's game ID when connecting to the
+    /// Rojo server from Roblox Studio.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub game_id: Option<u64>,
+
+    /// A list of globs, relative to the folder the project file is in, that
+    /// match files that should be excluded if Rojo encounters them.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub glob_ignore_paths: Vec<Glob>,
+
+    /// The path to the file that this project came from. Relative paths in the
+    /// project should be considered relative to the parent of this field, also
+    /// given by `Project::folder_location`.
+    #[serde(skip)]
+    pub file_location: PathBuf,
+}
+
+impl Project {
+    /// Tells whether the given path describes a Rojo project.
+    pub fn is_project_file(path: &Path) -> bool {
+        path.file_name()
+            .and_then(|name| name.to_str())
+            .map(|name| name.ends_with(".project.json"))
+            .unwrap_or(false)
+    }
+
+    /// Loads a project file from a slice and a path that indicates where the
+    /// project should resolve paths relative to.
+    pub fn load_from_slice(contents: &[u8], project_file_location: &Path) -> anyhow::Result<Self> {
+        let mut project: Self = serde_json::from_slice(&contents).with_context(|| {
+            format!(
+                "Error parsing Rojo project at {}",
+                project_file_location.display()
+            )
+        })?;
+
+        project.file_location = project_file_location.to_path_buf();
+        project.check_compatibility();
+        Ok(project)
+    }
+
+    /// Fuzzy-find a Rojo project and load it.
+    pub fn load_fuzzy(fuzzy_project_location: &Path) -> anyhow::Result<Option<Self>> {
+        if let Some(project_path) = Self::locate(fuzzy_project_location) {
+            let project = Self::load_exact(&project_path)?;
+
+            Ok(Some(project))
+        } else {
+            Ok(None)
+        }
+    }
+
+    /// Gives the path that all project file paths should resolve relative to.
+    pub fn folder_location(&self) -> &Path {
+        self.file_location.parent().unwrap()
+    }
+
+    /// Attempt to locate a project represented by the given path.
+    ///
+    /// This will find a project if the path refers to a `.project.json` file,
+    /// or is a folder that contains a `default.project.json` file.
+    fn locate(path: &Path) -> Option<PathBuf> {
+        let meta = fs::metadata(path).ok()?;
+
+        if meta.is_file() {
+            if Project::is_project_file(path) {
+                Some(path.to_path_buf())
+            } else {
+                None
+            }
+        } else {
+            let child_path = path.join(PROJECT_FILENAME);
+            let child_meta = fs::metadata(&child_path).ok()?;
+
+            if child_meta.is_file() {
+                Some(child_path)
+            } else {
+                // This is a folder with the same name as a Rojo default project
+                // file.
+                //
+                // That's pretty weird, but we can roll with it.
+                None
+            }
+        }
+    }
+
+    fn load_exact(project_file_location: &Path) -> anyhow::Result<Self> {
+        let contents = fs::read_to_string(project_file_location)?;
+
+        let mut project: Project = serde_json::from_str(&contents).with_context(|| {
+            format!(
+                "Error parsing Rojo project at {}",
+                project_file_location.display()
+            )
+        })?;
+
+        project.file_location = project_file_location.to_path_buf();
+        project.check_compatibility();
+
+        Ok(project)
+    }
+
+    /// Checks if there are any compatibility issues with this project file and
+    /// warns the user if there are any.
+    fn check_compatibility(&self) {
+        self.tree.validate_reserved_names();
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
+pub struct OptionalPathNode {
+    #[serde(serialize_with = "crate::path_serializer::serialize_absolute")]
+    pub optional: PathBuf,
+}
+
+impl OptionalPathNode {
+    pub fn new(optional: PathBuf) -> Self {
+        OptionalPathNode { optional }
+    }
+}
+
+/// Describes a path that is either optional or required
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum PathNode {
+    Required(#[serde(serialize_with = "crate::path_serializer::serialize_absolute")] PathBuf),
+    Optional(OptionalPathNode),
+}
+
+impl PathNode {
+    pub fn path(&self) -> &Path {
+        match self {
+            PathNode::Required(pathbuf) => &pathbuf,
+            PathNode::Optional(OptionalPathNode { optional }) => &optional,
+        }
+    }
+}
+
+/// Describes an instance and its descendants in a project.
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
+pub struct ProjectNode {
+    /// If set, defines the ClassName of the described instance.
+    ///
+    /// `$className` MUST be set if `$path` is not set.
+    ///
+    /// `$className` CANNOT be set if `$path` is set and the instance described
+    /// by that path has a ClassName other than Folder.
+    #[serde(rename = "$className", skip_serializing_if = "Option::is_none")]
+    pub class_name: Option<String>,
+
+    /// Contains all of the children of the described instance.
+    #[serde(flatten)]
+    pub children: BTreeMap<String, ProjectNode>,
+
+    /// The properties that will be assigned to the resulting instance.
+    #[serde(
+        rename = "$properties",
+        default,
+        skip_serializing_if = "HashMap::is_empty"
+    )]
+    pub properties: HashMap<String, UnresolvedValue>,
+
+    /// Defines the behavior when Rojo encounters unknown instances in Roblox
+    /// Studio during live sync. `$ignoreUnknownInstances` should be considered
+    /// a large hammer and used with care.
+    ///
+    /// If set to `true`, those instances will be left alone. This may cause
+    /// issues when files that turn into instances are removed while Rojo is not
+    /// running.
+    ///
+    /// If set to `false`, Rojo will destroy any instances it does not
+    /// recognize.
+    ///
+    /// If unset, its default value depends on other settings:
+    /// - If `$path` is not set, defaults to `true`
+    /// - If `$path` is set, defaults to `false`
+    #[serde(
+        rename = "$ignoreUnknownInstances",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub ignore_unknown_instances: Option<bool>,
+
+    /// Defines that this instance should come from the given file path. This
+    /// path can point to any file type supported by Rojo, including Lua files
+    /// (`.lua`), Roblox models (`.rbxm`, `.rbxmx`), and localization table
+    /// spreadsheets (`.csv`).
+    #[serde(rename = "$path", skip_serializing_if = "Option::is_none")]
+    pub path: Option<PathNode>,
+}
+
+impl ProjectNode {
+    fn validate_reserved_names(&self) {
+        for (name, child) in &self.children {
+            if name.starts_with('$') {
+                log::warn!(
+                    "Keys starting with '$' are reserved by Rojo to ensure forward compatibility."
+                );
+                log::warn!(
+                    "This project uses the key '{}', which should be renamed.",
+                    name
+                );
+            }
+
+            child.validate_reserved_names();
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn path_node_required() {
+        let path_node: PathNode = serde_json::from_str(r#""src""#).unwrap();
+        assert_eq!(path_node, PathNode::Required(PathBuf::from("src")));
+    }
+
+    #[test]
+    fn path_node_optional() {
+        let path_node: PathNode = serde_json::from_str(r#"{ "optional": "src" }"#).unwrap();
+        assert_eq!(
+            path_node,
+            PathNode::Optional(OptionalPathNode::new(PathBuf::from("src")))
+        );
+    }
+
+    #[test]
+    fn project_node_required() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$path": "src"
+            }"#,
+        )
+        .unwrap();
+
+        assert_eq!(
+            project_node.path,
+            Some(PathNode::Required(PathBuf::from("src")))
+        );
+    }
+
+    #[test]
+    fn project_node_optional() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$path": { "optional": "src" }
+            }"#,
+        )
+        .unwrap();
+
+        assert_eq!(
+            project_node.path,
+            Some(PathNode::Optional(OptionalPathNode::new(PathBuf::from(
+                "src"
+            ))))
+        );
+    }
+
+    #[test]
+    fn project_node_none() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$className": "Folder"
+            }"#,
+        )
+        .unwrap();
+
+        assert_eq!(project_node.path, None);
+    }
+
+    #[test]
+    fn project_node_optional_serialize_absolute() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$path": { "optional": "..\\src" }
+            }"#,
+        )
+        .unwrap();
+
+        let serialized = serde_json::to_string(&project_node).unwrap();
+        assert_eq!(serialized, r#"{"$path":{"optional":"../src"}}"#);
+    }
+
+    #[test]
+    fn project_node_optional_serialize_absolute_no_change() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$path": { "optional": "../src" }
+            }"#,
+        )
+        .unwrap();
+
+        let serialized = serde_json::to_string(&project_node).unwrap();
+        assert_eq!(serialized, r#"{"$path":{"optional":"../src"}}"#);
+    }
+
+    #[test]
+    fn project_node_optional_serialize_optional() {
+        let project_node: ProjectNode = serde_json::from_str(
+            r#"{
+                "$path": "..\\src"
+            }"#,
+        )
+        .unwrap();
+
+        let serialized = serde_json::to_string(&project_node).unwrap();
+        assert_eq!(serialized, r#"{"$path":"../src"}"#);
+    }
+}

crates/rojo-project/src/resolution.rs

@@ -0,0 +1,294 @@
+use std::borrow::Borrow;
+
+use anyhow::format_err;
+use rbx_dom_weak::types::{
+    CFrame, Color3, Content, Enum, Matrix3, Tags, Variant, VariantType, Vector2, Vector3,
+};
+use rbx_reflection::{DataType, PropertyDescriptor};
+use serde::{Deserialize, Serialize};
+
+/// A user-friendly version of `Variant` that supports specifying ambiguous
+/// values. Ambiguous values need a reflection database to be resolved to a
+/// usable value.
+///
+/// This type is used in Rojo projects and JSON models to make specifying the
+/// most common types of properties, like strings or vectors, much easier.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum UnresolvedValue {
+    FullyQualified(Variant),
+    Ambiguous(AmbiguousValue),
+}
+
+impl UnresolvedValue {
+    pub fn resolve(self, class_name: &str, prop_name: &str) -> anyhow::Result<Variant> {
+        match self {
+            UnresolvedValue::FullyQualified(full) => Ok(full),
+            UnresolvedValue::Ambiguous(partial) => partial.resolve(class_name, prop_name),
+        }
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum AmbiguousValue {
+    Bool(bool),
+    String(String),
+    StringArray(Vec<String>),
+    Number(f64),
+    Array2([f64; 2]),
+    Array3([f64; 3]),
+    Array4([f64; 4]),
+    Array12([f64; 12]),
+}
+
+impl AmbiguousValue {
+    pub fn resolve(self, class_name: &str, prop_name: &str) -> anyhow::Result<Variant> {
+        let property = find_descriptor(class_name, prop_name)
+            .ok_or_else(|| format_err!("Unknown property {}.{}", class_name, prop_name))?;
+
+        match &property.data_type {
+            DataType::Enum(enum_name) => {
+                let database = rbx_reflection_database::get();
+
+                let enum_descriptor = database.enums.get(enum_name).ok_or_else(|| {
+                    format_err!("Unknown enum {}. This is a Rojo bug!", enum_name)
+                })?;
+
+                let error = |what: &str| {
+                    let mut all_values = enum_descriptor
+                        .items
+                        .keys()
+                        .map(|value| value.borrow())
+                        .collect::<Vec<_>>();
+                    all_values.sort();
+
+                    let examples = nonexhaustive_list(&all_values);
+
+                    format_err!(
+                        "Invalid value for property {}.{}. Got {} but \
+                         expected a member of the {} enum such as {}",
+                        class_name,
+                        prop_name,
+                        what,
+                        enum_name,
+                        examples,
+                    )
+                };
+
+                let value = match self {
+                    AmbiguousValue::String(value) => value,
+                    unresolved => return Err(error(unresolved.describe())),
+                };
+
+                let resolved = enum_descriptor
+                    .items
+                    .get(value.as_str())
+                    .ok_or_else(|| error(value.as_str()))?;
+
+                Ok(Enum::from_u32(*resolved).into())
+            }
+            DataType::Value(variant_ty) => match (variant_ty, self) {
+                (VariantType::Bool, AmbiguousValue::Bool(value)) => Ok(value.into()),
+
+                (VariantType::Float32, AmbiguousValue::Number(value)) => Ok((value as f32).into()),
+                (VariantType::Float64, AmbiguousValue::Number(value)) => Ok(value.into()),
+                (VariantType::Int32, AmbiguousValue::Number(value)) => Ok((value as i32).into()),
+                (VariantType::Int64, AmbiguousValue::Number(value)) => Ok((value as i64).into()),
+
+                (VariantType::String, AmbiguousValue::String(value)) => Ok(value.into()),
+                (VariantType::Tags, AmbiguousValue::StringArray(value)) => {
+                    Ok(Tags::from(value).into())
+                }
+                (VariantType::Content, AmbiguousValue::String(value)) => {
+                    Ok(Content::from(value).into())
+                }
+
+                (VariantType::Vector2, AmbiguousValue::Array2(value)) => {
+                    Ok(Vector2::new(value[0] as f32, value[1] as f32).into())
+                }
+
+                (VariantType::Vector3, AmbiguousValue::Array3(value)) => {
+                    Ok(Vector3::new(value[0] as f32, value[1] as f32, value[2] as f32).into())
+                }
+
+                (VariantType::Color3, AmbiguousValue::Array3(value)) => {
+                    Ok(Color3::new(value[0] as f32, value[1] as f32, value[2] as f32).into())
+                }
+
+                (VariantType::CFrame, AmbiguousValue::Array12(value)) => {
+                    let value = value.map(|v| v as f32);
+                    let pos = Vector3::new(value[0], value[1], value[2]);
+                    let orientation = Matrix3::new(
+                        Vector3::new(value[3], value[4], value[5]),
+                        Vector3::new(value[6], value[7], value[8]),
+                        Vector3::new(value[9], value[10], value[11]),
+                    );
+
+                    Ok(CFrame::new(pos, orientation).into())
+                }
+
+                (_, unresolved) => Err(format_err!(
+                    "Wrong type of value for property {}.{}. Expected {:?}, got {}",
+                    class_name,
+                    prop_name,
+                    variant_ty,
+                    unresolved.describe(),
+                )),
+            },
+            _ => Err(format_err!(
+                "Unknown data type for property {}.{}",
+                class_name,
+                prop_name
+            )),
+        }
+    }
+
+    fn describe(&self) -> &'static str {
+        match self {
+            AmbiguousValue::Bool(_) => "a bool",
+            AmbiguousValue::String(_) => "a string",
+            AmbiguousValue::StringArray(_) => "an array of strings",
+            AmbiguousValue::Number(_) => "a number",
+            AmbiguousValue::Array2(_) => "an array of two numbers",
+            AmbiguousValue::Array3(_) => "an array of three numbers",
+            AmbiguousValue::Array4(_) => "an array of four numbers",
+            AmbiguousValue::Array12(_) => "an array of twelve numbers",
+        }
+    }
+}
+
+fn find_descriptor(
+    class_name: &str,
+    prop_name: &str,
+) -> Option<&'static PropertyDescriptor<'static>> {
+    let database = rbx_reflection_database::get();
+    let mut current_class_name = class_name;
+
+    loop {
+        let class = database.classes.get(current_class_name)?;
+        if let Some(descriptor) = class.properties.get(prop_name) {
+            return Some(descriptor);
+        }
+
+        current_class_name = class.superclass.as_deref()?;
+    }
+}
+
+/// Outputs a string containing up to MAX_ITEMS entries from the given list. If
+/// there are more than MAX_ITEMS items, the number of remaining items will be
+/// listed.
+fn nonexhaustive_list(values: &[&str]) -> String {
+    use std::fmt::Write;
+
+    const MAX_ITEMS: usize = 8;
+
+    let mut output = String::new();
+
+    let last_index = values.len() - 1;
+    let main_length = last_index.min(9);
+
+    let main_list = &values[..main_length];
+    for value in main_list {
+        output.push_str(value);
+        output.push_str(", ");
+    }
+
+    if values.len() > MAX_ITEMS {
+        write!(output, "or {} more", values.len() - main_length).unwrap();
+    } else {
+        output.push_str("or ");
+        output.push_str(values[values.len() - 1]);
+    }
+
+    output
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    fn resolve(class: &str, prop: &str, json_value: &str) -> Variant {
+        let unresolved: UnresolvedValue = serde_json::from_str(json_value).unwrap();
+        unresolved.resolve(class, prop).unwrap()
+    }
+
+    #[test]
+    fn bools() {
+        assert_eq!(resolve("BoolValue", "Value", "false"), Variant::Bool(false));
+
+        // Script.Disabled is inherited from BaseScript
+        assert_eq!(resolve("Script", "Disabled", "true"), Variant::Bool(true));
+    }
+
+    #[test]
+    fn strings() {
+        // String literals can stay as strings
+        assert_eq!(
+            resolve("StringValue", "Value", "\"Hello!\""),
+            Variant::String("Hello!".into()),
+        );
+
+        // String literals can also turn into Content
+        assert_eq!(
+            resolve("Sky", "MoonTextureId", "\"rbxassetid://12345\""),
+            Variant::Content("rbxassetid://12345".into()),
+        );
+
+        // What about BinaryString values? For forward-compatibility reasons, we
+        // don't support any shorthands for BinaryString.
+        //
+        // assert_eq!(
+        //     resolve("Folder", "Tags", "\"a\\u0000b\\u0000c\""),
+        //     Variant::BinaryString(b"a\0b\0c".to_vec().into()),
+        // );
+    }
+
+    #[test]
+    fn numbers() {
+        assert_eq!(
+            resolve("Part", "CollisionGroupId", "123"),
+            Variant::Int32(123),
+        );
+
+        assert_eq!(
+            resolve("Folder", "SourceAssetId", "532413"),
+            Variant::Int64(532413),
+        );
+
+        assert_eq!(resolve("Part", "Transparency", "1"), Variant::Float32(1.0));
+        assert_eq!(resolve("NumberValue", "Value", "1"), Variant::Float64(1.0));
+    }
+
+    #[test]
+    fn vectors() {
+        assert_eq!(
+            resolve("ParticleEmitter", "SpreadAngle", "[1, 2]"),
+            Variant::Vector2(Vector2::new(1.0, 2.0)),
+        );
+
+        assert_eq!(
+            resolve("Part", "Position", "[4, 5, 6]"),
+            Variant::Vector3(Vector3::new(4.0, 5.0, 6.0)),
+        );
+    }
+
+    #[test]
+    fn colors() {
+        assert_eq!(
+            resolve("Part", "Color", "[1, 1, 1]"),
+            Variant::Color3(Color3::new(1.0, 1.0, 1.0)),
+        );
+
+        // There aren't any user-facing Color3uint8 properties. If there are
+        // some, we should treat them the same in the future.
+    }
+
+    #[test]
+    fn enums() {
+        assert_eq!(
+            resolve("Lighting", "Technology", "\"Voxel\""),
+            Variant::Enum(Enum::from_u32(1)),
+        );
+    }
+}

foreman.toml

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

plugin/default.project.json

@@ -1,25 +1,33 @@
 {
-	"name": "Rojo",
+  "name": "Rojo",
-	"tree": {
+  "tree": {
-		"$className": "Folder",
+    "$className": "Folder",
-		"Plugin": {
+    "Plugin": {
-			"$path": "src"
+      "$path": "src"
-		},
+    },
-		"Packages": {
+    "Log": {
-			"$path": "Packages",
+      "$path": "log"
-
+    },
-			"Log": {
+    "Http": {
-				"$path": "log"
+      "$path": "http"
-			},
+    },
-			"Http": {
+    "Fmt": {
-				"$path": "http"
+      "$path": "fmt"
-			},
+    },
-			"Fmt": {
+    "RbxDom": {
-				"$path": "fmt"
+      "$path": "rbx_dom_lua"
-			},
+    },
-			"RbxDom": {
+    "Roact": {
-				"$path": "rbx_dom_lua"
+      "$path": "modules/roact/src"
-			}
+    },
-		}
+    "Promise": {
-	}
+      "$path": "modules/promise/lib"
-}
+    },
+    "t": {
+      "$path": "modules/t/lib"
+    },
+    "Flipper": {
+      "$path": "modules/flipper/src"
+    }
+  }
+}

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 = {}
@@ -238,23 +201,6 @@ types = {
 		toPod = serializeFloat,
 	},
 
-	Font = {
-		fromPod = function(pod)
-			return Font.new(
-				pod.family,
-				if pod.weight ~= nil then Enum.FontWeight[pod.weight] else nil,
-				if pod.style ~= nil then Enum.FontStyle[pod.style] else nil
-			)
-		end,
-		toPod = function(roblox)
-			return {
-				family = roblox.Family,
-				weight = roblox.Weight.Name,
-				style = roblox.Style.Name,
-			}
-		end,
-	},
-
 	Int32 = {
 		fromPod = identity,
 		toPod = identity,
@@ -487,6 +433,8 @@ types = {
 	},
 }
 
+local EncodedValue = {}
+
 function EncodedValue.decode(encodedValue)
 	local ty, value = next(encodedValue)
 
@@ -511,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/PropertyDescriptor.lua

@@ -53,11 +53,6 @@ function PropertyDescriptor:read(instance)
 	end
 
 	if self.scriptability == "Custom" then
-		if customProperties[self.className] == nil then
-			local fullName = ("%s.%s"):format(instance.className, self.name)
-			return false, Error.new(Error.Kind.PropertyNotReadable, fullName)
-		end
-
 		local interface = customProperties[self.className][self.name]
 
 		return interface.read(instance, self.name)
@@ -84,11 +79,6 @@ function PropertyDescriptor:write(instance, value)
 	end
 
 	if self.scriptability == "Custom" then
-		if customProperties[self.className] == nil then
-			local fullName = ("%s.%s"):format(instance.className, self.name)
-			return false, Error.new(Error.Kind.PropertyNotWritable, fullName)
-		end
-
 		local interface = customProperties[self.className][self.name]
 
 		return interface.write(instance, self.name, value)

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": [
@@ -207,17 +138,6 @@
     },
     "ty": "Float64"
   },
-  "Font": {
-    "value": {
-      "Font": {
-        "family": "rbxasset://fonts/families/SourceSansPro.json",
-        "weight": "Regular",
-        "style": "Normal",
-        "cachedFaceId": null
-      }
-    },
-    "ty": "Font"
-  },
   "Int32": {
     "value": {
       "Int32": 6014

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)
@@ -61,14 +41,4 @@ return {
 			end,
 		},
 	},
-	Model = {
-		Scale = {
-			read = function(instance, _, _)
-				return true, instance:GetScale()
-			end,
-			write = function(instance, _, value)
-				return true, instance:ScaleTo(value)
-			end,
-		},
-	},
 }

plugin/run-tests.server.lua

@@ -1,11 +1,19 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local TestEZ = require(ReplicatedStorage.Packages.TestEZ)
+local TestEZ = require(ReplicatedStorage.TestEZ)
 
 local Rojo = ReplicatedStorage.Rojo
 
-local Settings = require(Rojo.Plugin.Settings)
+local DevSettings = require(Rojo.Plugin.DevSettings)
-Settings:set("logLevel", "Trace")
+
-Settings:set("typecheckingEnabled", true)
+local setDevSettings = not DevSettings:hasChangedValues()
+
+if setDevSettings then
+	DevSettings:createTestSettings()
+end
 
 require(Rojo.Plugin.runTests)(TestEZ)
+
+if setDevSettings then
+	DevSettings:resetValues()
+end

plugin/src/ApiContext.lua

@@ -1,7 +1,6 @@
-local Packages = script.Parent.Parent.Packages
+local Http = require(script.Parent.Parent.Http)
-local Http = require(Packages.Http)
+local Log = require(script.Parent.Parent.Log)
-local Log = require(Packages.Log)
+local Promise = require(script.Parent.Parent.Promise)
-local Promise = require(Packages.Promise)
 
 local Config = require(script.Parent.Config)
 local Types = require(script.Parent.Types)
@@ -86,7 +85,7 @@ local ApiContext = {}
 ApiContext.__index = ApiContext
 
 function ApiContext.new(baseUrl)
-	assert(type(baseUrl) == "string", "baseUrl must be a string")
+	assert(type(baseUrl) == "string")
 
 	local self = {
 		__baseUrl = baseUrl,
@@ -249,4 +248,4 @@ function ApiContext:open(id)
 		end)
 end
 
-return ApiContext
+return ApiContext

plugin/src/App/Components/BorderedContainer.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -24,10 +23,8 @@ local function BorderedContainer(props)
 			layoutOrder = props.layoutOrder,
 		}, {
 			Content = e("Frame", {
-				Size = UDim2.new(1, -2, 1, -2),
+				Size = UDim2.new(1, 0, 1, 0),
-				Position = UDim2.new(0, 1, 0, 1),
 				BackgroundTransparency = 1,
-				ZIndex = 2,
 			}, props[Roact.Children]),
 
 			Border = e(SlicedImage, {
@@ -41,4 +38,4 @@ local function BorderedContainer(props)
 	end)
 end
 
-return BorderedContainer
+return BorderedContainer

plugin/src/App/Components/Checkbox.lua

@@ -1,16 +1,14 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
+local Flipper = require(Rojo.Flipper)
 
 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
 local bindingUtil = require(Plugin.App.bindingUtil)
 
 local SlicedImage = require(script.Parent.SlicedImage)
-local Tooltip = require(script.Parent.Tooltip)
 
 local e = Roact.createElement
 
@@ -53,10 +51,6 @@ function Checkbox:render()
 
 			[Roact.Event.Activated] = self.props.onClick,
 		}, {
-			StateTip = e(Tooltip.Trigger, {
-				text = if self.props.active then "Enabled" else "Disabled",
-			}),
-
 			Active = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBackground,
 				color = theme.Active.BackgroundColor,
@@ -99,4 +93,4 @@ function Checkbox:render()
 	end)
 end
 
-return Checkbox
+return Checkbox

plugin/src/App/Components/Dropdown.lua

@@ -1,169 +0,0 @@
-local TextService = game:GetService("TextService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Flipper = require(Packages.Flipper)
-
-local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.App.Theme)
-local bindingUtil = require(Plugin.App.bindingUtil)
-
-local SlicedImage = require(script.Parent.SlicedImage)
-local ScrollingFrame = require(script.Parent.ScrollingFrame)
-
-local e = Roact.createElement
-
-local Dropdown = Roact.Component:extend("Dropdown")
-
-function Dropdown:init()
-	self.openMotor = Flipper.SingleMotor.new(0)
-	self.openBinding = bindingUtil.fromMotor(self.openMotor)
-
-	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
-
-	self:setState({
-		open = false,
-	})
-end
-
-function Dropdown:didUpdate()
-	self.openMotor:setGoal(
-		Flipper.Spring.new(self.state.open and 1 or 0, {
-			frequency = 6,
-			dampingRatio = 1.1,
-		})
-	)
-end
-
-function Dropdown:render()
-	return Theme.with(function(theme)
-		theme = theme.Dropdown
-
-		local optionButtons = {}
-		local width = -1
-		for i, option in self.props.options do
-			local text = tostring(option or "")
-			local textSize = TextService:GetTextSize(
-				text, 15, Enum.Font.GothamMedium,
-				Vector2.new(math.huge, 20)
-			)
-			if textSize.X > width then
-				width = textSize.X
-			end
-
-			optionButtons[text] = e("TextButton", {
-				Text = text,
-				LayoutOrder = i,
-				Size = UDim2.new(1, 0, 0, 24),
-				BackgroundColor3 = theme.BackgroundColor,
-				TextTransparency = self.props.transparency,
-				BackgroundTransparency = self.props.transparency,
-				BorderSizePixel = 0,
-				TextColor3 = theme.TextColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextSize = 15,
-				Font = Enum.Font.GothamMedium,
-
-				[Roact.Event.Activated] = function()
-					self:setState({
-						open = false,
-					})
-					self.props.onClick(option)
-				end,
-			}, {
-				Padding = e("UIPadding", {
-					PaddingLeft = UDim.new(0, 6),
-				}),
-			})
-		end
-
-		return e("ImageButton", {
-			Size = UDim2.new(0, width+50, 0, 28),
-			Position = self.props.position,
-			AnchorPoint = self.props.anchorPoint,
-			LayoutOrder = self.props.layoutOrder,
-			ZIndex = self.props.zIndex,
-			BackgroundTransparency = 1,
-
-			[Roact.Event.Activated] = function()
-				self:setState({
-					open = not self.state.open,
-				})
-			end,
-		}, {
-			Border = e(SlicedImage, {
-				slice = Assets.Slices.RoundedBorder,
-				color = theme.BorderColor,
-				transparency = self.props.transparency,
-				size = UDim2.new(1, 0, 1, 0),
-			}, {
-				DropArrow = e("ImageLabel", {
-					Image = Assets.Images.Dropdown.Arrow,
-					ImageColor3 = self.openBinding:map(function(a)
-						return theme.Closed.IconColor:Lerp(theme.Open.IconColor, a)
-					end),
-					ImageTransparency = self.props.transparency,
-
-					Size = UDim2.new(0, 18, 0, 18),
-					Position = UDim2.new(1, -6, 0.5, 0),
-					AnchorPoint = Vector2.new(1, 0.5),
-					Rotation = self.openBinding:map(function(a)
-						return a * 180
-					end),
-
-					BackgroundTransparency = 1,
-				}),
-				Active = e("TextLabel", {
-					Size = UDim2.new(1, -30, 1, 0),
-					Position = UDim2.new(0, 6, 0, 0),
-					BackgroundTransparency = 1,
-					Text = self.props.active,
-					Font = Enum.Font.GothamMedium,
-					TextSize = 15,
-					TextColor3 = theme.TextColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = self.props.transparency,
-				}),
-			}),
-			Options = if self.state.open then e(SlicedImage, {
-				slice = Assets.Slices.RoundedBackground,
-				color = theme.BackgroundColor,
-				position = UDim2.new(1, 0, 1, 3),
-				size = self.openBinding:map(function(a)
-					return UDim2.new(1, 0, a*math.min(3, #self.props.options), 0)
-				end),
-				anchorPoint = Vector2.new(1, 0),
-			}, {
-				Border = e(SlicedImage, {
-					slice = Assets.Slices.RoundedBorder,
-					color = theme.BorderColor,
-					transparency = self.props.transparency,
-					size = UDim2.new(1, 0, 1, 0),
-				}),
-				ScrollingFrame = e(ScrollingFrame, {
-					size = UDim2.new(1, -4, 1, -4),
-					position = UDim2.new(0, 2, 0, 2),
-					transparency = self.props.transparency,
-					contentSize = self.contentSize,
-				}, {
-					Layout = e("UIListLayout", {
-						VerticalAlignment = Enum.VerticalAlignment.Top,
-						FillDirection = Enum.FillDirection.Vertical,
-						SortOrder = Enum.SortOrder.LayoutOrder,
-						Padding = UDim.new(0, 0),
-
-						[Roact.Change.AbsoluteContentSize] = function(object)
-							self.setContentSize(object.AbsoluteContentSize)
-						end,
-					}),
-					Roact.createFragment(optionButtons),
-				}),
-			}) else nil,
-		})
-	end)
-end
-
-return Dropdown

plugin/src/App/Components/Header.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -53,4 +52,4 @@ local function Header(props)
 	end)
 end
 
-return Header
+return Header

plugin/src/App/Components/IconButton.lua

@@ -1,9 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
+local Flipper = require(Rojo.Flipper)
 
 local Assets = require(Plugin.Assets)
 local bindingUtil = require(Plugin.App.bindingUtil)
@@ -30,7 +29,6 @@ function IconButton:render()
 		Position = self.props.position,
 		AnchorPoint = self.props.anchorPoint,
 
-		Visible = self.props.visible,
 		LayoutOrder = self.props.layoutOrder,
 		ZIndex = self.props.zIndex,
 		BackgroundTransparency = 1,
@@ -75,9 +73,7 @@ function IconButton:render()
 
 			BackgroundTransparency = 1,
 		}),
-
-		Children = Roact.createFragment(self.props[Roact.Children]),
 	})
 end
 
-return IconButton
+return IconButton

plugin/src/App/Components/PatchVisualizer/ChangeList.lua

@@ -1,181 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local Theme = require(Plugin.App.Theme)
-local ScrollingFrame = require(Plugin.App.Components.ScrollingFrame)
-local DisplayValue = require(script.Parent.DisplayValue)
-
-local e = Roact.createElement
-
-local ChangeList = Roact.Component:extend("ChangeList")
-
-function ChangeList:init()
-	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
-end
-
-function ChangeList:render()
-	return Theme.with(function(theme)
-		local props = self.props
-		local changes = props.changes
-
-		-- Color alternating rows for readability
-		local rowTransparency = props.transparency:map(function(t)
-			return 0.93 + (0.07 * t)
-		end)
-
-		local columnVisibility = props.columnVisibility
-
-		local rows = {}
-		local pad = {
-			PaddingLeft = UDim.new(0, 5),
-			PaddingRight = UDim.new(0, 5),
-		}
-
-		local headers = e("Frame", {
-			Size = UDim2.new(1, 0, 0, 30),
-			BackgroundTransparency = rowTransparency,
-			BackgroundColor3 = theme.Diff.Row,
-			LayoutOrder = 0,
-		}, {
-			Padding = e("UIPadding", pad),
-			Layout = e("UIListLayout", {
-				FillDirection = Enum.FillDirection.Horizontal,
-				SortOrder = Enum.SortOrder.LayoutOrder,
-				HorizontalAlignment = Enum.HorizontalAlignment.Left,
-				VerticalAlignment = Enum.VerticalAlignment.Center,
-			}),
-			A = e("TextLabel", {
-				Visible = columnVisibility[1],
-				Text = tostring(changes[1][1]),
-				BackgroundTransparency = 1,
-				Font = Enum.Font.GothamBold,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(0.3, 0, 1, 0),
-				LayoutOrder = 1,
-			}),
-			B = e("TextLabel", {
-				Visible = columnVisibility[2],
-				Text = tostring(changes[1][2]),
-				BackgroundTransparency = 1,
-				Font = Enum.Font.GothamBold,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(0.35, 0, 1, 0),
-				LayoutOrder = 2,
-			}),
-			C = e("TextLabel", {
-				Visible = columnVisibility[3],
-				Text = tostring(changes[1][3]),
-				BackgroundTransparency = 1,
-				Font = Enum.Font.GothamBold,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(0.35, 0, 1, 0),
-				LayoutOrder = 3,
-			}),
-		})
-
-		for row, values in changes do
-			if row == 1 then
-				continue -- Skip headers, already handled above
-			end
-
-			rows[row] = e("Frame", {
-				Size = UDim2.new(1, 0, 0, 30),
-				BackgroundTransparency = row % 2 ~= 0 and rowTransparency or 1,
-				BackgroundColor3 = theme.Diff.Row,
-				BorderSizePixel = 0,
-				LayoutOrder = row,
-			}, {
-				Padding = e("UIPadding", pad),
-				Layout = e("UIListLayout", {
-					FillDirection = Enum.FillDirection.Horizontal,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					HorizontalAlignment = Enum.HorizontalAlignment.Left,
-					VerticalAlignment = Enum.VerticalAlignment.Center,
-				}),
-				A = e("TextLabel", {
-					Visible = columnVisibility[1],
-					Text = tostring(values[1]),
-					BackgroundTransparency = 1,
-					Font = Enum.Font.GothamMedium,
-					TextSize = 14,
-					TextColor3 = theme.Settings.Setting.DescriptionColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = props.transparency,
-					TextTruncate = Enum.TextTruncate.AtEnd,
-					Size = UDim2.new(0.3, 0, 1, 0),
-					LayoutOrder = 1,
-				}),
-				B = e(
-					"Frame",
-					{
-						Visible = columnVisibility[2],
-						BackgroundTransparency = 1,
-						Size = UDim2.new(0.35, 0, 1, 0),
-						LayoutOrder = 2,
-					},
-					e(DisplayValue, {
-						value = values[2],
-						transparency = props.transparency,
-					})
-				),
-				C = e(
-					"Frame",
-					{
-						Visible = columnVisibility[3],
-						BackgroundTransparency = 1,
-						Size = UDim2.new(0.35, 0, 1, 0),
-						LayoutOrder = 3,
-					},
-					e(DisplayValue, {
-						value = values[3],
-						transparency = props.transparency,
-					})
-				),
-			})
-		end
-
-		table.insert(
-			rows,
-			e("UIListLayout", {
-				FillDirection = Enum.FillDirection.Vertical,
-				SortOrder = Enum.SortOrder.LayoutOrder,
-				HorizontalAlignment = Enum.HorizontalAlignment.Right,
-				VerticalAlignment = Enum.VerticalAlignment.Top,
-
-				[Roact.Change.AbsoluteContentSize] = function(object)
-					self.setContentSize(object.AbsoluteContentSize)
-				end,
-			})
-		)
-
-		return e("Frame", {
-			Size = UDim2.new(1, 0, 1, 0),
-			BackgroundTransparency = 1,
-		}, {
-			Headers = headers,
-			Values = e(ScrollingFrame, {
-				size = UDim2.new(1, 0, 1, -30),
-				position = UDim2.new(0, 0, 0, 30),
-				contentSize = self.contentSize,
-				transparency = props.transparency,
-			}, rows),
-		})
-	end)
-end
-
-return ChangeList

plugin/src/App/Components/PatchVisualizer/DisplayValue.lua

@@ -1,107 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local Theme = require(Plugin.App.Theme)
-
-local e = Roact.createElement
-
-local function DisplayValue(props)
-	return Theme.with(function(theme)
-		local t = typeof(props.value)
-		if t == "Color3" then
-			-- Colors get a blot that shows the color
-			return Roact.createFragment({
-				Blot = e("Frame", {
-					BackgroundTransparency = props.transparency,
-					BackgroundColor3 = props.value,
-					Size = UDim2.new(0, 20, 0, 20),
-					Position = UDim2.new(0, 0, 0.5, 0),
-					AnchorPoint = Vector2.new(0, 0.5),
-				}, {
-					Corner = e("UICorner", {
-						CornerRadius = UDim.new(0, 4),
-					}),
-					Stroke = e("UIStroke", {
-						Color = theme.BorderedContainer.BorderColor,
-						Transparency = props.transparency,
-					}),
-				}),
-				Label = e("TextLabel", {
-					Text = string.format("%d,%d,%d", props.value.R * 255, props.value.G * 255, props.value.B * 255),
-					BackgroundTransparency = 1,
-					Font = Enum.Font.GothamMedium,
-					TextSize = 14,
-					TextColor3 = theme.Settings.Setting.DescriptionColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = props.transparency,
-					TextTruncate = Enum.TextTruncate.AtEnd,
-					Size = UDim2.new(1, -25, 1, 0),
-					Position = UDim2.new(0, 25, 0, 0),
-				}),
-			})
-
-		elseif t == "table" then
-			-- Showing a memory address for tables is useless, so we want to show the best we can
-			local textRepresentation = nil
-
-			local meta = getmetatable(props.value)
-			if meta and meta.__tostring then
-				-- If the table has a tostring metamethod, use that
-				textRepresentation = tostring(props.value)
-			elseif next(props.value) == nil then
-				-- If it's empty, show empty braces
-				textRepresentation = "{}"
-			else
-				-- If it has children, list them out
-				local out, i = {}, 0
-				for k, v in pairs(props.value) do
-					i += 1
-
-					-- Wrap strings in quotes
-					if type(k) == "string" then
-						k = "\"" .. k .. "\""
-					end
-					if type(v) == "string" then
-						v = "\"" .. v .. "\""
-					end
-
-					out[i] = string.format("[%s] = %s", tostring(k), tostring(v))
-				end
-				textRepresentation = "{ " .. table.concat(out, ", ") .. " }"
-			end
-
-			return e("TextLabel", {
-				Text = textRepresentation,
-				BackgroundTransparency = 1,
-				Font = Enum.Font.GothamMedium,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(1, 0, 1, 0),
-			})
-		end
-
-		-- TODO: Maybe add visualizations to other datatypes?
-		-- Or special text handling tostring for some?
-		-- Will add as needed, let's see what cases arise.
-
-		return e("TextLabel", {
-			Text = string.gsub(tostring(props.value), "%s", " "),
-			BackgroundTransparency = 1,
-			Font = Enum.Font.GothamMedium,
-			TextSize = 14,
-			TextColor3 = theme.Settings.Setting.DescriptionColor,
-			TextXAlignment = Enum.TextXAlignment.Left,
-			TextTransparency = props.transparency,
-			TextTruncate = Enum.TextTruncate.AtEnd,
-			Size = UDim2.new(1, 0, 1, 0),
-		})
-	end)
-end
-
-return DisplayValue

plugin/src/App/Components/PatchVisualizer/DomLabel.lua

@@ -1,180 +0,0 @@
-local StudioService = game:GetService("StudioService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Flipper = require(Packages.Flipper)
-
-local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.App.Theme)
-local bindingUtil = require(Plugin.App.bindingUtil)
-
-local e = Roact.createElement
-
-local ChangeList = require(script.Parent.ChangeList)
-
-local Expansion = Roact.Component:extend("Expansion")
-
-function Expansion:render()
-	local props = self.props
-
-	if not props.rendered then
-		return nil
-	end
-
-	return e("Frame", {
-		BackgroundTransparency = 1,
-		Size = UDim2.new(1, -props.indent, 1, -30),
-		Position = UDim2.new(0, props.indent, 0, 30),
-	}, {
-		ChangeList = e(ChangeList, {
-			changes = props.changeList,
-			transparency = props.transparency,
-			columnVisibility = props.columnVisibility,
-		}),
-	})
-end
-
-local DomLabel = Roact.Component:extend("DomLabel")
-
-function DomLabel:init()
-	self.maxElementHeight = 0
-	if self.props.changeList then
-		self.maxElementHeight = math.clamp(#self.props.changeList * 30, 30, 30 * 6)
-	end
-
-	local initHeight = self.props.elementHeight:getValue()
-	self.expanded = initHeight > 30
-
-	self.motor = Flipper.SingleMotor.new(initHeight)
-	self.binding = bindingUtil.fromMotor(self.motor)
-
-	self:setState({
-		renderExpansion = self.expanded,
-	})
-	self.motor:onStep(function(value)
-		local renderExpansion = value > 30
-
-		self.props.setElementHeight(value)
-		if self.props.updateEvent then
-			self.props.updateEvent:Fire()
-		end
-
-		self:setState(function(state)
-			if state.renderExpansion == renderExpansion then
-				return nil
-			end
-
-			return {
-				renderExpansion = renderExpansion,
-			}
-		end)
-	end)
-end
-
-function DomLabel:render()
-	local props = self.props
-
-	return Theme.with(function(theme)
-		local iconProps = StudioService:GetClassIcon(props.className)
-		local indent = (props.depth or 0) * 20 + 25
-
-		-- Line guides help indent depth remain readable
-		local lineGuides = {}
-		for i = 1, props.depth or 0 do
-			table.insert(
-				lineGuides,
-				e("Frame", {
-					Name = "Line_" .. i,
-					Size = UDim2.new(0, 2, 1, 2),
-					Position = UDim2.new(0, (20 * i) + 15, 0, -1),
-					BorderSizePixel = 0,
-					BackgroundTransparency = props.transparency,
-					BackgroundColor3 = theme.BorderedContainer.BorderColor,
-				})
-			)
-		end
-
-		return e("Frame", {
-			Name = "Change",
-			ClipsDescendants = true,
-			BackgroundColor3 = if props.patchType then theme.Diff[props.patchType] else nil,
-			BorderSizePixel = 0,
-			BackgroundTransparency = props.patchType and props.transparency or 1,
-			Size = self.binding:map(function(expand)
-				return UDim2.new(1, 0, 0, expand)
-			end),
-		}, {
-			Padding = e("UIPadding", {
-				PaddingLeft = UDim.new(0, 10),
-				PaddingRight = UDim.new(0, 10),
-			}),
-			ExpandButton = if props.changeList
-				then e("TextButton", {
-					BackgroundTransparency = 1,
-					Text = "",
-					Size = UDim2.new(1, 0, 1, 0),
-					[Roact.Event.Activated] = function()
-						self.expanded = not self.expanded
-						self.motor:setGoal(Flipper.Spring.new((self.expanded and self.maxElementHeight or 0) + 30, {
-							frequency = 5,
-							dampingRatio = 1,
-						}))
-					end,
-				})
-				else nil,
-			Expansion = if props.changeList
-				then e(Expansion, {
-					rendered = self.state.renderExpansion,
-					indent = indent,
-					transparency = props.transparency,
-					changeList = props.changeList,
-					columnVisibility = props.columnVisibility,
-				})
-				else nil,
-			DiffIcon = if props.patchType
-				then e("ImageLabel", {
-					Image = Assets.Images.Diff[props.patchType],
-					ImageColor3 = theme.AddressEntry.PlaceholderColor,
-					ImageTransparency = props.transparency,
-					BackgroundTransparency = 1,
-					Size = UDim2.new(0, 20, 0, 20),
-					Position = UDim2.new(0, 0, 0, 15),
-					AnchorPoint = Vector2.new(0, 0.5),
-				})
-				else nil,
-			ClassIcon = e("ImageLabel", {
-				Image = iconProps.Image,
-				ImageTransparency = props.transparency,
-				ImageRectOffset = iconProps.ImageRectOffset,
-				ImageRectSize = iconProps.ImageRectSize,
-				BackgroundTransparency = 1,
-				Size = UDim2.new(0, 20, 0, 20),
-				Position = UDim2.new(0, indent, 0, 15),
-				AnchorPoint = Vector2.new(0, 0.5),
-			}),
-			InstanceName = e("TextLabel", {
-				Text = props.name .. (props.hint and string.format(
-					'  <font color="#%s">%s</font>',
-					theme.AddressEntry.PlaceholderColor:ToHex(),
-					props.hint
-				) or ""),
-				RichText = true,
-				BackgroundTransparency = 1,
-				Font = Enum.Font.GothamMedium,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(1, -indent - 50, 0, 30),
-				Position = UDim2.new(0, indent + 30, 0, 0),
-			}),
-			LineGuides = e("Folder", nil, lineGuides),
-		})
-	end)
-end
-
-return DomLabel

plugin/src/App/Components/PatchVisualizer/init.lua

@@ -1,402 +0,0 @@
-local HttpService = game:GetService("HttpService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Log = require(Packages.Log)
-
-local PatchSet = require(Plugin.PatchSet)
-local decodeValue = require(Plugin.Reconciler.decodeValue)
-local getProperty = require(Plugin.Reconciler.getProperty)
-
-local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-local VirtualScroller = require(Plugin.App.Components.VirtualScroller)
-
-local e = Roact.createElement
-
-local function alphabeticalNext(t, state)
-	-- Equivalent of the next function, but returns the keys in the alphabetic
-	-- order of node names. We use a temporary ordered key table that is stored in the
-	-- table being iterated.
-
-	local key = nil
-	if state == nil then
-		-- First iteration, generate the index
-		local orderedIndex, i = table.create(5), 0
-		for k in t do
-			i += 1
-			orderedIndex[i] = k
-		end
-		table.sort(orderedIndex, function(a, b)
-			local nodeA, nodeB = t[a], t[b]
-			return (nodeA.name or "") < (nodeB.name or "")
-		end)
-
-		t.__orderedIndex = orderedIndex
-		key = orderedIndex[1]
-	else
-		-- Fetch the next value
-		for i, orderedState in t.__orderedIndex do
-			if orderedState == state then
-				key = t.__orderedIndex[i + 1]
-				break
-			end
-		end
-	end
-
-	if key then
-		return key, t[key]
-	end
-
-	-- No more value to return, cleanup
-	t.__orderedIndex = nil
-	return
-end
-
-local function alphabeticalPairs(t)
-	-- Equivalent of the pairs() iterator, but sorted
-	return alphabeticalNext, t, nil
-end
-
-local function Tree()
-	local tree = {
-		idToNode = {},
-		ROOT = {
-			className = "DataModel",
-			name = "ROOT",
-			children = {},
-		},
-	}
-	-- Add ROOT to idToNode or it won't be found by getNode since that searches *within* ROOT
-	tree.idToNode["ROOT"] = tree.ROOT
-
-	function tree:getNode(id, target)
-		if self.idToNode[id] then
-			return self.idToNode[id]
-		end
-
-		for nodeId, node in target or tree.ROOT.children do
-			if nodeId == id then
-				self.idToNode[id] = node
-				return node
-			end
-			local descendant = self:getNode(id, node.children)
-			if descendant then
-				return descendant
-			end
-		end
-
-		return nil
-	end
-
-	function tree:addNode(parent, props)
-		parent = parent or "ROOT"
-
-		local node = self:getNode(props.id)
-		if node then
-			for k, v in props do
-				node[k] = v
-			end
-			return node
-		end
-
-		node = table.clone(props)
-		node.children = {}
-
-		local parentNode = self:getNode(parent)
-		if not parentNode then
-			Log.warn("Failed to create node since parent doesnt exist: {}, {}", parent, props)
-			return
-		end
-
-		parentNode.children[node.id] = node
-		self.idToNode[node.id] = node
-
-		return node
-	end
-
-	function tree:buildAncestryNodes(ancestry, patch, instanceMap)
-		-- Build nodes for ancestry by going up the tree
-		local previousId = "ROOT"
-		for _, ancestorId in ancestry do
-			local value = instanceMap.fromIds[ancestorId] or patch.added[ancestorId]
-			if not value then
-				Log.warn("Failed to find ancestor object for " .. ancestorId)
-				continue
-			end
-			self:addNode(previousId, {
-				id = ancestorId,
-				className = value.ClassName,
-				name = value.Name,
-			})
-			previousId = ancestorId
-		end
-	end
-
-	return tree
-end
-
-local DomLabel = require(script.DomLabel)
-
-local PatchVisualizer = Roact.Component:extend("PatchVisualizer")
-
-function PatchVisualizer:init()
-	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
-
-	self.updateEvent = Instance.new("BindableEvent")
-end
-
-function PatchVisualizer:willUnmount()
-	self.updateEvent:Destroy()
-end
-
-function PatchVisualizer:shouldUpdate(nextProps)
-	local currentPatch, nextPatch = self.props.patch, nextProps.patch
-
-	return not PatchSet.isEqual(currentPatch, nextPatch)
-end
-
-function PatchVisualizer:buildTree(patch, instanceMap)
-	local tree = Tree()
-
-	for _, change in patch.updated do
-		local instance = instanceMap.fromIds[change.id]
-		if not instance then
-			continue
-		end
-
-		-- Gather ancestors from existing DOM
-		local ancestry = {}
-		local parentObject = instance.Parent
-		local parentId = instanceMap.fromInstances[parentObject]
-		while parentObject do
-			table.insert(ancestry, 1, parentId)
-			parentObject = parentObject.Parent
-			parentId = instanceMap.fromInstances[parentObject]
-		end
-
-		tree:buildAncestryNodes(ancestry, patch, instanceMap)
-
-		-- Gather detail text
-		local changeList, hint = nil, nil
-		if next(change.changedProperties) or change.changedName then
-			changeList = {}
-
-			local hintBuffer, i = {}, 0
-			local function addProp(prop: string, current: any?, incoming: any?)
-				i += 1
-				hintBuffer[i] = prop
-				changeList[i] = { prop, current, incoming }
-			end
-
-			-- Gather the changes
-
-			if change.changedName then
-				addProp("Name", instance.Name, change.changedName)
-			end
-
-			for prop, incoming in change.changedProperties do
-				local incomingSuccess, incomingValue = decodeValue(incoming, instanceMap)
-				local currentSuccess, currentValue = getProperty(instance, prop)
-
-				addProp(
-					prop,
-					if currentSuccess then currentValue else "[Error]",
-					if incomingSuccess then incomingValue else next(incoming)
-				)
-			end
-
-			-- Finalize detail values
-
-			-- Trim hint to top 3
-			table.sort(hintBuffer)
-			if #hintBuffer > 3 then
-				hintBuffer = {
-					hintBuffer[1],
-					hintBuffer[2],
-					hintBuffer[3],
-					i - 3 .. " more",
-				}
-			end
-			hint = table.concat(hintBuffer, ", ")
-
-			-- Sort changes and add header
-			table.sort(changeList, function(a, b)
-				return a[1] < b[1]
-			end)
-			table.insert(changeList, 1, { "Property", "Current", "Incoming" })
-		end
-
-		-- Add this node to tree
-		tree:addNode(instanceMap.fromInstances[instance.Parent], {
-			id = change.id,
-			patchType = "Edit",
-			className = instance.ClassName,
-			name = instance.Name,
-			hint = hint,
-			changeList = changeList,
-		})
-	end
-
-	for _, instance in patch.removed do
-		-- Gather ancestors from existing DOM
-		-- (note that they may have no ID if they're being removed as unknown)
-		local ancestry = {}
-		local parentObject = instance.Parent
-		local parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
-		while parentObject do
-			instanceMap:insert(parentId, parentObject)
-			table.insert(ancestry, 1, parentId)
-			parentObject = parentObject.Parent
-			parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
-		end
-
-		tree:buildAncestryNodes(ancestry, patch, instanceMap)
-
-		-- Add this node to tree
-		local nodeId = instanceMap.fromInstances[instance] or HttpService:GenerateGUID(false)
-		instanceMap:insert(nodeId, instance)
-		tree:addNode(instanceMap.fromInstances[instance.Parent], {
-			id = nodeId,
-			patchType = "Remove",
-			className = instance.ClassName,
-			name = instance.Name,
-		})
-	end
-
-	for _, change in patch.added do
-		-- Gather ancestors from existing DOM or future additions
-		local ancestry = {}
-		local parentId = change.Parent
-		local parentData = patch.added[parentId]
-		local parentObject = instanceMap.fromIds[parentId]
-		while parentId do
-			table.insert(ancestry, 1, parentId)
-			parentId = nil
-
-			if parentData then
-				parentId = parentData.Parent
-				parentData = patch.added[parentId]
-				parentObject = instanceMap.fromIds[parentId]
-			elseif parentObject then
-				parentObject = parentObject.Parent
-				parentId = instanceMap.fromInstances[parentObject]
-				parentData = patch.added[parentId]
-			end
-		end
-
-		tree:buildAncestryNodes(ancestry, patch, instanceMap)
-
-		-- Gather detail text
-		local changeList, hint = nil, nil
-		if next(change.Properties) then
-			changeList = {}
-
-			local hintBuffer, i = {}, 0
-			for prop, incoming in change.Properties do
-				i += 1
-				hintBuffer[i] = prop
-
-				local success, incomingValue = decodeValue(incoming, instanceMap)
-				if success then
-					table.insert(changeList, { prop, "N/A", incomingValue })
-				else
-					table.insert(changeList, { prop, "N/A", next(incoming) })
-				end
-			end
-
-			-- Finalize detail values
-
-			-- Trim hint to top 3
-			table.sort(hintBuffer)
-			if #hintBuffer > 3 then
-				hintBuffer = {
-					hintBuffer[1],
-					hintBuffer[2],
-					hintBuffer[3],
-					i - 3 .. " more",
-				}
-			end
-			hint = table.concat(hintBuffer, ", ")
-
-			-- Sort changes and add header
-			table.sort(changeList, function(a, b)
-				return a[1] < b[1]
-			end)
-			table.insert(changeList, 1, { "Property", "Current", "Incoming" })
-		end
-
-		-- Add this node to tree
-		tree:addNode(change.Parent, {
-			id = change.Id,
-			patchType = "Add",
-			className = change.ClassName,
-			name = change.Name,
-			hint = hint,
-			changeList = changeList,
-		})
-	end
-
-	return tree
-end
-
-function PatchVisualizer:render()
-	local patch = self.props.patch
-	local instanceMap = self.props.instanceMap
-
-	local tree = self:buildTree(patch, instanceMap)
-
-	-- Recusively draw tree
-	local scrollElements, elementHeights = {}, {}
-	local function drawNode(node, depth)
-		local elementHeight, setElementHeight = Roact.createBinding(30)
-		table.insert(elementHeights, elementHeight)
-		table.insert(
-			scrollElements,
-			e(DomLabel, {
-				columnVisibility = self.props.columnVisibility,
-				updateEvent = self.updateEvent,
-				elementHeight = elementHeight,
-				setElementHeight = setElementHeight,
-				patchType = node.patchType,
-				className = node.className,
-				name = node.name,
-				hint = node.hint,
-				changeList = node.changeList,
-				depth = depth,
-				transparency = self.props.transparency,
-			})
-		)
-
-		for _, childNode in alphabeticalPairs(node.children) do
-			drawNode(childNode, depth + 1)
-		end
-	end
-	for _, node in alphabeticalPairs(tree.ROOT.children) do
-		drawNode(node, 0)
-	end
-
-	return e(BorderedContainer, {
-		transparency = self.props.transparency,
-		size = self.props.size,
-		position = self.props.position,
-		layoutOrder = self.props.layoutOrder,
-	}, {
-		VirtualScroller = e(VirtualScroller, {
-			size = UDim2.new(1, 0, 1, 0),
-			transparency = self.props.transparency,
-			count = #scrollElements,
-			updateEvent = self.updateEvent.Event,
-			render = function(i)
-				return scrollElements[i]
-			end,
-			getHeightBinding = function(i)
-				return elementHeights[i]
-			end,
-		}),
-	})
-end
-
-return PatchVisualizer

plugin/src/App/Components/ScrollingFrame.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
@@ -40,4 +39,4 @@ local function ScrollingFrame(props)
 	end)
 end
 
-return ScrollingFrame
+return ScrollingFrame

plugin/src/App/Components/SlicedImage.lua

@@ -1,7 +1,6 @@
 local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local e = Roact.createElement
 
@@ -27,4 +26,4 @@ local function SlicedImage(props)
 	}, props[Roact.Children])
 end
 
-return SlicedImage
+return SlicedImage

plugin/src/App/Components/Spinner.lua

@@ -2,9 +2,8 @@ local RunService = game:GetService("RunService")
 
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -64,4 +63,4 @@ function Spinner:willUnmount()
 	self.stepper:Disconnect()
 end
 
-return Spinner
+return Spinner

plugin/src/App/Components/Studio/StudioPluginAction.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Dictionary = require(Plugin.Dictionary)
 

plugin/src/App/Components/Studio/StudioPluginContext.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local StudioPluginContext = Roact.createContext(nil)
 
-return StudioPluginContext
+return StudioPluginContext

plugin/src/App/Components/Studio/StudioPluginGui.lua

@@ -1,11 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Dictionary = require(Plugin.Dictionary)
-local Theme = require(Plugin.App.Theme)
 
 local StudioPluginContext = require(script.Parent.StudioPluginContext)
 
@@ -30,10 +28,8 @@ function StudioPluginGui:init()
 		self.props.initDockState,
 		self.props.active,
 		self.props.overridePreviousState,
-		floatingSize.X,
+		floatingSize.X, floatingSize.Y,
-		floatingSize.Y,
+		minimumSize.X, minimumSize.Y
-		minimumSize.X,
-		minimumSize.Y
 	)
 
 	local pluginGui = self.props.plugin:CreateDockWidgetPluginGui(self.props.id, dockWidgetPluginGuiInfo)
@@ -60,16 +56,7 @@ end
 function StudioPluginGui:render()
 	return e(Roact.Portal, {
 		target = self.pluginGui,
-	}, {
+	}, self.props[Roact.Children])
-		Background = Theme.with(function(theme)
-			return e("Frame", {
-				Size = UDim2.new(1, 0, 1, 0),
-				BackgroundColor3 = theme.BackgroundColor,
-				ZIndex = 0,
-				BorderSizePixel = 0,
-			}, self.props[Roact.Children])
-		end),
-	})
 end
 
 function StudioPluginGui:didUpdate(lastProps)
@@ -87,14 +74,11 @@ end
 local function StudioPluginGuiWrapper(props)
 	return e(StudioPluginContext.Consumer, {
 		render = function(plugin)
-			return e(
+			return e(StudioPluginGui, Dictionary.merge(props, {
-				StudioPluginGui,
+				plugin = plugin,
-				Dictionary.merge(props, {
+			}))
-					plugin = plugin,
-				})
-			)
 		end,
 	})
 end
 
-return StudioPluginGuiWrapper
+return StudioPluginGuiWrapper

plugin/src/App/Components/Studio/StudioToggleButton.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Dictionary = require(Plugin.Dictionary)
 

plugin/src/App/Components/Studio/StudioToolbar.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Dictionary = require(Plugin.Dictionary)
 
@@ -43,4 +42,4 @@ local function StudioToolbarWrapper(props)
 	})
 end
 
-return StudioToolbarWrapper
+return StudioToolbarWrapper

plugin/src/App/Components/Studio/StudioToolbarContext.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local StudioToolbarContext = Roact.createContext(nil)
 
-return StudioToolbarContext
+return StudioToolbarContext

plugin/src/App/Components/TextButton.lua

@@ -2,10 +2,9 @@ local TextService = game:GetService("TextService")
 
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
+local Flipper = require(Rojo.Flipper)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
@@ -131,10 +130,8 @@ function TextButton:render()
 
 				zIndex = -2,
 			}),
-
-			Children = Roact.createFragment(self.props[Roact.Children]),
 		})
 	end)
 end
 
-return TextButton
+return TextButton

plugin/src/App/Components/Tooltip.lua

@@ -1,226 +0,0 @@
-local TextService = game:GetService("TextService")
-local HttpService = game:GetService("HttpService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Theme = require(Plugin.App.Theme)
-
-local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-
-local e = Roact.createElement
-
-local DELAY = 0.75 -- How long to hover before a popup is shown (seconds)
-local TEXT_PADDING = Vector2.new(8 * 2, 6 * 2) -- Padding for the popup text containers
-local TAIL_SIZE = 16 -- Size of the triangle tail piece
-local X_OFFSET = 30 -- How far right (from left) the tail will be (assuming enough space)
-local Y_OVERLAP = 10 -- Let the triangle tail piece overlap the target a bit to help "connect" it
-
-local TooltipContext = Roact.createContext({})
-
-local function Popup(props)
-	local textSize = TextService:GetTextSize(
-		props.Text, 16, Enum.Font.GothamMedium, Vector2.new(math.min(props.parentSize.X, 160), math.huge)
-	) + TEXT_PADDING + (Vector2.one * 2)
-
-	local trigger = props.Trigger:getValue()
-
-	local spaceBelow = props.parentSize.Y - (trigger.AbsolutePosition.Y + trigger.AbsoluteSize.Y - Y_OVERLAP + TAIL_SIZE)
-	local spaceAbove = trigger.AbsolutePosition.Y + Y_OVERLAP - TAIL_SIZE
-
-	-- If there's not enough space below, and there's more space above, then show the tooltip above the trigger
-	local displayAbove = spaceBelow < textSize.Y and spaceAbove > spaceBelow
-
-	local X = math.clamp(props.Position.X - X_OFFSET, 0, props.parentSize.X - textSize.X)
-	local Y = 0
-
-	if displayAbove then
-		Y = math.max(trigger.AbsolutePosition.Y - TAIL_SIZE - textSize.Y + Y_OVERLAP, 0)
-	else
-		Y = math.min(trigger.AbsolutePosition.Y + trigger.AbsoluteSize.Y + TAIL_SIZE - Y_OVERLAP, props.parentSize.Y - textSize.Y)
-	end
-
-	return Theme.with(function(theme)
-		return e(BorderedContainer, {
-			position = UDim2.fromOffset(X, Y),
-			size = UDim2.fromOffset(textSize.X, textSize.Y),
-			transparency = props.transparency,
-		}, {
-			Label = e("TextLabel", {
-				BackgroundTransparency = 1,
-				Position = UDim2.fromScale(0.5, 0.5),
-				Size = UDim2.new(1, -TEXT_PADDING.X, 1, -TEXT_PADDING.Y),
-				AnchorPoint = Vector2.new(0.5, 0.5),
-				Text = props.Text,
-				TextSize = 16,
-				Font = Enum.Font.GothamMedium,
-				TextWrapped = true,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextColor3 = theme.Button.Bordered.Enabled.TextColor,
-				TextTransparency = props.transparency,
-			}),
-
-			Tail = e("ImageLabel", {
-				ZIndex = 100,
-				Position =
-					if displayAbove then
-						UDim2.new(
-							0, math.clamp(props.Position.X - X, 6, textSize.X-6),
-							1, -1
-						)
-					else
-						UDim2.new(
-							0, math.clamp(props.Position.X - X, 6, textSize.X-6),
-							0, -TAIL_SIZE+1
-						),
-				Size = UDim2.fromOffset(TAIL_SIZE, TAIL_SIZE),
-				AnchorPoint = Vector2.new(0.5, 0),
-				Rotation = if displayAbove then 180 else 0,
-				BackgroundTransparency = 1,
-				Image = "rbxassetid://10983945016",
-				ImageColor3 = theme.BorderedContainer.BackgroundColor,
-				ImageTransparency = props.transparency,
-			}, {
-				Border = e("ImageLabel", {
-					Size = UDim2.fromScale(1, 1),
-					BackgroundTransparency = 1,
-					Image = "rbxassetid://10983946430",
-					ImageColor3 = theme.BorderedContainer.BorderColor,
-					ImageTransparency = props.transparency,
-				}),
-			})
-		})
-	end)
-end
-
-local Provider = Roact.Component:extend("TooltipManager")
-
-function Provider:init()
-	self:setState({
-		tips = {},
-		addTip = function(id: string, data: { Text: string, Position: Vector2, Trigger: any })
-			self:setState(function(state)
-				state.tips[id] = data
-				return state
-			end)
-		end,
-		removeTip = function(id: string)
-			self:setState(function(state)
-				state.tips[id] = nil
-				return state
-			end)
-		end,
-	})
-end
-
-function Provider:render()
-	return Roact.createElement(TooltipContext.Provider, {
-		value = self.state,
-	}, self.props[Roact.Children])
-end
-
-local Container = Roact.Component:extend("TooltipContainer")
-
-function Container:init()
-	self:setState({
-		size = Vector2.new(200, 100),
-	})
-end
-
-function Container:render()
-	return Roact.createElement(TooltipContext.Consumer, {
-		render = function(context)
-			local tips = context.tips
-			local popups = {}
-
-			for key, value in tips do
-				popups[key] = e(Popup, {
-					Text = value.Text or "",
-					Position = value.Position or Vector2.zero,
-					Trigger = value.Trigger,
-
-					parentSize = self.state.size,
-				})
-			end
-
-			return e("Frame", {
-				[Roact.Change.AbsoluteSize] = function(rbx)
-					self:setState({
-						size = rbx.AbsoluteSize,
-					})
-				end,
-				ZIndex = 100,
-				BackgroundTransparency = 1,
-				Size = UDim2.fromScale(1, 1),
-			}, popups)
-		end,
-	})
-end
-
-local Trigger = Roact.Component:extend("TooltipTrigger")
-
-function Trigger:init()
-	self.id = HttpService:GenerateGUID(false)
-	self.ref = Roact.createRef()
-	self.mousePos = Vector2.zero
-
-	self.destroy = function()
-		self.props.context.removeTip(self.id)
-	end
-end
-
-function Trigger:willUnmount()
-	if self.showDelayThread then
-		task.cancel(self.showDelayThread)
-	end
-	if self.destroy then
-		self.destroy()
-	end
-end
-
-function Trigger:render()
-	return e("Frame", {
-		Size = UDim2.fromScale(1, 1),
-		BackgroundTransparency = 1,
-		ZIndex = self.props.zIndex or 100,
-		[Roact.Ref] = self.ref,
-
-		[Roact.Event.MouseMoved] = function(_rbx, x, y)
-			self.mousePos = Vector2.new(x, y)
-		end,
-		[Roact.Event.MouseEnter] = function()
-			self.showDelayThread = task.delay(DELAY, function()
-				self.props.context.addTip(self.id, {
-					Text = self.props.text,
-					Position = self.mousePos,
-					Trigger = self.ref,
-				})
-			end)
-		end,
-		[Roact.Event.MouseLeave] = function()
-			if self.showDelayThread then
-				task.cancel(self.showDelayThread)
-			end
-			self.props.context.removeTip(self.id)
-		end,
-	})
-end
-
-local function TriggerConsumer(props)
-	return Roact.createElement(TooltipContext.Consumer, {
-		render = function(context)
-			local innerProps = table.clone(props)
-			innerProps.context = context
-
-			return e(Trigger, innerProps)
-		end,
-	})
-end
-
-return {
-	Provider = Provider,
-	Container = Container,
-	Trigger = TriggerConsumer,
-}

plugin/src/App/Components/TouchRipple.lua

@@ -1,9 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
+local Flipper = require(Rojo.Flipper)
 
 local Assets = require(Plugin.Assets)
 local bindingUtil = require(Plugin.App.bindingUtil)
@@ -143,4 +142,4 @@ function TouchRipple:render()
 	})
 end
 
-return TouchRipple
+return TouchRipple

plugin/src/App/Components/VirtualScroller.lua

@@ -1,156 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.App.Theme)
-local bindingUtil = require(Plugin.App.bindingUtil)
-
-local e = Roact.createElement
-
-local VirtualScroller = Roact.Component:extend("VirtualScroller")
-
-function VirtualScroller:init()
-	self.scrollFrameRef = Roact.createRef()
-	self:setState({
-		WindowSize = Vector2.new(),
-		CanvasPosition = Vector2.new(),
-	})
-
-	self.totalCanvas, self.setTotalCanvas = Roact.createBinding(0)
-	self.padding, self.setPadding = Roact.createBinding(0)
-
-	self:refresh()
-	if self.props.updateEvent then
-		self.connection = self.props.updateEvent:Connect(function()
-			self:refresh()
-		end)
-	end
-end
-
-function VirtualScroller:didMount()
-	local rbx = self.scrollFrameRef:getValue()
-
-	local windowSizeSignal = rbx:GetPropertyChangedSignal("AbsoluteWindowSize")
-	self.windowSizeChanged = windowSizeSignal:Connect(function()
-		self:setState({ WindowSize = rbx.AbsoluteWindowSize })
-		self:refresh()
-	end)
-
-	local canvasPositionSignal = rbx:GetPropertyChangedSignal("CanvasPosition")
-	self.canvasPositionChanged = canvasPositionSignal:Connect(function()
-		if math.abs(rbx.CanvasPosition.Y - self.state.CanvasPosition.Y) > 5 then
-			self:setState({ CanvasPosition = rbx.CanvasPosition })
-			self:refresh()
-		end
-	end)
-
-	self:refresh()
-end
-
-function VirtualScroller:willUnmount()
-	self.windowSizeChanged:Disconnect()
-	self.canvasPositionChanged:Disconnect()
-	if self.connection then
-		self.connection:Disconnect()
-		self.connection = nil
-	end
-end
-
-function VirtualScroller:refresh()
-	local props = self.props
-	local state = self.state
-
-	local count = props.count
-	local windowSize, canvasPosition = state.WindowSize.Y, state.CanvasPosition.Y
-	local bottom = canvasPosition + windowSize
-
-	local minIndex, maxIndex = 1, count
-	local padding, canvasSize = 0, 0
-
-	local pos = 0
-	for i = 1, count do
-		local height = props.getHeightBinding(i):getValue()
-		canvasSize += height
-
-		if pos > bottom then
-			-- Below window
-			if maxIndex > i then
-				maxIndex = i
-			end
-		end
-
-		pos += height
-
-		if pos < canvasPosition then
-			-- Above window
-			minIndex = i
-			padding = pos - height
-		end
-	end
-
-	self.setPadding(padding)
-	self.setTotalCanvas(canvasSize)
-	self:setState({
-		Start = minIndex,
-		End = maxIndex,
-	})
-end
-
-function VirtualScroller:render()
-	local props, state = self.props, self.state
-
-	local items = {}
-	for i = state.Start, state.End do
-		items["Item" .. i] = e("Frame", {
-			LayoutOrder = i,
-			Size = props.getHeightBinding(i):map(function(height)
-				return UDim2.new(1, 0, 0, height)
-			end),
-			BackgroundTransparency = 1,
-		}, props.render(i))
-	end
-
-	return Theme.with(function(theme)
-		return e("ScrollingFrame", {
-			Size = props.size,
-			Position = props.position,
-			AnchorPoint = props.anchorPoint,
-			BackgroundTransparency = props.backgroundTransparency or 1,
-			BackgroundColor3 = props.backgroundColor3,
-			BorderColor3 = props.borderColor3,
-			CanvasSize = self.totalCanvas:map(function(s)
-				return UDim2.fromOffset(0, s)
-			end),
-			ScrollBarThickness = 9,
-			ScrollBarImageColor3 = theme.ScrollBarColor,
-			ScrollBarImageTransparency = props.transparency:map(function(value)
-				return bindingUtil.blendAlpha({ 0.65, value })
-			end),
-			TopImage = Assets.Images.ScrollBar.Top,
-			MidImage = Assets.Images.ScrollBar.Middle,
-			BottomImage = Assets.Images.ScrollBar.Bottom,
-
-			ElasticBehavior = Enum.ElasticBehavior.Always,
-			ScrollingDirection = Enum.ScrollingDirection.Y,
-			VerticalScrollBarInset = Enum.ScrollBarInset.ScrollBar,
-			[Roact.Ref] = self.scrollFrameRef,
-		}, {
-			Layout = e("UIListLayout", {
-				Padding = UDim.new(0, 0),
-				SortOrder = Enum.SortOrder.LayoutOrder,
-				FillDirection = Enum.FillDirection.Vertical,
-			}),
-			Padding = e("UIPadding", {
-				PaddingTop = self.padding:map(function(p)
-					return UDim.new(0, p)
-				end),
-			}),
-			Content = Roact.createFragment(items),
-		})
-	end)
-end
-
-return VirtualScroller

plugin/src/App/Notifications.lua

@@ -1,199 +0,0 @@
-local TextService = game:GetService("TextService")
-local StudioService = game:GetService("StudioService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Flipper = require(Packages.Flipper)
-
-local bindingUtil = require(script.Parent.bindingUtil)
-
-local Theme = require(Plugin.App.Theme)
-local Assets = require(Plugin.Assets)
-
-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,
-		})
-	)
-
-	self.props.soundPlayer:play(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, {
-			soundPlayer = self.props.soundPlayer,
-			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/Page.lua

@@ -1,9 +1,8 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
+local Flipper = require(Rojo.Flipper)
 
 local Dictionary = require(Plugin.Dictionary)
 
@@ -68,4 +67,4 @@ function Page:didUpdate(lastProps)
 	end
 end
 
-return Page
+return Page

plugin/src/App/PluginSettings.lua

@@ -0,0 +1,121 @@
+--[[
+	Persistent plugin settings that can be accessed via Roact context.
+]]
+
+local Rojo = script:FindFirstAncestor("Rojo")
+
+local Roact = require(Rojo.Roact)
+
+local defaultSettings = {
+	openScriptsExternally = false,
+	twoWaySync = false,
+}
+
+local Settings = {}
+Settings.__index = Settings
+
+function Settings.fromPlugin(plugin)
+	local values = {}
+
+	for name, defaultValue in pairs(defaultSettings) do
+		local savedValue = plugin:GetSetting("Rojo_" .. name)
+
+		if savedValue == nil then
+			plugin:SetSetting("Rojo_" .. name, defaultValue)
+			values[name] = defaultValue
+		else
+			values[name] = savedValue
+		end
+	end
+
+	return setmetatable({
+		__values = values,
+		__plugin = plugin,
+		__updateListeners = {},
+	}, Settings)
+end
+
+function Settings:get(name)
+	if defaultSettings[name] == nil then
+		error("Invalid setings name " .. tostring(name), 2)
+	end
+
+	return self.__values[name]
+end
+
+function Settings:set(name, value)
+	self.__plugin:SetSetting("Rojo_" .. name, value)
+	self.__values[name] = value
+
+	for callback in pairs(self.__updateListeners) do
+		callback(name, value)
+	end
+end
+
+function Settings:onUpdate(newCallback)
+	local newListeners = {}
+	for callback in pairs(self.__updateListeners) do
+		newListeners[callback] = true
+	end
+
+	newListeners[newCallback] = true
+	self.__updateListeners = newListeners
+
+	return function()
+		local newListeners = {}
+		for callback in pairs(self.__updateListeners) do
+			if callback ~= newCallback then
+				newListeners[callback] = true
+			end
+		end
+
+		self.__updateListeners = newListeners
+	end
+end
+
+local Context = Roact.createContext(nil)
+
+local StudioProvider = Roact.Component:extend("StudioProvider")
+
+function StudioProvider:init()
+	self.settings = Settings.fromPlugin(self.props.plugin)
+end
+
+function StudioProvider:render()
+	return Roact.createElement(Context.Provider, {
+		value = self.settings,
+	}, self.props[Roact.Children])
+end
+
+local InternalConsumer = Roact.Component:extend("InternalConsumer")
+
+function InternalConsumer:render()
+	return self.props.render(self.props.settings)
+end
+
+function InternalConsumer:didMount()
+	self.disconnect = self.props.settings:onUpdate(function()
+		-- Trigger a dummy state update to update the settings consumer.
+		self:setState({})
+	end)
+end
+
+function InternalConsumer:willUnmount()
+	self.disconnect()
+end
+
+local function with(callback)
+	return Roact.createElement(Context.Consumer, {
+		render = function(settings)
+			return Roact.createElement(InternalConsumer, {
+				settings = settings,
+				render = callback,
+			})
+		end,
+	})
+end
+
+return {
+	StudioProvider = StudioProvider,
+	with = with,
+}

plugin/src/App/StatusPages/Confirming.lua

@@ -1,156 +0,0 @@
-local TextService = game:GetService("TextService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local Settings = require(Plugin.Settings)
-local Theme = require(Plugin.App.Theme)
-local TextButton = require(Plugin.App.Components.TextButton)
-local Header = require(Plugin.App.Components.Header)
-local StudioPluginGui = require(Plugin.App.Components.Studio.StudioPluginGui)
-local Tooltip = require(Plugin.App.Components.Tooltip)
-local PatchVisualizer = require(Plugin.App.Components.PatchVisualizer)
-
-local e = Roact.createElement
-
-local ConfirmingPage = Roact.Component:extend("ConfirmingPage")
-
-function ConfirmingPage:init()
-	self.contentSize, self.setContentSize = Roact.createBinding(0)
-	self.containerSize, self.setContainerSize = Roact.createBinding(Vector2.new(0, 0))
-end
-
-function ConfirmingPage:render()
-	return Theme.with(function(theme)
-		local pageContent = Roact.createFragment({
-			Header = e(Header, {
-				transparency = self.props.transparency,
-				layoutOrder = 1,
-			}),
-
-			Title = e("TextLabel", {
-				Text = string.format(
-					"Sync changes for project '%s':",
-					self.props.confirmData.serverInfo.projectName or "UNKNOWN"
-				),
-				LayoutOrder = 2,
-				Font = Enum.Font.Gotham,
-				LineHeight = 1.2,
-				TextSize = 14,
-				TextColor3 = theme.Settings.Setting.DescriptionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = self.props.transparency,
-				Size = UDim2.new(1, 0, 0, 20),
-				BackgroundTransparency = 1,
-			}),
-
-			PatchVisualizer = e(PatchVisualizer, {
-				size = UDim2.new(1, 0, 1, -150),
-				transparency = self.props.transparency,
-				layoutOrder = 3,
-
-				columnVisibility = {true, true, true},
-				patch = self.props.confirmData.patch,
-				instanceMap = self.props.confirmData.instanceMap,
-			}),
-
-			Buttons = e("Frame", {
-				Size = UDim2.new(1, 0, 0, 34),
-				LayoutOrder = 4,
-				BackgroundTransparency = 1,
-			}, {
-				Abort = e(TextButton, {
-					text = "Abort",
-					style = "Bordered",
-					transparency = self.props.transparency,
-					layoutOrder = 1,
-					onClick = self.props.onAbort,
-				}, {
-					Tip = e(Tooltip.Trigger, {
-						text = "Stop the connection process"
-					}),
-				}),
-
-				Reject = if Settings:get("twoWaySync")
-					then e(TextButton, {
-						text = "Reject",
-						style = "Bordered",
-						transparency = self.props.transparency,
-						layoutOrder = 2,
-						onClick = self.props.onReject,
-					}, {
-						Tip = e(Tooltip.Trigger, {
-							text = "Push Studio changes to the Rojo server"
-						}),
-					})
-					else nil,
-
-				Accept = e(TextButton, {
-					text = "Accept",
-					style = "Solid",
-					transparency = self.props.transparency,
-					layoutOrder = 3,
-					onClick = self.props.onAccept,
-				}, {
-					Tip = e(Tooltip.Trigger, {
-						text = "Pull Rojo server changes to Studio"
-					}),
-				}),
-
-				Layout = e("UIListLayout", {
-					HorizontalAlignment = Enum.HorizontalAlignment.Right,
-					FillDirection = Enum.FillDirection.Horizontal,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					Padding = UDim.new(0, 10),
-				}),
-			}),
-
-			Layout = e("UIListLayout", {
-				HorizontalAlignment = Enum.HorizontalAlignment.Center,
-				VerticalAlignment = Enum.VerticalAlignment.Center,
-				FillDirection = Enum.FillDirection.Vertical,
-				SortOrder = Enum.SortOrder.LayoutOrder,
-				Padding = UDim.new(0, 10),
-			}),
-
-			Padding = e("UIPadding", {
-				PaddingLeft = UDim.new(0, 20),
-				PaddingRight = UDim.new(0, 20),
-			}),
-		})
-
-		if self.props.createPopup then
-			return e(StudioPluginGui, {
-				id = "Rojo_DiffSync",
-				title = string.format(
-					"Confirm sync for project '%s':",
-					self.props.confirmData.serverInfo.projectName or "UNKNOWN"
-				),
-				active = true,
-
-				initDockState = Enum.InitialDockState.Float,
-				initEnabled = true,
-				overridePreviousState = true,
-				floatingSize = Vector2.new(500, 350),
-				minimumSize = Vector2.new(400, 250),
-
-				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
-
-				onClose = self.props.onAbort,
-			}, {
-				Tooltips = e(Tooltip.Container, nil),
-				Content = e("Frame", {
-					Size = UDim2.fromScale(1, 1),
-					BackgroundTransparency = 1,
-				}, pageContent),
-			})
-		end
-
-		return pageContent
-	end)
-end
-
-return ConfirmingPage

plugin/src/App/StatusPages/Connected.lua

@@ -1,87 +1,17 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Flipper = require(Packages.Flipper)
 
-local bindingUtil = require(Plugin.App.bindingUtil)
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
-local PatchSet = require(Plugin.PatchSet)
 
 local Header = require(Plugin.App.Components.Header)
 local IconButton = require(Plugin.App.Components.IconButton)
 local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-local Tooltip = require(Plugin.App.Components.Tooltip)
-local PatchVisualizer = require(Plugin.App.Components.PatchVisualizer)
 
 local e = Roact.createElement
 
-local AGE_UNITS = { {31556909, "year"}, {2629743, "month"}, {604800, "week"}, {86400, "day"}, {3600, "hour"}, {60, "minute"}, }
-function timeSinceText(elapsed: number): string
-	if elapsed < 3 then
-		return "just now"
-	end
-
-	local ageText = string.format("%d seconds ago", elapsed)
-
-	for _,UnitData in ipairs(AGE_UNITS) do
-		local UnitSeconds, UnitName = UnitData[1], UnitData[2]
-		if elapsed > UnitSeconds then
-			local c = math.floor(elapsed/UnitSeconds)
-			ageText = string.format("%d %s%s ago", c, UnitName, c>1 and "s" or "")
-			break
-		end
-	end
-
-	return ageText
-end
-
-local function ChangesDrawer(props)
-	if props.rendered == false then
-		return nil
-	end
-
-	return Theme.with(function(theme)
-		return e(BorderedContainer, {
-			transparency = props.transparency,
-			size = props.height:map(function(y)
-				return UDim2.new(1, 0, y, -180 * y)
-			end),
-			position = UDim2.new(0, 0, 1, 0),
-			anchorPoint = Vector2.new(0, 1),
-			layoutOrder = props.layoutOrder,
-		}, {
-			Close = e(IconButton, {
-				icon = Assets.Images.Icons.Close,
-				iconSize = 24,
-				color = theme.ConnectionDetails.DisconnectColor,
-				transparency = props.transparency,
-
-				position = UDim2.new(1, 0, 0, 0),
-				anchorPoint = Vector2.new(1, 0),
-
-				onClick = props.onClose,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Close the patch visualizer"
-				}),
-			}),
-
-			PatchVisualizer = e(PatchVisualizer, {
-				size = UDim2.new(1, 0, 1, 0),
-				transparency = props.transparency,
-				layoutOrder = 3,
-
-				columnVisibility = {true, false, true},
-				patch = props.patchInfo:getValue().patch,
-				instanceMap = props.serveSession.__instanceMap,
-			}),
-		})
-	end)
-end
-
 local function ConnectionDetails(props)
 	return Theme.with(function(theme)
 		return e(BorderedContainer, {
@@ -139,10 +69,6 @@ local function ConnectionDetails(props)
 				anchorPoint = Vector2.new(1, 0.5),
 
 				onClick = props.onDisconnect,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Disconnect from the Rojo sync server"
-				}),
 			}),
 
 			Padding = e("UIPadding", {
@@ -155,114 +81,34 @@ end
 
 local ConnectedPage = Roact.Component:extend("ConnectedPage")
 
-function ConnectedPage:init()
-	self.changeDrawerMotor = Flipper.SingleMotor.new(0)
-	self.changeDrawerHeight = bindingUtil.fromMotor(self.changeDrawerMotor)
-
-	self.changeDrawerMotor:onStep(function(value)
-		local renderChanges = value > 0.05
-
-		self:setState(function(state)
-			if state.renderChanges == renderChanges then
-				return nil
-			end
-
-			return {
-				renderChanges = renderChanges,
-			}
-		end)
-	end)
-
-	self:setState({
-		renderChanges = false,
-	})
-end
-
 function ConnectedPage:render()
-	return Theme.with(function(theme)
+	return Roact.createFragment({
-		return Roact.createFragment({
+		Header = e(Header, {
-			Padding = e("UIPadding", {
+			transparency = self.props.transparency,
-				PaddingLeft = UDim.new(0, 20),
+			layoutOrder = 1,
-				PaddingRight = UDim.new(0, 20),
+		}),
-			}),
 
-			Layout = e("UIListLayout", {
+		ConnectionDetails = e(ConnectionDetails, {
-				VerticalAlignment = Enum.VerticalAlignment.Center,
+			projectName = self.state.projectName,
-				FillDirection = Enum.FillDirection.Vertical,
+			address = self.state.address,
-				SortOrder = Enum.SortOrder.LayoutOrder,
+			transparency = self.props.transparency,
-				Padding = UDim.new(0, 10),
+			layoutOrder = 2,
-			}),
 
-			Header = e(Header, {
+			onDisconnect = self.props.onDisconnect,
-				transparency = self.props.transparency,
+		}),
-				layoutOrder = 1,
-			}),
 
-			ConnectionDetails = e(ConnectionDetails, {
+		Layout = e("UIListLayout", {
-				projectName = self.state.projectName,
+			VerticalAlignment = Enum.VerticalAlignment.Center,
-				address = self.state.address,
+			FillDirection = Enum.FillDirection.Vertical,
-				transparency = self.props.transparency,
+			SortOrder = Enum.SortOrder.LayoutOrder,
-				layoutOrder = 2,
+			Padding = UDim.new(0, 10),
+		}),
 
-				onDisconnect = self.props.onDisconnect,
+		Padding = e("UIPadding", {
-			}),
+			PaddingLeft = UDim.new(0, 20),
-
+			PaddingRight = UDim.new(0, 20),
-			ChangeInfo = e("TextButton", {
+		}),
-				Text = self.props.patchInfo:map(function(info)
+	})
-					local changes = PatchSet.countChanges(info.patch)
-					return string.format(
-						"<i>Synced %d change%s %s</i>",
-						changes,
-						changes == 1 and "" or "s",
-						timeSinceText(os.time() - info.timestamp)
-					)
-				end),
-				Font = Enum.Font.Gotham,
-				TextSize = 14,
-				TextWrapped = true,
-				RichText = true,
-				TextColor3 = theme.Header.VersionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextYAlignment = Enum.TextYAlignment.Top,
-				TextTransparency = self.props.transparency,
-
-				Size = UDim2.new(1, 0, 0, 28),
-
-				LayoutOrder = 3,
-				BackgroundTransparency = 1,
-
-				[Roact.Event.Activated] = function()
-					if self.state.renderChanges then
-						self.changeDrawerMotor:setGoal(Flipper.Spring.new(0, {
-							frequency = 4,
-							dampingRatio = 1,
-						}))
-					else
-						self.changeDrawerMotor:setGoal(Flipper.Spring.new(1, {
-							frequency = 3,
-							dampingRatio = 1,
-						}))
-					end
-				end,
-			}),
-
-			ChangesDrawer = e(ChangesDrawer, {
-				rendered = self.state.renderChanges,
-				transparency = self.props.transparency,
-				patchInfo = self.props.patchInfo,
-				serveSession = self.props.serveSession,
-				height = self.changeDrawerHeight,
-				layoutOrder = 4,
-
-				onClose = function()
-					self.changeDrawerMotor:setGoal(Flipper.Spring.new(0, {
-						frequency = 4,
-						dampingRatio = 1,
-					}))
-				end,
-			}),
-		})
-	end)
 end
 
 function ConnectedPage.getDerivedStateFromProps(props)
@@ -276,4 +122,4 @@ function ConnectedPage.getDerivedStateFromProps(props)
 	}
 end
 
-return ConnectedPage
+return ConnectedPage

plugin/src/App/StatusPages/Connecting.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Spinner = require(Plugin.App.Components.Spinner)
 
@@ -18,4 +17,4 @@ function ConnectingPage:render()
 	})
 end
 
-return ConnectingPage
+return ConnectingPage

plugin/src/App/StatusPages/Error.lua

@@ -2,16 +2,14 @@ local TextService = game:GetService("TextService")
 
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Theme = require(Plugin.App.Theme)
 
 local TextButton = require(Plugin.App.Components.TextButton)
 local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
 local ScrollingFrame = require(Plugin.App.Components.ScrollingFrame)
-local Tooltip = require(Plugin.App.Components.Tooltip)
 
 local e = Roact.createElement
 
@@ -58,16 +56,8 @@ function Error:render()
 			end,
 		}, {
 			ErrorMessage = Theme.with(function(theme)
-				return e("TextBox", {
+				return e("TextLabel", {
-					[Roact.Event.InputBegan] = function(rbx, input)
-						if input.UserInputType ~= Enum.UserInputType.MouseButton1 then return end
-						rbx.SelectionStart = 0
-						rbx.CursorPosition = #rbx.Text+1
-					end,
-
-
 					Text = self.props.errorMessage,
-					TextEditable = false,
 					Font = Enum.Font.Code,
 					TextSize = 16,
 					TextColor3 = theme.ErrorColor,
@@ -75,9 +65,10 @@ function Error:render()
 					TextYAlignment = Enum.TextYAlignment.Top,
 					TextTransparency = self.props.transparency,
 					TextWrapped = true,
-					ClearTextOnFocus = false,
+
-					BackgroundTransparency = 1,
 					Size = UDim2.new(1, 0, 1, 0),
+
+					BackgroundTransparency = 1,
 				})
 			end),
 
@@ -124,10 +115,6 @@ function ErrorPage:render()
 				transparency = self.props.transparency,
 				layoutOrder = 1,
 				onClick = self.props.onClose,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Dismiss message"
-				}),
 			}),
 
 			Layout = e("UIListLayout", {
@@ -163,4 +150,4 @@ function ErrorPage.getDerivedStateFromProps(props)
 	}
 end
 
-return ErrorPage
+return ErrorPage

plugin/src/App/StatusPages/NotConnected.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
 
 local Config = require(Plugin.Config)
 
@@ -10,7 +9,6 @@ local Theme = require(Plugin.App.Theme)
 local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
 local TextButton = require(Plugin.App.Components.TextButton)
 local Header = require(Plugin.App.Components.Header)
-local Tooltip = require(Plugin.App.Components.Tooltip)
 
 local PORT_WIDTH = 74
 local DIVIDER_WIDTH = 1
@@ -110,7 +108,6 @@ function NotConnectedPage:render()
 			Size = UDim2.new(1, 0, 0, 34),
 			LayoutOrder = 3,
 			BackgroundTransparency = 1,
-			ZIndex = 2,
 		}, {
 			Settings = e(TextButton, {
 				text = "Settings",
@@ -118,10 +115,6 @@ function NotConnectedPage:render()
 				transparency = self.props.transparency,
 				layoutOrder = 1,
 				onClick = self.props.onNavigateSettings,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "View and modify plugin settings"
-				}),
 			}),
 
 			Connect = e(TextButton, {
@@ -130,10 +123,6 @@ function NotConnectedPage:render()
 				transparency = self.props.transparency,
 				layoutOrder = 2,
 				onClick = self.props.onConnect,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Connect to a Rojo sync server"
-				}),
 			}),
 
 			Layout = e("UIListLayout", {
@@ -159,4 +148,4 @@ function NotConnectedPage:render()
 	})
 end
 
-return NotConnectedPage
+return NotConnectedPage

plugin/src/App/StatusPages/Settings.lua

@@ -0,0 +1,230 @@
+local TextService = game:GetService("TextService")
+
+local Rojo = script:FindFirstAncestor("Rojo")
+local Plugin = Rojo.Plugin
+
+local Roact = require(Rojo.Roact)
+
+local Assets = require(Plugin.Assets)
+local Theme = require(Plugin.App.Theme)
+local PluginSettings = require(Plugin.App.PluginSettings)
+
+local Checkbox = require(Plugin.App.Components.Checkbox)
+local IconButton = require(Plugin.App.Components.IconButton)
+local ScrollingFrame = require(Plugin.App.Components.ScrollingFrame)
+
+local e = Roact.createElement
+
+local DIVIDER_FADE_SIZE = 0.1
+
+local function getTextBounds(text, textSize, font, lineHeight, bounds)
+	local textBounds = TextService:GetTextSize(text, textSize, font, bounds)
+
+	local lineCount = textBounds.Y / textSize
+	local lineHeightAbsolute = textSize * lineHeight
+
+	return Vector2.new(textBounds.X, lineHeightAbsolute * lineCount - (lineHeightAbsolute - textSize))
+end
+
+local function Navbar(props)
+	return Theme.with(function(theme)
+		theme = theme.Settings.Navbar
+
+		return e("Frame", {
+			Size = UDim2.new(1, 0, 0, 46),
+			LayoutOrder = props.layoutOrder,
+			BackgroundTransparency = 1,
+		}, {
+			Back = e(IconButton, {
+				icon = Assets.Images.Icons.Back,
+				iconSize = 24,
+				color = theme.BackButtonColor,
+				transparency = props.transparency,
+
+				position = UDim2.new(0, 0, 0.5, 0),
+				anchorPoint = Vector2.new(0, 0.5),
+
+				onClick = props.onBack,
+			}),
+
+			Text = e("TextLabel", {
+				Text = "Settings",
+				Font = Enum.Font.Gotham,
+				TextSize = 18,
+				TextColor3 = theme.TextColor,
+				TextTransparency = props.transparency,
+
+				Size = UDim2.new(1, 0, 1, 0),
+
+				BackgroundTransparency = 1,
+			})
+		})
+	end)
+end
+
+local Setting = Roact.Component:extend("Setting")
+
+function Setting:init()
+	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
+	self.containerSize, self.setContainerSize = Roact.createBinding(Vector2.new(0, 0))
+end
+
+function Setting:render()
+	return Theme.with(function(theme)
+		theme = theme.Settings
+
+		return PluginSettings.with(function(settings)
+			return e("Frame", {
+				Size = self.contentSize:map(function(value)
+					return UDim2.new(1, 0, 0, 20 + value.Y + 20)
+				end),
+				LayoutOrder = self.props.layoutOrder,
+				BackgroundTransparency = 1,
+
+				[Roact.Change.AbsoluteSize] = function(object)
+					self.setContainerSize(object.AbsoluteSize)
+				end,
+			}, {
+				Checkbox = e(Checkbox, {
+					active = settings:get(self.props.id),
+					transparency = self.props.transparency,
+					position = UDim2.new(1, 0, 0.5, 0),
+					anchorPoint = Vector2.new(1, 0.5),
+					onClick = function()
+						local currentValue = settings:get(self.props.id)
+						settings:set(self.props.id, not currentValue)
+					end,
+				}),
+
+				Text = e("Frame", {
+					Size = UDim2.new(1, 0, 1, 0),
+					BackgroundTransparency = 1,
+				}, {
+					Name = e("TextLabel", {
+						Text = self.props.name,
+						Font = Enum.Font.GothamBold,
+						TextSize = 17,
+						TextColor3 = theme.Setting.NameColor,
+						TextXAlignment = Enum.TextXAlignment.Left,
+						TextTransparency = self.props.transparency,
+
+						Size = UDim2.new(1, 0, 0, 17),
+
+						LayoutOrder = 1,
+						BackgroundTransparency = 1,
+					}),
+
+					Description = e("TextLabel", {
+						Text = self.props.description,
+						Font = Enum.Font.Gotham,
+						LineHeight = 1.2,
+						TextSize = 14,
+						TextColor3 = theme.Setting.DescriptionColor,
+						TextXAlignment = Enum.TextXAlignment.Left,
+						TextTransparency = self.props.transparency,
+						TextWrapped = true,
+
+						Size = self.containerSize:map(function(value)
+							local textBounds = getTextBounds(
+								self.props.description, 14, Enum.Font.Gotham, 1.2,
+								Vector2.new(value.X - 50, math.huge)
+							)
+							return UDim2.new(1, -50, 0, textBounds.Y)
+						end),
+
+						LayoutOrder = 2,
+						BackgroundTransparency = 1,
+					}),
+
+					Layout = e("UIListLayout", {
+						VerticalAlignment = Enum.VerticalAlignment.Center,
+						FillDirection = Enum.FillDirection.Vertical,
+						SortOrder = Enum.SortOrder.LayoutOrder,
+						Padding = UDim.new(0, 6),
+
+						[Roact.Change.AbsoluteContentSize] = function(object)
+							self.setContentSize(object.AbsoluteContentSize)
+						end,
+					}),
+
+					Padding = e("UIPadding", {
+						PaddingTop = UDim.new(0, 20),
+						PaddingBottom = UDim.new(0, 20),
+					}),
+				}),
+
+				Divider = e("Frame", {
+					BackgroundColor3 = theme.DividerColor,
+					BackgroundTransparency = self.props.transparency,
+					Size = UDim2.new(1, 0, 0, 1),
+					BorderSizePixel = 0,
+				}, {
+					Gradient = e("UIGradient", {
+						Transparency = NumberSequence.new({
+							NumberSequenceKeypoint.new(0, 1),
+							NumberSequenceKeypoint.new(DIVIDER_FADE_SIZE, 0),
+							NumberSequenceKeypoint.new(1 - DIVIDER_FADE_SIZE, 0),
+							NumberSequenceKeypoint.new(1, 1),
+						}),
+					}),
+				}),
+			})
+		end)
+	end)
+end
+
+local SettingsPage = Roact.Component:extend("SettingsPage")
+
+function SettingsPage:init()
+	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
+end
+
+function SettingsPage:render()
+	return Theme.with(function(theme)
+		theme = theme.Settings
+
+		return e(ScrollingFrame, {
+			size = UDim2.new(1, 0, 1, 0),
+			contentSize = self.contentSize,
+			transparency = self.props.transparency,
+		}, {
+			Navbar = e(Navbar, {
+				onBack = self.props.onBack,
+				transparency = self.props.transparency,
+				layoutOrder = 0,
+			}),
+
+			OpenScriptsExternally = e(Setting, {
+				id = "openScriptsExternally",
+				name = "Open Scripts Externally",
+				description = "Attempt to open scripts in an external editor",
+				transparency = self.props.transparency,
+				layoutOrder = 1,
+			}),
+
+			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 = 2,
+			}),
+
+			Layout = e("UIListLayout", {
+				FillDirection = Enum.FillDirection.Vertical,
+				SortOrder = Enum.SortOrder.LayoutOrder,
+
+				[Roact.Change.AbsoluteContentSize] = function(object)
+					self.setContentSize(object.AbsoluteContentSize)
+				end,
+			}),
+
+			Padding = e("UIPadding", {
+				PaddingLeft = UDim.new(0, 20),
+				PaddingRight = UDim.new(0, 20),
+			}),
+		})
+	end)
+end
+
+return SettingsPage

plugin/src/App/StatusPages/Settings/Setting.lua

@@ -1,180 +0,0 @@
-local TextService = game:GetService("TextService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local Settings = require(Plugin.Settings)
-local Assets = require(Plugin.Assets)
-local Theme = require(Plugin.App.Theme)
-
-local Checkbox = require(Plugin.App.Components.Checkbox)
-local Dropdown = require(Plugin.App.Components.Dropdown)
-local IconButton = require(Plugin.App.Components.IconButton)
-
-local e = Roact.createElement
-
-local DIVIDER_FADE_SIZE = 0.1
-
-local function getTextBounds(text, textSize, font, lineHeight, bounds)
-	local textBounds = TextService:GetTextSize(text, textSize, font, bounds)
-
-	local lineCount = textBounds.Y / textSize
-	local lineHeightAbsolute = textSize * lineHeight
-
-	return Vector2.new(textBounds.X, lineHeightAbsolute * lineCount - (lineHeightAbsolute - textSize))
-end
-
-local Setting = Roact.Component:extend("Setting")
-
-function Setting:init()
-	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
-	self.containerSize, self.setContainerSize = Roact.createBinding(Vector2.new(0, 0))
-
-	self:setState({
-		setting = Settings:get(self.props.id),
-	})
-
-	self.changedCleanup = Settings:onChanged(self.props.id, function(value)
-		self:setState({
-			setting = value,
-		})
-	end)
-end
-
-function Setting:willUnmount()
-	self.changedCleanup()
-end
-
-function Setting:render()
-	return Theme.with(function(theme)
-		theme = theme.Settings
-
-		return e("Frame", {
-			Size = self.contentSize:map(function(value)
-				return UDim2.new(1, 0, 0, 20 + value.Y + 20)
-			end),
-			LayoutOrder = self.props.layoutOrder,
-			ZIndex = -self.props.layoutOrder,
-			BackgroundTransparency = 1,
-
-			[Roact.Change.AbsoluteSize] = function(object)
-				self.setContainerSize(object.AbsoluteSize)
-			end,
-		}, {
-			Input = if self.props.options ~= nil then
-				e(Dropdown, {
-					options = self.props.options,
-					active = self.state.setting,
-					transparency = self.props.transparency,
-					position = UDim2.new(1, 0, 0.5, 0),
-					anchorPoint = Vector2.new(1, 0.5),
-					onClick = function(option)
-						Settings:set(self.props.id, option)
-					end,
-				})
-			else
-				e(Checkbox, {
-					active = self.state.setting,
-					transparency = self.props.transparency,
-					position = UDim2.new(1, 0, 0.5, 0),
-					anchorPoint = Vector2.new(1, 0.5),
-					onClick = function()
-						local currentValue = Settings:get(self.props.id)
-						Settings:set(self.props.id, not currentValue)
-					end,
-				}),
-
-			Reset = if self.props.onReset then e(IconButton, {
-				icon = Assets.Images.Icons.Reset,
-				iconSize = 24,
-				color = theme.BackButtonColor,
-				transparency = self.props.transparency,
-				visible = self.props.showReset,
-
-				position = UDim2.new(1, -32 - (self.props.options ~= nil and 120 or 40), 0.5, 0),
-				anchorPoint = Vector2.new(0, 0.5),
-
-				onClick = self.props.onReset,
-			}) else nil,
-
-			Text = e("Frame", {
-				Size = UDim2.new(1, 0, 1, 0),
-				BackgroundTransparency = 1,
-			}, {
-				Name = e("TextLabel", {
-					Text = self.props.name,
-					Font = Enum.Font.GothamBold,
-					TextSize = 17,
-					TextColor3 = theme.Setting.NameColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = self.props.transparency,
-
-					Size = UDim2.new(1, 0, 0, 17),
-
-					LayoutOrder = 1,
-					BackgroundTransparency = 1,
-				}),
-
-				Description = e("TextLabel", {
-					Text = self.props.description,
-					Font = Enum.Font.Gotham,
-					LineHeight = 1.2,
-					TextSize = 14,
-					TextColor3 = theme.Setting.DescriptionColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = self.props.transparency,
-					TextWrapped = true,
-
-					Size = self.containerSize:map(function(value)
-						local offset = (self.props.onReset and 34 or 0) + (self.props.options ~= nil and 120 or 40)
-						local textBounds = getTextBounds(
-							self.props.description, 14, Enum.Font.Gotham, 1.2,
-							Vector2.new(value.X - offset, math.huge)
-						)
-						return UDim2.new(1, -offset, 0, textBounds.Y)
-					end),
-
-					LayoutOrder = 2,
-					BackgroundTransparency = 1,
-				}),
-
-				Layout = e("UIListLayout", {
-					VerticalAlignment = Enum.VerticalAlignment.Center,
-					FillDirection = Enum.FillDirection.Vertical,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					Padding = UDim.new(0, 6),
-
-					[Roact.Change.AbsoluteContentSize] = function(object)
-						self.setContentSize(object.AbsoluteContentSize)
-					end,
-				}),
-
-				Padding = e("UIPadding", {
-					PaddingTop = UDim.new(0, 20),
-					PaddingBottom = UDim.new(0, 20),
-				}),
-			}),
-
-			Divider = e("Frame", {
-				BackgroundColor3 = theme.DividerColor,
-				BackgroundTransparency = self.props.transparency,
-				Size = UDim2.new(1, 0, 0, 1),
-				BorderSizePixel = 0,
-			}, {
-				Gradient = e("UIGradient", {
-					Transparency = NumberSequence.new({
-						NumberSequenceKeypoint.new(0, 1),
-						NumberSequenceKeypoint.new(DIVIDER_FADE_SIZE, 0),
-						NumberSequenceKeypoint.new(1 - DIVIDER_FADE_SIZE, 0),
-						NumberSequenceKeypoint.new(1, 1),
-					}),
-				}),
-			}),
-		})
-	end)
-end
-
-return Setting

plugin/src/App/StatusPages/Settings/init.lua

@@ -1,163 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Log = require(Packages.Log)
-
-local Assets = require(Plugin.Assets)
-local Settings = require(Plugin.Settings)
-local Theme = require(Plugin.App.Theme)
-
-local IconButton = require(Plugin.App.Components.IconButton)
-local ScrollingFrame = require(Plugin.App.Components.ScrollingFrame)
-local Tooltip = require(Plugin.App.Components.Tooltip)
-local Setting = require(script.Setting)
-
-local e = Roact.createElement
-
-local function invertTbl(tbl)
-	local new = {}
-	for key, value in tbl do
-		new[value] = key
-	end
-	return new
-end
-
-local invertedLevels = invertTbl(Log.Level)
-
-local function Navbar(props)
-	return Theme.with(function(theme)
-		theme = theme.Settings.Navbar
-
-		return e("Frame", {
-			Size = UDim2.new(1, 0, 0, 46),
-			LayoutOrder = props.layoutOrder,
-			BackgroundTransparency = 1,
-		}, {
-			Back = e(IconButton, {
-				icon = Assets.Images.Icons.Back,
-				iconSize = 24,
-				color = theme.BackButtonColor,
-				transparency = props.transparency,
-
-				position = UDim2.new(0, 0, 0.5, 0),
-				anchorPoint = Vector2.new(0, 0.5),
-
-				onClick = props.onBack,
-			}, {
-				Tip = e(Tooltip.Trigger, {
-					text = "Back"
-				}),
-			}),
-
-			Text = e("TextLabel", {
-				Text = "Settings",
-				Font = Enum.Font.Gotham,
-				TextSize = 18,
-				TextColor3 = theme.TextColor,
-				TextTransparency = props.transparency,
-
-				Size = UDim2.new(1, 0, 1, 0),
-
-				BackgroundTransparency = 1,
-			})
-		})
-	end)
-end
-
-local SettingsPage = Roact.Component:extend("SettingsPage")
-
-function SettingsPage:init()
-	self.contentSize, self.setContentSize = Roact.createBinding(Vector2.new(0, 0))
-end
-
-function SettingsPage:render()
-	return Theme.with(function(theme)
-		theme = theme.Settings
-
-		return e(ScrollingFrame, {
-			size = UDim2.new(1, 0, 1, 0),
-			contentSize = self.contentSize,
-			transparency = self.props.transparency,
-		}, {
-			Navbar = e(Navbar, {
-				onBack = self.props.onBack,
-				transparency = self.props.transparency,
-				layoutOrder = 0,
-			}),
-
-			OpenScriptsExternally = e(Setting, {
-				id = "openScriptsExternally",
-				name = "Open Scripts Externally",
-				description = "Attempt to open scripts in an external editor",
-				transparency = self.props.transparency,
-				layoutOrder = 1,
-			}),
-
-			ShowNotifications = e(Setting, {
-				id = "showNotifications",
-				name = "Show Notifications",
-				description = "Popup notifications in viewport",
-				transparency = self.props.transparency,
-				layoutOrder = 2,
-			}),
-
-			PlaySounds = e(Setting, {
-				id = "playSounds",
-				name = "Play Sounds",
-				description = "Toggle sound effects",
-				transparency = self.props.transparency,
-				layoutOrder = 3,
-			}),
-
-			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 = 4,
-			}),
-
-			LogLevel = e(Setting, {
-				id = "logLevel",
-				name = "Log Level",
-				description = "Plugin output verbosity level",
-				transparency = self.props.transparency,
-				layoutOrder = 5,
-
-				options = invertedLevels,
-				showReset = Settings:getBinding("logLevel"):map(function(value)
-					return value ~= "Info"
-				end),
-				onReset = function()
-					Settings:set("logLevel", "Info")
-				end,
-			}),
-
-			TypecheckingEnabled = e(Setting, {
-				id = "typecheckingEnabled",
-				name = "Typechecking",
-				description = "Toggle typechecking on the API surface",
-				transparency = self.props.transparency,
-				layoutOrder = 6,
-			}),
-
-			Layout = e("UIListLayout", {
-				FillDirection = Enum.FillDirection.Vertical,
-				SortOrder = Enum.SortOrder.LayoutOrder,
-
-				[Roact.Change.AbsoluteContentSize] = function(object)
-					self.setContentSize(object.AbsoluteContentSize)
-				end,
-			}),
-
-			Padding = e("UIPadding", {
-				PaddingLeft = UDim.new(0, 20),
-				PaddingRight = UDim.new(0, 20),
-			}),
-		})
-	end)
-end
-
-return SettingsPage

plugin/src/App/StatusPages/init.lua

@@ -2,7 +2,6 @@ return {
 	NotConnected = require(script.NotConnected),
 	Settings = require(script.Settings),
 	Connecting = require(script.Connecting),
-	Confirming = require(script.Confirming),
 	Connected = require(script.Connected),
 	Error = require(script.Error),
-}
+}

plugin/src/App/Theme.lua

@@ -16,10 +16,9 @@ local function getStudio()
 end
 
 local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Log = require(Packages.Log)
+local Log = require(Rojo.Log)
 
 local strict = require(script.Parent.Parent.strict)
 
@@ -72,17 +71,6 @@ local lightTheme = strict("LightTheme", {
 			BorderColor = hexColor(0xAFAFAF),
 		},
 	},
-	Dropdown = {
-		TextColor = hexColor(0x00000),
-		BorderColor = hexColor(0xAFAFAF),
-		BackgroundColor = hexColor(0xEEEEEE),
-		Open = {
-			IconColor = BRAND_COLOR,
-		},
-		Closed = {
-			IconColor = hexColor(0xEEEEEE),
-		},
-	},
 	AddressEntry = {
 		TextColor = hexColor(0x000000),
 		PlaceholderColor = hexColor(0x8C8C8C)
@@ -95,12 +83,6 @@ local lightTheme = strict("LightTheme", {
 		ForegroundColor = BRAND_COLOR,
 		BackgroundColor = hexColor(0xEEEEEE),
 	},
-	Diff = {
-		Add = hexColor(0xbaffbd),
-		Remove = hexColor(0xffbdba),
-		Edit = hexColor(0xbacdff),
-		Row = hexColor(0x000000),
-	},
 	ConnectionDetails = {
 		ProjectNameColor = hexColor(0x00000),
 		AddressColor = hexColor(0x00000),
@@ -121,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),
 })
@@ -167,17 +145,6 @@ local darkTheme = strict("DarkTheme", {
 			BorderColor = hexColor(0x5A5A5A),
 		},
 	},
-	Dropdown = {
-		TextColor = hexColor(0xFFFFFF),
-		BorderColor = hexColor(0x5A5A5A),
-		BackgroundColor = hexColor(0x2B2B2B),
-		Open = {
-			IconColor = BRAND_COLOR,
-		},
-		Closed = {
-			IconColor = hexColor(0x484848),
-		},
-	},
 	AddressEntry = {
 		TextColor = hexColor(0xFFFFFF),
 		PlaceholderColor = hexColor(0x8B8B8B)
@@ -190,12 +157,6 @@ local darkTheme = strict("DarkTheme", {
 		ForegroundColor = BRAND_COLOR,
 		BackgroundColor = hexColor(0x2B2B2B),
 	},
-	Diff = {
-		Add = hexColor(0x273732),
-		Remove = hexColor(0x3F2D32),
-		Edit = hexColor(0x193345),
-		Row = hexColor(0xFFFFFF),
-	},
 	ConnectionDetails = {
 		ProjectNameColor = hexColor(0xFFFFFF),
 		AddressColor = hexColor(0xFFFFFF),
@@ -216,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/bindingUtil.lua

@@ -1,8 +1,7 @@
 local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Log = require(Packages.Log)
+local Log = require(Rojo.Log)
 
 local LERP_DATA_TYPES = {
 	Color3 = true,
@@ -56,4 +55,4 @@ return {
 	mapLerp = mapLerp,
 	deriveProperty = deriveProperty,
 	blendAlpha = blendAlpha,
-}
+}

plugin/src/App/init.lua

@@ -1,29 +1,21 @@
-local Players = game:GetService("Players")
-local ServerStorage = game:GetService("ServerStorage")
-
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
 
-local Roact = require(Packages.Roact)
+local Roact = require(Rojo.Roact)
-local Log = require(Packages.Log)
+local Log = require(Rojo.Log)
 
 local Assets = require(Plugin.Assets)
 local Version = require(Plugin.Version)
 local Config = require(Plugin.Config)
-local Settings = require(Plugin.Settings)
 local strict = require(Plugin.strict)
 local Dictionary = require(Plugin.Dictionary)
 local ServeSession = require(Plugin.ServeSession)
 local ApiContext = require(Plugin.ApiContext)
-local PatchSet = require(Plugin.PatchSet)
 local preloadAssets = require(Plugin.preloadAssets)
-local soundPlayer = require(Plugin.soundPlayer)
 local Theme = require(script.Theme)
+local PluginSettings = require(script.PluginSettings)
 
 local Page = require(script.Page)
-local Notifications = require(script.Notifications)
-local Tooltip = require(script.Components.Tooltip)
 local StudioPluginAction = require(script.Components.Studio.StudioPluginAction)
 local StudioToolbar = require(script.Components.Studio.StudioToolbar)
 local StudioToggleButton = require(script.Components.Studio.StudioToggleButton)
@@ -35,7 +27,6 @@ local AppStatus = strict("AppStatus", {
 	NotConnected = "NotConnected",
 	Settings = "Settings",
 	Connecting = "Connecting",
-	Confirming = "Confirming",
 	Connected = "Connected",
 	Error = "Error",
 })
@@ -47,91 +38,16 @@ local App = Roact.Component:extend("App")
 function App:init()
 	preloadAssets()
 
-	local priorHost, priorPort = self:getPriorEndpoint()
+	self.host, self.setHost = Roact.createBinding("")
-	self.host, self.setHost = Roact.createBinding(priorHost or "")
+	self.port, self.setPort = Roact.createBinding("")
-	self.port, self.setPort = Roact.createBinding(priorPort or "")
-
-	self.patchInfo, self.setPatchInfo = Roact.createBinding({
-		patch = PatchSet.newEmpty(),
-		timestamp = os.time(),
-	})
-	self.confirmationBindable = Instance.new("BindableEvent")
-	self.confirmationEvent = self.confirmationBindable.Event
 
 	self:setState({
 		appStatus = AppStatus.NotConnected,
 		guiEnabled = false,
-		confirmData = {},
-		notifications = {},
 		toolbarIcon = Assets.Images.PluginButton,
 	})
 end
 
-function App:addNotification(text: string, timeout: number?)
-	if not 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:getPriorEndpoint()
-	local priorEndpoints = Settings:get("priorEndpoints")
-	if not priorEndpoints then return end
-
-	local place = priorEndpoints[tostring(game.PlaceId)]
-	if not place then return end
-
-	return place.host, place.port
-end
-
-function App:setPriorEndpoint(host: string, port: string)
-	local priorEndpoints = Settings:get("priorEndpoints")
-	if not priorEndpoints then
-		priorEndpoints = {}
-	end
-
-	-- Clear any stale saves to avoid disc bloat
-	for placeId, endpoint in priorEndpoints do
-		if os.time() - endpoint.timestamp > 12_960_000 then
-			priorEndpoints[placeId] = nil
-			Log.trace("Cleared stale saved endpoint for {}", placeId)
-		end
-	end
-
-	if host == Config.defaultHost and port == Config.defaultPort then
-		-- Don't save default
-		priorEndpoints[tostring(game.PlaceId)] = nil
-	else
-		priorEndpoints[tostring(game.PlaceId)] = {
-			host = host ~= Config.defaultHost and host or nil,
-			port = port ~= Config.defaultPort and port or nil,
-			timestamp = os.time(),
-		}
-		Log.trace("Saved last used endpoint for {}", game.PlaceId)
-	end
-
-	Settings:set("priorEndpoints", priorEndpoints)
-end
-
 function App:getHostAndPort()
 	local host = self.host:getValue()
 	local port = self.port:getValue()
@@ -142,75 +58,15 @@ function App:getHostAndPort()
 	return host, port
 end
 
-function App:claimSyncLock()
-	if #Players:GetPlayers() == 0 then
-		Log.trace("Skipping sync lock because this isn't in Team Create")
-		return true
-	end
-
-	local lock = ServerStorage:FindFirstChild("__Rojo_SessionLock")
-	if not lock then
-		lock = Instance.new("ObjectValue")
-		lock.Name = "__Rojo_SessionLock"
-		lock.Archivable = false
-		lock.Value = Players.LocalPlayer
-		lock.Parent = ServerStorage
-		Log.trace("Created and claimed sync lock")
-		return true
-	end
-
-	if lock.Value and lock.Value ~= Players.LocalPlayer and lock.Value.Parent then
-		Log.trace("Found existing sync lock owned by {}", lock.Value)
-		return false, lock.Value
-	end
-
-	lock.Value = Players.LocalPlayer
-	Log.trace("Claimed existing sync lock")
-	return true
-end
-
-function App:releaseSyncLock()
-	local lock = ServerStorage:FindFirstChild("__Rojo_SessionLock")
-	if not lock then
-		Log.trace("No sync lock found, assumed released")
-		return
-	end
-
-	if lock.Value == Players.LocalPlayer then
-		lock.Value = nil
-		Log.trace("Released sync lock")
-		return
-	end
-
-	Log.trace("Could not relase sync lock because it is owned by {}", lock.Value)
-end
-
 function App:startSession()
-	local claimedLock, priorOwner = self:claimSyncLock()
-	if not claimedLock then
-		local msg = string.format("Could not sync because user '%s' is already syncing", tostring(priorOwner))
-
-		Log.warn(msg)
-		self:addNotification(msg, 10)
-		self:setState({
-			appStatus = AppStatus.Error,
-			errorMessage = msg,
-			toolbarIcon = Assets.Images.PluginButtonWarning,
-		})
-
-		return
-	end
-
 	local host, port = self:getHostAndPort()
 
 	local sessionOptions = {
-		openScriptsExternally = Settings:get("openScriptsExternally"),
+		openScriptsExternally = self.props.settings:get("openScriptsExternally"),
-		twoWaySync = Settings:get("twoWaySync"),
+		twoWaySync = self.props.settings:get("twoWaySync"),
 	}
 
-	local baseUrl = if string.find(host, "^https?://")
+	local baseUrl = ("http://%s:%s"):format(host, port)
-		then string.format("%s:%s", host, port)
-		else string.format("http://%s:%s", host, port)
 	local apiContext = ApiContext.new(baseUrl)
 
 	local serveSession = ServeSession.new({
@@ -219,42 +75,12 @@ function App:startSession()
 		twoWaySync = sessionOptions.twoWaySync,
 	})
 
-	serveSession:onPatchApplied(function(patch, _unapplied)
-		if PatchSet.isEmpty(patch) then
-			-- Ignore empty patches
-			return
-		end
-
-		local now = os.time()
-
-		local old = self.patchInfo:getValue()
-		if now - old.timestamp < 2 then
-			-- Patches that apply in the same second are
-			-- considered to be part of the same change for human clarity
-			local merged = PatchSet.newEmpty()
-			PatchSet.assign(merged, old.patch, patch)
-
-			self.setPatchInfo({
-				patch = merged,
-				timestamp = now,
-			})
-		else
-			self.setPatchInfo({
-				patch = patch,
-				timestamp = now,
-			})
-		end
-	end)
-
 	serveSession:onStatusChanged(function(status, details)
 		if status == ServeSession.Status.Connecting then
-			self:setPriorEndpoint(host, port)
-
 			self:setState({
 				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({
@@ -263,10 +89,10 @@ 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
-			self:releaseSyncLock()
 
 			-- Details being present indicates that this
 			-- disconnection was from an error.
@@ -278,56 +104,20 @@ 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)
 
-	serveSession:setConfirmCallback(function(instanceMap, patch, serverInfo)
-		if PatchSet.isEmpty(patch) then
-			return "Accept"
-		end
-
-		self:setState({
-			appStatus = AppStatus.Confirming,
-			confirmData = {
-				instanceMap = instanceMap,
-				patch = patch,
-				serverInfo = serverInfo,
-			},
-			toolbarIcon = Assets.Images.PluginButton,
-		})
-
-		self:addNotification(
-			string.format(
-				"Please accept%sor abort the initializing sync session.",
-				Settings:get("twoWaySync") and ", reject, " or " "
-			),
-			7
-		)
-
-		return self.confirmationEvent:Wait()
-	end)
-
 	serveSession:start()
 
 	self.serveSession = serveSession
-
-	task.defer(function()
-		while self.serveSession == serveSession do
-			-- Trigger rerender to update timestamp text
-			local patchInfo = table.clone(self.patchInfo:getValue())
-			self.setPatchInfo(patchInfo)
-			local elapsed = os.time() - patchInfo.timestamp
-			task.wait(elapsed < 60 and 1 or elapsed / 5)
-		end
-	end)
 end
 
 function App:endSession()
@@ -364,120 +154,86 @@ function App:render()
 		value = self.props.plugin,
 	}, {
 		e(Theme.StudioProvider, nil, {
-			e(Tooltip.Provider, nil, {
+			gui = e(StudioPluginGui, {
-				gui = e(StudioPluginGui, {
+				id = pluginName,
-					id = pluginName,
+				title = pluginName,
-					title = pluginName,
+				active = self.state.guiEnabled,
-					active = self.state.guiEnabled,
 
-					initDockState = Enum.InitialDockState.Right,
+				initDockState = Enum.InitialDockState.Right,
-					initEnabled = false,
+				initEnabled = false,
-					overridePreviousState = false,
+				overridePreviousState = false,
-					floatingSize = Vector2.new(300, 200),
+				floatingSize = Vector2.new(300, 200),
-					minimumSize = Vector2.new(300, 120),
+				minimumSize = Vector2.new(300, 200),
 
-					zIndexBehavior = Enum.ZIndexBehavior.Sibling,
+				zIndexBehavior = Enum.ZIndexBehavior.Sibling,
 
-					onInitialState = function(initialState)
+				onInitialState = function(initialState)
+					self:setState({
+						guiEnabled = initialState,
+					})
+				end,
+
+				onClose = function()
+					self:setState({
+						guiEnabled = false,
+					})
+				end,
+			}, {
+				NotConnectedPage = createPageElement(AppStatus.NotConnected, {
+					host = self.host,
+					onHostChange = self.setHost,
+					port = self.port,
+					onPortChange = self.setPort,
+
+					onConnect = function()
+						self:startSession()
+					end,
+
+					onNavigateSettings = function()
 						self:setState({
-							guiEnabled = initialState,
+							appStatus = AppStatus.Settings,
 						})
 					end,
+				}),
+
+				Connecting = createPageElement(AppStatus.Connecting),
+
+				Connected = createPageElement(AppStatus.Connected, {
+					projectName = self.state.projectName,
+					address = self.state.address,
+
+					onDisconnect = function()
+						self:endSession()
+					end,
+				}),
+
+				Settings = createPageElement(AppStatus.Settings, {
+					onBack = function()
+						self:setState({
+							appStatus = AppStatus.NotConnected,
+						})
+					end,
+				}),
+
+				Error = createPageElement(AppStatus.Error, {
+					errorMessage = self.state.errorMessage,
 
 					onClose = function()
 						self:setState({
-							guiEnabled = false,
+							appStatus = AppStatus.NotConnected,
+							toolbarIcon = Assets.Images.PluginButton,
 						})
 					end,
-				}, {
-					Tooltips = e(Tooltip.Container, nil),
-
-					NotConnectedPage = createPageElement(AppStatus.NotConnected, {
-						host = self.host,
-						onHostChange = self.setHost,
-						port = self.port,
-						onPortChange = self.setPort,
-
-						onConnect = function()
-							self:startSession()
-						end,
-
-						onNavigateSettings = function()
-							self:setState({
-								appStatus = AppStatus.Settings,
-							})
-						end,
-					}),
-
-					ConfirmingPage = createPageElement(AppStatus.Confirming, {
-						confirmData = self.state.confirmData,
-						createPopup = not self.state.guiEnabled,
-
-						onAbort = function()
-							self.confirmationBindable:Fire("Abort")
-						end,
-						onAccept = function()
-							self.confirmationBindable:Fire("Accept")
-						end,
-						onReject = function()
-							self.confirmationBindable:Fire("Reject")
-						end,
-					}),
-
-					Connecting = createPageElement(AppStatus.Connecting),
-
-					Connected = createPageElement(AppStatus.Connected, {
-						projectName = self.state.projectName,
-						address = self.state.address,
-						patchInfo = self.patchInfo,
-						serveSession = self.serveSession,
-
-						onDisconnect = function()
-							self:endSession()
-						end,
-					}),
-
-					Settings = createPageElement(AppStatus.Settings, {
-						onBack = function()
-							self:setState({
-								appStatus = AppStatus.NotConnected,
-							})
-						end,
-					}),
-
-					Error = createPageElement(AppStatus.Error, {
-						errorMessage = self.state.errorMessage,
-
-						onClose = function()
-							self:setState({
-								appStatus = AppStatus.NotConnected,
-								toolbarIcon = Assets.Images.PluginButton,
-							})
-						end,
-					}),
 				}),
 
-				RojoNotifications = e("ScreenGui", {}, {
+				Background = Theme.with(function(theme)
-					layout = e("UIListLayout", {
+					return e("Frame", {
-						SortOrder = Enum.SortOrder.LayoutOrder,
+						Size = UDim2.new(1, 0, 1, 0),
-						HorizontalAlignment = Enum.HorizontalAlignment.Right,
+						BackgroundColor3 = theme.BackgroundColor,
-						VerticalAlignment = Enum.VerticalAlignment.Bottom,
+						ZIndex = 0,
-						Padding = UDim.new(0, 5),
+						BorderSizePixel = 0,
-					}),
+					})
-					padding = e("UIPadding", {
+				end),
-						PaddingTop = UDim.new(0, 5),
-						PaddingBottom = UDim.new(0, 5),
-						PaddingLeft = UDim.new(0, 5),
-						PaddingRight = UDim.new(0, 5),
-					}),
-					notifs = e(Notifications, {
-						soundPlayer = self.props.soundPlayer,
-						notifications = self.state.notifications,
-						onClose = function(index)
-							self:closeNotification(index)
-						end,
-					}),
-				}),
 			}),
 
 			toggleAction = e(StudioPluginAction, {
@@ -489,9 +245,7 @@ function App:render()
 				onTriggered = function()
 					if self.serveSession == nil or self.serveSession:getStatus() == ServeSession.Status.NotStarted then
 						self:startSession()
-					elseif
+					elseif self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected then
-						self.serveSession ~= nil and self.serveSession:getStatus() == ServeSession.Status.Connected
-					then
 						self:endSession()
 					end
 				end,
@@ -539,16 +293,21 @@ function App:render()
 							}
 						end)
 					end,
-				}),
+				})
 			}),
 		}),
 	})
 end
 
 return function(props)
-	local mergedProps = Dictionary.merge(props, {
+	return e(PluginSettings.StudioProvider, {
-		soundPlayer = soundPlayer.new(Settings),
+		plugin = props.plugin,
+	}, {
+		App = PluginSettings.with(function(settings)
+			local settingsProps = Dictionary.merge(props, {
+				settings = settings,
+			})
+			return e(App, settingsProps)
+		end),
 	})
-
-	return e(App, mergedProps)
 end

plugin/src/Assets.lua

@@ -23,20 +23,11 @@ local Assets = {
 		Icons = {
 			Close = "rbxassetid://6012985953",
 			Back = "rbxassetid://6017213752",
-			Reset = "rbxassetid://10142422327",
-		},
-		Diff = {
-			Add = "rbxassetid://10434145835",
-			Remove = "rbxassetid://10434408368",
-			Edit = "rbxassetid://10434144680",
 		},
 		Checkbox = {
 			Active = "rbxassetid://6016251644",
 			Inactive = "rbxassetid://6016251963",
 		},
-		Dropdown = {
-			Arrow = "rbxassetid://10131770538",
-		},
 		Spinner = {
 			Foreground = "rbxassetid://3222731032",
 			Background = "rbxassetid://3222730627",
@@ -54,9 +45,6 @@ local Assets = {
 			[500] = "rbxassetid://2609138523"
 		},
 	},
-	Sounds = {
-		Notification = "rbxassetid://203785492",
-	},
 	StartSession = "",
 	SessionActive = "",
 	Configure = "",
@@ -74,4 +62,4 @@ end
 
 guardForTypos("Assets", Assets)
 
-return Assets
+return Assets

plugin/src/ChangeBatcher/createPatchSet.lua

@@ -5,8 +5,7 @@
 	of instances) and return the patch.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Parent.Log)
-local Log = require(Packages.Log)
 
 local PatchSet = require(script.Parent.Parent.PatchSet)
 

plugin/src/ChangeBatcher/encodePatchUpdate.lua

@@ -1,6 +1,5 @@
-local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Parent.Log)
-local Log = require(Packages.Log)
+local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local RbxDom = require(Packages.RbxDom)
 
 local encodeProperty = require(script.Parent.encodeProperty)
 

plugin/src/ChangeBatcher/encodeProperty.lua

@@ -1,6 +1,5 @@
-local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Parent.Log)
-local Log = require(Packages.Log)
+local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local RbxDom = require(Packages.RbxDom)
 
 return function(instance, propertyName, propertyDescriptor)
 	local readSuccess, readResult = propertyDescriptor:read(instance)

plugin/src/Config.lua

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

plugin/src/DevSettings.lua

@@ -0,0 +1,139 @@
+local Config = require(script.Parent.Config)
+
+local Environment = {
+	User = "User",
+	Dev = "Dev",
+	Test = "Test",
+}
+
+local DEFAULT_ENVIRONMENT = Config.isDevBuild and Environment.Dev or Environment.User
+
+local VALUES = {
+	LogLevel = {
+		type = "IntValue",
+		values = {
+			[Environment.User] = 2,
+			[Environment.Dev] = 4,
+			[Environment.Test] = 4,
+		},
+	},
+	TypecheckingEnabled = {
+		type = "BoolValue",
+		values = {
+			[Environment.User] = false,
+			[Environment.Dev] = true,
+			[Environment.Test] = true,
+		},
+	},
+}
+
+local CONTAINER_NAME = "RojoDevSettings" .. Config.codename
+
+local function getValueContainer()
+	return game:FindFirstChild(CONTAINER_NAME)
+end
+
+local valueContainer = getValueContainer()
+
+game.ChildAdded:Connect(function(child)
+	local success, name = pcall(function()
+		return child.Name
+	end)
+
+	if success and name == CONTAINER_NAME then
+		valueContainer = child
+	end
+end)
+
+local function getStoredValue(name)
+	if valueContainer == nil then
+		return nil
+	end
+
+	local valueObject = valueContainer:FindFirstChild(name)
+
+	if valueObject == nil then
+		return nil
+	end
+
+	return valueObject.Value
+end
+
+local function setStoredValue(name, kind, value)
+	local object = valueContainer:FindFirstChild(name)
+
+	if object == nil then
+		object = Instance.new(kind)
+		object.Name = name
+		object.Parent = valueContainer
+	end
+
+	object.Value = value
+end
+
+local function createAllValues(environment)
+	assert(Environment[environment] ~= nil, "Invalid environment")
+
+	valueContainer = getValueContainer()
+
+	if valueContainer == nil then
+		valueContainer = Instance.new("Folder")
+		valueContainer.Name = CONTAINER_NAME
+		valueContainer.Parent = game
+	end
+
+	for name, value in pairs(VALUES) do
+		setStoredValue(name, value.type, value.values[environment])
+	end
+end
+
+local function getValue(name)
+	assert(VALUES[name] ~= nil, "Invalid DevSettings name")
+
+	local stored = getStoredValue(name)
+
+	if stored ~= nil then
+		return stored
+	end
+
+	return VALUES[name].values[DEFAULT_ENVIRONMENT]
+end
+
+local DevSettings = {}
+
+function DevSettings:createDevSettings()
+	createAllValues(Environment.Dev)
+end
+
+function DevSettings:createTestSettings()
+	createAllValues(Environment.Test)
+end
+
+function DevSettings:hasChangedValues()
+	return valueContainer ~= nil
+end
+
+function DevSettings:resetValues()
+	if valueContainer then
+		valueContainer:Destroy()
+		valueContainer = nil
+	end
+end
+
+function DevSettings:isEnabled()
+	return valueContainer ~= nil
+end
+
+function DevSettings:getLogLevel()
+	return getValue("LogLevel")
+end
+
+function DevSettings:shouldTypecheck()
+	return getValue("TypecheckingEnabled")
+end
+
+function _G.ROJO_DEV_CREATE()
+	DevSettings:createDevSettings()
+end
+
+return DevSettings

plugin/src/InstanceMap.lua

@@ -1,7 +1,6 @@
 local RunService = game:GetService("RunService")
 
-local Packages = script.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Log)
-local Log = require(Packages.Log)
 
 --[[
 	A bidirectional map between instance IDs and Roblox instances. It lets us

plugin/src/PatchSet.lua

@@ -3,45 +3,10 @@
 	patch returned from the API.
 ]]
 
-local Packages = script.Parent.Parent.Packages
+local t = require(script.Parent.Parent.t)
-local t = require(Packages.t)
 
 local Types = require(script.Parent.Types)
 
-local function deepEqual(a: any, b: any): boolean
-	local typeA = typeof(a)
-	if typeA ~= typeof(b) then
-		return false
-	end
-
-	if typeof(a) == "table" then
-		local checkedKeys = {}
-
-		for key, value in a do
-			checkedKeys[key] = true
-
-			if deepEqual(value, b[key]) == false then
-				return false
-			end
-		end
-
-		for key, value in b do
-			if checkedKeys[key] then continue end
-			if deepEqual(value, a[key]) == false then
-				return false
-			end
-		end
-
-		return true
-	end
-
-	if a == b then
-		return true
-	end
-
-	return false
-end
-
 local PatchSet = {}
 
 PatchSet.validate = t.interface({
@@ -91,32 +56,6 @@ function PatchSet.hasUpdates(patchSet)
 	return next(patchSet.updated) ~= nil
 end
 
---[[
-	Tells whether the given PatchSets are equal.
-]]
-function PatchSet.isEqual(patchA, patchB)
-	return deepEqual(patchA, patchB)
-end
-
---[[
-	Count the number of changes in the given PatchSet.
-]]
-function PatchSet.countChanges(patch)
-	local count = 0
-
-	for _ in patch.added do
-		count += 1
-	end
-	for _ in patch.removed do
-		count += 1
-	end
-	for _ in patch.updated do
-		count += 1
-	end
-
-	return count
-end
-
 --[[
 	Merge multiple PatchSet objects into the given PatchSet.
 ]]
@@ -242,4 +181,4 @@ function PatchSet.humanSummary(instanceMap, patchSet)
 	return table.concat(statements, "\n")
 end
 
-return PatchSet
+return PatchSet

plugin/src/Reconciler/Error.lua

@@ -2,8 +2,7 @@
 	Defines the errors that can be returned by the reconciler.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local Fmt = require(script.Parent.Parent.Parent.Fmt)
-local Fmt = require(Packages.Fmt)
 
 local Error = {}
 
@@ -35,4 +34,4 @@ function Error:__tostring()
 	return Fmt.fmt("Error({}): {:#?}", self.kind, self.details)
 end
 
-return Error
+return Error

plugin/src/Reconciler/applyPatch.lua

@@ -5,8 +5,7 @@
 	Patches can come from the server or be generated by the client.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Parent.Log)
-local Log = require(Packages.Log)
 
 local PatchSet = require(script.Parent.Parent.PatchSet)
 local Types = require(script.Parent.Parent.Types)

plugin/src/Reconciler/decodeValue.lua

@@ -3,8 +3,7 @@
 	usable by Rojo's reconciler, potentially using RbxDom.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)
 
 local function decodeValue(encodedValue, instanceMap)
@@ -39,4 +38,4 @@ local function decodeValue(encodedValue, instanceMap)
 	return true, decodedValue
 end
 
-return decodeValue
+return decodeValue

plugin/src/Reconciler/diff.lua

@@ -3,9 +3,7 @@
 	patch that can be later applied.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Parent.Log)
-local Log = require(Packages.Log)
-
 local invariant = require(script.Parent.Parent.invariant)
 local getProperty = require(script.Parent.getProperty)
 local Error = require(script.Parent.Error)
@@ -15,86 +13,6 @@ local function isEmpty(table)
 	return next(table) == nil
 end
 
-local function fuzzyEq(a: number, b: number, epsilon: number): boolean
-	return math.abs(a - b) < epsilon
-end
-
-local function trueEquals(a, b): boolean
-	-- Exit early for simple equality values
-	if a == b then
-		return true
-	end
-
-	local typeA, typeB = typeof(a), typeof(b)
-
-	-- For tables, try recursive deep equality
-	if typeA == "table" and typeB == "table" then
-		local checkedKeys = {}
-		for key, value in pairs(a) do
-			checkedKeys[key] = true
-			if not trueEquals(value, b[key]) then
-				return false
-			end
-		end
-		for key, value in pairs(b) do
-			if checkedKeys[key] then continue end
-			if not trueEquals(value, a[key]) then
-				return false
-			end
-		end
-		return true
-
-	-- For numbers, compare with epsilon of 0.0001 to avoid floating point inequality
-	elseif typeA == "number" and typeB == "number" then
-		return fuzzyEq(a, b, 0.0001)
-
-	-- For EnumItem->number, compare the EnumItem's value
-	elseif typeA == "number" and typeB == "EnumItem" then
-		return a == b.Value
-	elseif typeA == "EnumItem" and typeB == "number" then
-		return a.Value == b
-
-	-- For Color3s, compare to RGB ints to avoid floating point inequality
-	elseif typeA == "Color3" and typeB == "Color3" then
-		local aR, aG, aB = math.floor(a.R * 255), math.floor(a.G * 255), math.floor(a.B * 255)
-		local bR, bG, bB = math.floor(b.R * 255), math.floor(b.G * 255), math.floor(b.B * 255)
-		return aR == bR and aG == bG and aB == bB
-
-	-- For CFrames, compare to components with epsilon of 0.0001 to avoid floating point inequality
-	elseif typeA == "CFrame" and typeB == "CFrame" then
-		local aComponents, bComponents = {a:GetComponents()}, {b:GetComponents()}
-		for i, aComponent in aComponents do
-			if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
-				return false
-			end
-		end
-		return true
-
-	-- For Vector3s, compare to components with epsilon of 0.0001 to avoid floating point inequality
-	elseif typeA == "Vector3" and typeB == "Vector3" then
-		local aComponents, bComponents = {a.X, a.Y, a.Z}, {b.X, b.Y, b.Z}
-		for i, aComponent in aComponents do
-			if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
-				return false
-			end
-		end
-		return true
-
-	-- For Vector2s, compare to components with epsilon of 0.0001 to avoid floating point inequality
-	elseif typeA == "Vector2" and typeB == "Vector2" then
-		local aComponents, bComponents = {a.X, a.Y}, {b.X, b.Y}
-		for i, aComponent in aComponents do
-			if not fuzzyEq(aComponent, bComponents[i], 0.0001) then
-				return false
-			end
-		end
-		return true
-
-	end
-
-	return false
-end
-
 local function shouldDeleteUnknownInstances(virtualInstance)
 	if virtualInstance.Metadata ~= nil then
 		return not virtualInstance.Metadata.ignoreUnknownInstances
@@ -153,8 +71,7 @@ local function diff(instanceMap, virtualInstances, rootId)
 				local ok, decodedValue = decodeValue(virtualValue, instanceMap)
 
 				if ok then
-					if not trueEquals(existingValue, decodedValue) then
+					if existingValue ~= decodedValue then
-						Log.debug("{}.{} changed from '{}' to '{}'", instance:GetFullName(), propertyName, existingValue, decodedValue)
 						changedProperties[propertyName] = virtualValue
 					end
 				else
@@ -196,16 +113,6 @@ local function diff(instanceMap, virtualInstances, rootId)
 			local childId = instanceMap.fromInstances[childInstance]
 
 			if childId == nil then
-				-- pcall to avoid security permission errors
-				local success, skip = pcall(function()
-					-- We don't remove instances that aren't going to be saved anyway,
-					-- such as the Rojo session lock value.
-					return childInstance.Archivable == false
-				end)
-				if success and skip then
-					continue
-				end
-
 				-- This is an existing instance not present in the virtual DOM.
 				-- We can mark it for deletion unless the user has asked us not
 				-- to delete unknown stuff.
@@ -245,4 +152,4 @@ local function diff(instanceMap, virtualInstances, rootId)
 	return true, patch
 end
 
-return diff
+return diff

plugin/src/Reconciler/diff.spec.lua

@@ -1,6 +1,5 @@
 return function()
-	local Packages = script.Parent.Parent.Parent.Packages
+	local Log = require(script.Parent.Parent.Parent.Log)
-	local Log = require(Packages.Log)
 
 	local InstanceMap = require(script.Parent.Parent.InstanceMap)
 	local PatchSet = require(script.Parent.Parent.PatchSet)
@@ -287,4 +286,4 @@ return function()
 		expect(size(patch.added)).to.equal(1)
 		expect(patch.added["CHILD"]).to.equal(virtualInstances["CHILD"])
 	end)
-end
+end

plugin/src/Reconciler/getProperty.lua

@@ -2,8 +2,7 @@
 	Attempts to read a property from the given instance.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)
 
 local function getProperty(instance, propertyName)
@@ -57,4 +56,4 @@ local function getProperty(instance, propertyName)
 	return true, valueOrErr
 end
 
-return getProperty
+return getProperty

plugin/src/Reconciler/setProperty.lua

@@ -2,9 +2,8 @@
 	Attempts to set a property on the given instance.
 ]]
 
-local Packages = script.Parent.Parent.Parent.Packages
+local RbxDom = require(script.Parent.Parent.Parent.RbxDom)
-local Log = require(Packages.Log)
+local Log = require(script.Parent.Parent.Parent.Log)
-local RbxDom = require(Packages.RbxDom)
 local Error = require(script.Parent.Error)
 
 local function setProperty(instance, propertyName, value)
@@ -46,4 +45,4 @@ local function setProperty(instance, propertyName, value)
 	return true
 end
 
-return setProperty
+return setProperty

plugin/src/ServeSession.lua

@@ -1,14 +1,11 @@
 local StudioService = game:GetService("StudioService")
 local RunService = game:GetService("RunService")
 
-local Packages = script.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Log)
-local Log = require(Packages.Log)
+local Fmt = require(script.Parent.Parent.Fmt)
-local Fmt = require(Packages.Fmt)
+local t = require(script.Parent.Parent.t)
-local t = require(Packages.t)
-local Promise = require(Packages.Promise)
 
 local ChangeBatcher = require(script.Parent.ChangeBatcher)
-local encodePatchUpdate = require(script.Parent.ChangeBatcher.encodePatchUpdate)
 local InstanceMap = require(script.Parent.InstanceMap)
 local PatchSet = require(script.Parent.PatchSet)
 local Reconciler = require(script.Parent.Reconciler)
@@ -97,7 +94,6 @@ function ServeSession.new(options)
 		__instanceMap = instanceMap,
 		__changeBatcher = changeBatcher,
 		__statusChangedCallback = nil,
-		__patchAppliedCallback = nil,
 		__connections = connections,
 	}
 
@@ -125,32 +121,23 @@ function ServeSession:onStatusChanged(callback)
 	self.__statusChangedCallback = callback
 end
 
-function ServeSession:setConfirmCallback(callback)
-	self.__userConfirmCallback = callback
-end
-
-function ServeSession:onPatchApplied(callback)
-	self.__patchAppliedCallback = callback
-end
-
 function ServeSession:start()
 	self:__setStatus(Status.Connecting)
 
 	self.__apiContext:connect()
 		:andThen(function(serverInfo)
+			self:__setStatus(Status.Connected, serverInfo.projectName)
 			self:__applyGameAndPlaceId(serverInfo)
 
-			return self:__initialSync(serverInfo)
+			local rootInstanceId = serverInfo.rootInstanceId
-				:andThen(function()
-					self:__setStatus(Status.Connected, serverInfo.projectName)
 
+			return self:__initialSync(rootInstanceId)
+				:andThen(function()
 					return self:__mainSyncLoop()
 				end)
 		end)
 		:catch(function(err)
-			if self.__status ~= Status.Disconnected then
+			self:__stopInternal(err)
-				self:__stopInternal(err)
-			end
 		end)
 end
 
@@ -207,8 +194,8 @@ function ServeSession:__onActiveScriptChanged(activeScript)
 	self.__apiContext:open(scriptId)
 end
 
-function ServeSession:__initialSync(serverInfo)
+function ServeSession:__initialSync(rootInstanceId)
-	return self.__apiContext:read({ serverInfo.rootInstanceId })
+	return self.__apiContext:read({ rootInstanceId })
 		:andThen(function(readResponseBody)
 			-- Tell the API Context that we're up-to-date with the version of
 			-- the tree defined in this response.
@@ -217,14 +204,14 @@ function ServeSession:__initialSync(serverInfo)
 			-- For any instances that line up with the Rojo server's view, start
 			-- tracking them in the reconciler.
 			Log.trace("Matching existing Roblox instances to Rojo IDs")
-			self.__reconciler:hydrate(readResponseBody.instances, serverInfo.rootInstanceId, game)
+			self.__reconciler:hydrate(readResponseBody.instances, rootInstanceId, game)
 
 			-- Calculate the initial patch to apply to the DataModel to catch us
 			-- up to what Rojo thinks the place should look like.
 			Log.trace("Computing changes that plugin needs to make to catch up to server...")
 			local success, catchUpPatch = self.__reconciler:diff(
 				readResponseBody.instances,
-				serverInfo.rootInstanceId,
+				rootInstanceId,
 				game
 			)
 
@@ -234,50 +221,15 @@ function ServeSession:__initialSync(serverInfo)
 
 			Log.trace("Computed hydration patch: {:#?}", debugPatch(catchUpPatch))
 
-			local userDecision = "Accept"
+			-- TODO: Prompt user to notify them of this patch, since it's
-			if self.__userConfirmCallback ~= nil then
+			-- effectively a conflict between the Rojo server and the client. In
-				userDecision = self.__userConfirmCallback(self.__instanceMap, catchUpPatch, serverInfo)
+			-- the future, we'll ask which changes the user wants to keep.
-			end
 
-			if userDecision == "Abort" then
+			local unappliedPatch = self.__reconciler:applyPatch(catchUpPatch)
-				return Promise.reject("Aborted Rojo sync operation")
 
-			elseif userDecision == "Reject" and self.__twoWaySync then
+			if not PatchSet.isEmpty(unappliedPatch) then
-				-- The user wants their studio DOM to write back to their Rojo DOM
+				Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
-				-- so we will reverse the patch and send it back
+					PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
-
-				local inversePatch = PatchSet.newEmpty()
-
-				-- Send back the current properties
-				for _, change in catchUpPatch.updated do
-					local instance = self.__instanceMap.fromIds[change.id]
-					if not instance then continue end
-
-					local update = encodePatchUpdate(instance, change.id, change.changedProperties)
-					table.insert(inversePatch.updated, update)
-				end
-				-- Add the removed instances back to Rojo
-				-- selene:allow(empty_if, unused_variable)
-				for _, instance in catchUpPatch.removed do
-					-- TODO: Generate ID for our instance and add it to inversePatch.added
-				end
-				-- Remove the additions we've rejected
-				for id, _change in catchUpPatch.added do
-					table.insert(inversePatch.removed, id)
-				end
-
-				self.__apiContext:write(inversePatch)
-
-			elseif userDecision == "Accept" then
-				local unappliedPatch = self.__reconciler:applyPatch(catchUpPatch)
-
-				if not PatchSet.isEmpty(unappliedPatch) then
-					Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
-						PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
-				end
-				if self.__patchAppliedCallback then
-					pcall(self.__patchAppliedCallback, catchUpPatch, unappliedPatch)
-				end
 			end
 		end)
 end
@@ -292,10 +244,6 @@ function ServeSession:__mainSyncLoop()
 					Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
 						PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
 				end
-
-				if self.__patchAppliedCallback then
-					pcall(self.__patchAppliedCallback, message, unappliedPatch)
-				end
 			end
 
 			if self.__status ~= Status.Disconnected then

plugin/src/Settings.lua

@@ -1,104 +0,0 @@
---[[
-	Persistent plugin settings.
-]]
-
-local plugin = plugin or script:FindFirstAncestorWhichIsA("Plugin")
-local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
-
-local Log = require(Packages.Log)
-local Roact = require(Packages.Roact)
-
-local defaultSettings = {
-	openScriptsExternally = false,
-	twoWaySync = false,
-	showNotifications = true,
-	playSounds = true,
-	typecheckingEnabled = false,
-	logLevel = "Info",
-	priorEndpoints = {},
-}
-
-local Settings = {}
-
-Settings._values = table.clone(defaultSettings)
-Settings._updateListeners = {}
-Settings._bindings = {}
-
-if plugin then
-	for name, defaultValue in pairs(Settings._values) do
-		local savedValue = plugin:GetSetting("Rojo_" .. name)
-
-		if savedValue == nil then
-			-- plugin:SetSetting hits disc instead of memory, so it can be slow. Spawn so we don't hang.
-			task.spawn(plugin.SetSetting, plugin, "Rojo_" .. name, defaultValue)
-			Settings._values[name] = defaultValue
-		else
-			Settings._values[name] = savedValue
-		end
-	end
-	Log.trace("Loaded settings from plugin store")
-end
-
-function Settings:get(name)
-	if defaultSettings[name] == nil then
-		error("Invalid setings name " .. tostring(name), 2)
-	end
-
-	return self._values[name]
-end
-
-function Settings:set(name, value)
-	self._values[name] = value
-	if self._bindings[name] then
-		self._bindings[name].set(value)
-	end
-
-	if plugin then
-		-- plugin:SetSetting hits disc instead of memory, so it can be slow. Spawn so we don't hang.
-		task.spawn(plugin.SetSetting, plugin, "Rojo_" .. name, value)
-	end
-
-	if self._updateListeners[name] then
-		for callback in pairs(self._updateListeners[name]) do
-			task.spawn(callback, value)
-		end
-	end
-
-	Log.trace(string.format("Set setting '%s' to '%s'", name, tostring(value)))
-end
-
-function Settings:onChanged(name, callback)
-	local listeners = self._updateListeners[name]
-	if listeners == nil then
-		listeners = {}
-		self._updateListeners[name] = listeners
-	end
-	listeners[callback] = true
-
-	Log.trace(string.format("Added listener for setting '%s' changes", name))
-
-	return function()
-		listeners[callback] = nil
-		Log.trace(string.format("Removed listener for setting '%s' changes", name))
-	end
-end
-
-function Settings:getBinding(name)
-	local cached = self._bindings[name]
-	if cached then
-		return cached.bind
-	end
-
-	local bind, set = Roact.createBinding(self._values[name])
-	self._bindings[name] = {
-		bind = bind,
-		set = set,
-	}
-
-	Log.trace(string.format("Created binding for setting '%s'", name))
-
-	return bind
-end
-
-return Settings

plugin/src/Types.lua

@@ -1,6 +1,6 @@
-local Packages = script.Parent.Parent.Packages
+local t = require(script.Parent.Parent.t)
-local t = require(Packages.t)
+
-local Settings = require(script.Parent.Settings)
+local DevSettings = require(script.Parent.DevSettings)
 local strict = require(script.Parent.strict)
 
 local RbxId = t.string
@@ -66,7 +66,7 @@ local ApiError = t.interface({
 
 local function ifEnabled(innerCheck)
 	return function(...)
-		if Settings:get("typecheckingEnabled") then
+		if DevSettings:shouldTypecheck() then
 			return innerCheck(...)
 		else
 			return true

plugin/src/init.server.lua

@@ -2,24 +2,23 @@ if not plugin then
 	return
 end
 
-local Rojo = script:FindFirstAncestor("Rojo")
+local Log = require(script.Parent.Log)
-local Packages = Rojo.Packages
 
-local Log = require(Packages.Log)
+local DevSettings = require(script.DevSettings)
-local Roact = require(Packages.Roact)
-
-local Settings = require(script.Settings)
-local Config = require(script.Config)
-local App = require(script.App)
 
 Log.setLogLevelThunk(function()
-	return Log.Level[Settings:get("logLevel")] or Log.Level.Info
+	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
 })
-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)
@@ -29,4 +28,4 @@ if Config.isDevBuild then
 	local TestEZ = require(script.Parent.TestEZ)
 
 	require(script.runTests)(TestEZ)
-end
+end

plugin/src/init.spec.lua

@@ -2,10 +2,7 @@ return function()
 	it("should load all submodules", function()
 		local function loadRecursive(container)
 			if container:IsA("ModuleScript") and not container.Name:find("%.spec$") then
-				local success, err = pcall(require, container)
+				require(container)
-				if not success then
-					error(string.format("Failed to load '%s': %s", container.Name, err))
-				end
 			end
 
 			for _, child in ipairs(container:GetChildren()) do
@@ -15,4 +12,4 @@ return function()
 
 		loadRecursive(script.Parent)
 	end)
-end
+end

plugin/src/invariant.lua

@@ -1,6 +1,4 @@
-
+local Fmt = require(script.Parent.Parent.Fmt)
-local Packages = script.Parent.Parent.Packages
-local Fmt = require(Packages.Fmt)
 
 local Config = require(script.Parent.Config)
 
@@ -28,4 +26,4 @@ else
 	end
 end
 
-return invariant
+return invariant

plugin/src/preloadAssets.lua

@@ -1,7 +1,6 @@
 local ContentProvider = game:GetService("ContentProvider")
 
-local Packages = script.Parent.Parent.Packages
+local Log = require(script.Parent.Parent.Log)
-local Log = require(Packages.Log)
 
 local Assets = require(script.Parent.Assets)
 
@@ -30,4 +29,4 @@ local function preloadAssets()
 	end)()
 end
 
-return preloadAssets
+return preloadAssets

plugin/src/runTests.lua

@@ -1,6 +1,5 @@
 return function(TestEZ)
 	local Rojo = script.Parent.Parent
-	local Packages = Rojo.Packages
 
-	TestEZ.TestBootstrap:run({ Rojo.Plugin, Packages.Http, Packages.Log, Packages.RbxDom })
+	TestEZ.TestBootstrap:run({ Rojo.Plugin, Rojo.Http, Rojo.Log })
-end
+end

plugin/src/soundPlayer.lua

@@ -1,38 +0,0 @@
--- Sounds only play in Edit mode when parented to a plugin widget, for some reason
-local plugin = plugin or script:FindFirstAncestorWhichIsA("Plugin")
-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
-
-function SoundPlayer.new(settings)
-	return setmetatable({
-		settings = settings,
-	}, SoundPlayer)
-end
-
-function SoundPlayer:play(soundId)
-	if self.settings and self.settings:get("playSounds") == false then return end
-
-	local sound = Instance.new("Sound")
-	sound.SoundId = soundId
-	sound.Parent = widget
-
-	sound.Ended:Connect(function()
-		sound:Destroy()
-	end)
-
-	sound:Play()
-end
-
-return SoundPlayer

plugin/test-place.project.json

@@ -8,8 +8,8 @@
         "$path": "default.project.json"
       },
 
-      "Packages": {
+      "TestEZ": {
-        "$path": "DevPackages"
+        "$path": "modules/testez"
       }
     },
 

plugin/wally.lock

@@ -1,33 +0,0 @@
-# This file is automatically @generated by Wally.
-# It is not intended for manual editing.
-registry = "test"
-
-[[package]]
-name = "evaera/promise"
-version = "4.0.0"
-dependencies = []
-
-[[package]]
-name = "osyrisrblx/t"
-version = "3.0.0"
-dependencies = []
-
-[[package]]
-name = "reselim/flipper"
-version = "2.0.0"
-dependencies = []
-
-[[package]]
-name = "roblox/roact"
-version = "1.4.4"
-dependencies = []
-
-[[package]]
-name = "roblox/testez"
-version = "0.4.1"
-dependencies = []
-
-[[package]]
-name = "rojo-rbx/rojo"
-version = "7.2.1"
-dependencies = [["Flipper", "reselim/flipper@2.0.0"], ["Promise", "evaera/promise@4.0.0"], ["Roact", "roblox/roact@1.4.4"], ["t", "osyrisrblx/t@3.0.0"]]

plugin/wally.toml

@@ -1,17 +0,0 @@
-[package]
-name = "rojo-rbx/rojo"
-description = "Rojo enables Roblox developers to use professional-grade software engineering tools"
-version = "7.2.1"
-license = "MPL-2.0"
-authors = ["LPGhatguy (https://lpg.space/)"]
-registry = "https://github.com/upliftgames/wally-index"
-realm = "shared"
-
-[dependencies]
-Flipper = "reselim/flipper@2.0.0"
-Promise = "evaera/promise@4.0.0"
-Roact = "roblox/roact@1.4.4"
-t = "osyrisrblx/t@3.0.0"
-
-[dev-dependencies]
-TestEZ = "roblox/testez@0.4.1"

plugin/watch-build.sh

@@ -1,2 +0,0 @@
-# Continously build the rojo plugin into the local plugin directory on Windows
-rojo build plugin/default.project.json -o $LOCALAPPDATA/Roblox/Plugins/Rojo.rbxm --watch