Git dependencies, skip dropping ServeSession

.dir-locals.el

@@ -1,2 +0,0 @@
-((nil . ((eglot-luau-rojo-project-path . "plugin.project.json")
-         (eglot-luau-rojo-sourcemap-enabled . 't))))

.editorconfig

@@ -23,7 +23,4 @@ insert_final_newline = true
 insert_final_newline = true
 
 [*.lua]
-indent_style = tab
-
-[*.luau]
 indent_style = tab

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# stylua formatting
-0f8e1625d572a5fe0f7b5c08653ff92cc837d346

.gitattributes

@@ -1 +0,0 @@
-*.lua linguist-language=Luau

.github/FUNDING.yml

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

.github/workflows/changelog.yml

@@ -1,23 +0,0 @@
-name: Changelog Check
-
-on:
-  pull_request:
-    types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Check Actions
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Changelog check
-      uses: Zomzog/changelog-checker@v1.3.0
-      with:
-        fileName: CHANGELOG.md
-        noChangelogLabel: skip changelog
-        checkNotification: Simple
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -12,27 +12,23 @@ on:
 jobs:
   build:
     name: Build and Test
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        rust_version: [stable, 1.55.0]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
-
-    - name: Rust cache
-      uses: Swatinem/rust-cache@v2
-
-    - name: Setup Aftman
-      uses: ok-nick/setup-aftman@v0.4.2
+      uses: actions-rs/toolchain@v1
       with:
-        version: 'v0.3.0'
+        toolchain: ${{ matrix.rust_version }}
+        override: true
+        profile: minimal
 
     - name: Build
       run: cargo build --locked --verbose
@@ -40,60 +36,24 @@ jobs:
     - name: Test
       run: cargo test --locked --verbose
 
-  msrv:
-    name: Check MSRV
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-
-    - name: Install Rust
-      uses: dtolnay/rust-toolchain@1.70.0
-
-    - name: Rust cache
-      uses: Swatinem/rust-cache@v2
-
-    - name: Setup Aftman
-      uses: ok-nick/setup-aftman@v0.4.2
-      with:
-        version: 'v0.3.0'
-
-    - name: Build
-      run: cargo build --locked --verbose
-
   lint:
-    name: Rustfmt, Clippy, Stylua, & Selene
+    name: Rustfmt and Clippy
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Install Rust
-      uses: dtolnay/rust-toolchain@stable
+      uses: actions-rs/toolchain@v1
       with:
+        toolchain: stable
+        override: true
         components: rustfmt, clippy
 
-    - name: Rust cache
-      uses: Swatinem/rust-cache@v2
-
-    - name: Setup Aftman
-      uses: ok-nick/setup-aftman@v0.4.2
-      with:
-        version: 'v0.3.0'
-
-    - name: Stylua
-      run: stylua --check plugin/src
-
-    - name: Selene
-      run: selene plugin/src
-
     - name: Rustfmt
       run: cargo fmt -- --check
 
     - name: Clippy
-      run: cargo clippy
-
+      run: cargo clippy

.github/workflows/release.yml

@@ -8,39 +8,49 @@ jobs:
   create-release:
     name: Create Release
     runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
-      - uses: actions/checkout@v4
       - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release create ${{ github.ref_name }} --draft --verify-tag --title ${{ github.ref_name }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: false
 
   build-plugin:
     needs: ["create-release"]
     name: Build Roblox Studio Plugin
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Setup Aftman
-        uses: ok-nick/setup-aftman@v0.4.2
+      - name: Setup Foreman
+        uses: Roblox/setup-foreman@v1
         with:
-          version: 'v0.3.0'
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Plugin
-        run: rojo build plugin.project.json --output Rojo.rbxm
+        run: rojo build plugin --output Rojo.rbxm
 
       - name: Upload Plugin to Release
+        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload ${{ github.ref_name }} Rojo.rbxm
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: Rojo.rbxm
+          asset_name: Rojo.rbxm
+          asset_content_type: application/octet-stream
 
       - name: Upload Plugin to Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: Rojo.rbxm
           path: Rojo.rbxm
@@ -51,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-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
@@ -77,55 +91,63 @@ jobs:
     env:
       BIN: rojo
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
+      - name: Get Version from Tag
+        shell: bash
+        # https://github.community/t/how-to-get-just-the-tag-name/16241/7#M1027
+        run: |
+          echo "PROJECT_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+          echo "Version is: ${{ env.PROJECT_VERSION }}"
 
-      - name: Setup Aftman
-        uses: ok-nick/setup-aftman@v0.4.2
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
         with:
-          version: 'v0.3.0'
+          toolchain: stable
+          target: ${{ matrix.target }}
+          override: true
+          profile: minimal
 
       - name: Build Release
-        run: cargo build --release --locked --verbose --target ${{ matrix.target }}
+        run: cargo build --release --locked --verbose
         env:
           # Build into a known directory so we can find our build artifact more
           # easily.
           CARGO_TARGET_DIR: output
 
-      - name: Generate Artifact Name
-        shell: bash
-        env:
-          TAG_NAME: ${{ github.ref_name }}
-        run: |
-          echo "ARTIFACT_NAME=$BIN-${TAG_NAME#v}-${{ matrix.label }}.zip" >> "$GITHUB_ENV"
+          # On platforms that use OpenSSL, ensure it is statically linked to
+          # make binaries more portable.
+          OPENSSL_STATIC: 1
 
-      - name: Create Archive and Upload to Release
+      - name: Create Release Archive
         shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir staging
 
           if [ "${{ matrix.host }}" = "windows" ]; then
-            cp "output/${{ matrix.target }}/release/$BIN.exe" staging/
+            cp "output/release/$BIN.exe" staging/
             cd staging
-            7z a ../$ARTIFACT_NAME *
+            7z a ../release.zip *
           else
-            cp "output/${{ matrix.target }}/release/$BIN" staging/
+            cp "output/release/$BIN" staging/
             cd staging
-            zip ../$ARTIFACT_NAME *
+            zip ../release.zip *
           fi
 
-          gh release upload ${{ github.ref_name }} ../$ARTIFACT_NAME
+      - name: Upload Archive to Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          asset_path: release.zip
+          asset_name: ${{ env.BIN }}-${{ env.PROJECT_VERSION }}-${{ matrix.label }}.zip
+          asset_content_type: application/octet-stream
 
       - name: Upload Archive to Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          path: ${{ env.ARTIFACT_NAME }}
-          name: ${{ env.ARTIFACT_NAME }}
+          name: ${{ env.BIN }}-${{ env.PROJECT_VERSION }}-${{ matrix.label }}.zip
+          path: release.zip

.gitignore

@@ -10,8 +10,8 @@
 /*.rbxl
 /*.rbxlx
 
-# Sourcemap for the Rojo plugin (for better intellisense)
-/sourcemap.json
+# Test places for the Roblox Studio Plugin
+/plugin/*.rbxlx
 
 # Roblox Studio holds 'lock' files on places
 *.rbxl.lock
@@ -20,6 +20,5 @@
 # Snapshot files from the 'insta' Rust crate
 **/*.snap.new
 
-# Macos file system junk
-._*
-.DS_STORE
+# Selene generates a roblox.toml file that should not be checked in.
+/roblox.toml

.gitmodules

@@ -1,18 +1,15 @@
-[submodule "plugin/Packages/Roact"]
-	path = plugin/Packages/Roact
-	url = https://github.com/roblox/roact.git
-[submodule "plugin/Packages/Flipper"]
-	path = plugin/Packages/Flipper
-	url = https://github.com/reselim/flipper.git
-[submodule "plugin/Packages/Promise"]
-	path = plugin/Packages/Promise
-	url = https://github.com/evaera/roblox-lua-promise.git
-[submodule "plugin/Packages/t"]
-	path = plugin/Packages/t
+[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/Packages/TestEZ"]
-	path = plugin/Packages/TestEZ
-	url = https://github.com/roblox/testez.git
-[submodule "plugin/Packages/Highlighter"]
-	path = plugin/Packages/Highlighter
-	url = https://github.com/boatbomber/highlighter.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",
+}

.vscode/extensions.json

@@ -1,8 +0,0 @@
-{
-  "recommendations": [
-    "JohnnyMorganz.luau-lsp",
-    "JohnnyMorganz.stylua",
-    "Kampfkarren.selene-vscode",
-    "rust-lang.rust-analyzer"
-  ]
-}

.vscode/settings.json

@@ -1,4 +0,0 @@
-{
-  "luau-lsp.sourcemap.rojoProjectFile": "plugin.project.json",
-  "luau-lsp.sourcemap.autogenerate": true
-}

CHANGELOG.md

@@ -1,414 +1,7 @@
 # Rojo Changelog
 
-## 7.5.1 - April 25th, 2025
-* Fixed output spam related to `Instance.Capabilities` in the plugin
-
-## 7.5.0 - April 25th, 2025
-* Fixed an edge case that caused model pivots to not be built correctly in some cases ([#1027])
-* Add `blockedPlaceIds` project config field to allow blocking place ids from being live synced ([#1021])
-* Adds support for `.plugin.lua(u)` files - this applies the `Plugin` RunContext. ([#1008])
-* Added support for Roblox's `Content` type. This replaces the old `Content` type with `ContentId` to reflect Roblox's change.
- 	If you were previously using the fully-qualified syntax for `Content` you will need to switch it to `ContentId`.
-* Added support for `Enum` attributes
-* Significantly improved performance of `.rbxm` parsing
-* Support for a `$schema` field in all special JSON files (`.project.json`, `.model.json`, and `.meta.json`) ([#974])
-* Projects may now manually link `Ref` properties together using `Attributes`. ([#843])
- 	This has two parts: using `id` or `$id` in JSON files or a `Rojo_Target` attribute, an Instance
-    is given an ID. Then, that ID may be used elsewhere in the project to point to an Instance
-    using an attribute named `Rojo_Target_PROP_NAME`, where `PROP_NAME` is the name of a property.
-
-    As an example, here is a `model.json` for an ObjectValue that refers to itself:
-
-    ```json
-    {
-        "id": "arbitrary string",
-        "attributes": {
-            "Rojo_Target_Value": "arbitrary string"
-        }
-    }
-    ```
-
-    This is a very rough implementation and the usage will become more ergonomic
-    over time.
-
-* Updated Undo/Redo history to be more robust ([#915])
-* Added popout diff visualizer for table properties like Attributes and Tags ([#834])
-* Updated Theme to use Studio colors ([#838])
-* Improved patch visualizer UX ([#883])
-* Added update notifications for newer compatible versions in the Studio plugin. ([#832])
-* Added experimental setting for Auto Connect in playtests ([#840])
-* Improved settings UI ([#886])
-* `Open Scripts Externally` option can now be changed while syncing ([#911])
-* The sync reminder notification will now tell you what was last synced and when ([#987])
-* Fixed notification and tooltip text sometimes getting cut off ([#988])
-* Projects may now specify rules for syncing files as if they had a different file extension. ([#813])
- 	This is specified via a new field on project files, `syncRules`:
-
- 	```json
- 	{
- 	 	"syncRules": [
- 	 	 	{
- 	 	 	 	"pattern": "*.foo",
- 	 	 	 	"use": "text",
-                "exclude": "*.exclude.foo",
- 	 	 	},
- 	 	 	{
- 	 	 	 	"pattern": "*.bar.baz",
- 	 	 	 	"use": "json",
- 	 	 	 	"suffix": ".bar.baz",
- 	 	 	},
- 	 	],
- 	 	"name": "SyncRulesAreCool",
- 	 	"tree": {
- 	 	 	"$path": "src"
- 	 	}
- 	}
- 	```
-
- 	The `pattern` field is a glob used to match the sync rule to files. If present, the `suffix` field allows you to specify parts of a file's name get cut off by Rojo to name the Instance, including the file extension. If it isn't specified, Rojo will only cut off the first part of the file extension, up to the first dot.
-
-    Additionally, the `exclude` field allows files to be excluded from the sync rule if they match a pattern specified by it. If it's not present, all files that match `pattern` will be modified using the sync rule.
-
- 	The `use` field corresponds to one of the potential file type that Rojo will currently include in a project. Files that match the provided pattern will be treated as if they had the file extension for that file type.
-
- 	| `use` value    | file extension  |
- 	|:---------------|:----------------|
- 	| `serverScript` | `.server.lua`   |
- 	| `clientScript` | `.client.lua`   |
- 	| `moduleScript` | `.lua`          |
- 	| `json`         | `.json`         |
- 	| `toml`         | `.toml`         |
- 	| `csv`          | `.csv`          |
- 	| `text`         | `.txt`          |
- 	| `jsonModel`    | `.model.json`   |
- 	| `rbxm`         | `.rbxm`         |
- 	| `rbxmx`        | `.rbxmx`        |
- 	| `project`      | `.project.json` |
- 	| `ignore`       | None!           |
-
-	Additionally, there are `use` values for specific script types ([#909]):
-
-	| `use` value              | script type                            |
-	|:-------------------------|:---------------------------------------|
-	| `legacyServerScript`     | `Script` with `Enum.RunContext.Legacy` |
-	| `legacyClientScript`     | `LocalScript`                          |
-	| `runContextServerScript` | `Script` with `Enum.RunContext.Server` |
-	| `runContextClientScript` | `Script` with `Enum.RunContext.Client` |
-    | `pluginScript`           | `Script` with `Enum.RunContext.Plugin` |
-
-    **All** sync rules are reset between project files, so they must be specified in each one when nesting them. This is to ensure that nothing can break other projects by changing how files are synced!
-
-[#813]: https://github.com/rojo-rbx/rojo/pull/813
-[#832]: https://github.com/rojo-rbx/rojo/pull/832
-[#834]: https://github.com/rojo-rbx/rojo/pull/834
-[#838]: https://github.com/rojo-rbx/rojo/pull/838
-[#840]: https://github.com/rojo-rbx/rojo/pull/840
-[#843]: https://github.com/rojo-rbx/rojo/pull/843
-[#883]: https://github.com/rojo-rbx/rojo/pull/883
-[#886]: https://github.com/rojo-rbx/rojo/pull/886
-[#909]: https://github.com/rojo-rbx/rojo/pull/909
-[#911]: https://github.com/rojo-rbx/rojo/pull/911
-[#915]: https://github.com/rojo-rbx/rojo/pull/915
-[#974]: https://github.com/rojo-rbx/rojo/pull/974
-[#987]: https://github.com/rojo-rbx/rojo/pull/987
-[#988]: https://github.com/rojo-rbx/rojo/pull/988
-[#1008]: https://github.com/rojo-rbx/rojo/pull/1008
-[#1021]: https://github.com/rojo-rbx/rojo/pull/1021
-[#1027]: https://github.com/rojo-rbx/rojo/pull/1027
-
-## [7.4.4] - August 22nd, 2024
-* Fixed issue with reading attributes from `Lighting` in new place files
-* `Instance.Archivable` will now default to `true` when building a project into a binary (`rbxm`/`rbxl`) file rather than `false`.
-
-## [7.4.3] - August 6th, 2024
-* Fixed issue with building binary files introduced in 7.4.2
-* Fixed `value of type nil cannot be converted to number` warning spam in output. [#955]
-
-[#955]: https://github.com/rojo-rbx/rojo/pull/955
-
-## [7.4.2] - July 23, 2024
-* Added Never option to Confirmation ([#893])
-* Fixed removing trailing newlines ([#903])
-* Updated the internal property database, correcting an issue with `SurfaceAppearance.Color` that was reported [here][Surface_Appearance_Color_1] and [here][Surface_Appearance_Color_2] ([#948])
-
-[#893]: https://github.com/rojo-rbx/rojo/pull/893
-[#903]: https://github.com/rojo-rbx/rojo/pull/903
-[#948]: https://github.com/rojo-rbx/rojo/pull/948
-[Surface_Appearance_Color_1]: https://devforum.roblox.com/t/jailbreak-custom-character-turned-shiny-black-no-texture/3075563
-[Surface_Appearance_Color_2]: https://devforum.roblox.com/t/surfaceappearance-not-displaying-correctly/3075588
-
-## [7.4.1] - February 20, 2024
-* Made the `name` field optional on project files ([#870])
-
-	Files named `default.project.json` inherit the name of the folder they're in and all other projects
-    are named as expect (e.g. `foo.project.json` becomes an Instance named `foo`)
-
-    There is no change in behavior if `name` is set.
-* Fixed incorrect results when building model pivots ([#865])
-* Fixed incorrect results when serving model pivots ([#868])
-* Rojo now converts any line endings to LF, preventing spurious diffs when syncing Lua files on Windows ([#854])
-* Fixed Rojo plugin failing to connect when project contains certain unreadable properties ([#848])
-* Fixed various cases where patch visualizer would not display sync failures ([#845], [#844])
-* Fixed http error handling so Rojo can be used in Github Codespaces ([#847])
-
-[#848]: https://github.com/rojo-rbx/rojo/pull/848
-[#845]: https://github.com/rojo-rbx/rojo/pull/845
-[#844]: https://github.com/rojo-rbx/rojo/pull/844
-[#847]: https://github.com/rojo-rbx/rojo/pull/847
-[#854]: https://github.com/rojo-rbx/rojo/pull/854
-[#865]: https://github.com/rojo-rbx/rojo/pull/865
-[#868]: https://github.com/rojo-rbx/rojo/pull/868
-[#870]: https://github.com/rojo-rbx/rojo/pull/870
-
-## [7.4.0] - January 16, 2024
-* Improved the visualization for array properties like Tags ([#829])
-* Significantly improved performance of `rojo serve`, `rojo build --watch`, and `rojo sourcemap --watch` on macOS. ([#830])
-* Changed *.lua files that init command generates to *.luau ([#831])
-* Does not remind users to sync if the sync lock is claimed already ([#833])
-
-[#829]: https://github.com/rojo-rbx/rojo/pull/829
-[#830]: https://github.com/rojo-rbx/rojo/pull/830
-[#831]: https://github.com/rojo-rbx/rojo/pull/831
-[#833]: https://github.com/rojo-rbx/rojo/pull/833
-
-## [7.4.0-rc3] - October 25, 2023
-* Changed `sourcemap --watch` to only generate the sourcemap when it's necessary ([#800])
-* Switched script source property getter and setter to `ScriptEditorService` methods ([#801])
-
- 	This ensures that the script editor reflects any changes Rojo makes to a script while it is open in the script editor.
-
-* Fixed issues when handling `SecurityCapabilities` values ([#803], [#807])
-* Fixed Rojo plugin erroring out when attempting to sync attributes with invalid names ([#809])
-
-[#800]: https://github.com/rojo-rbx/rojo/pull/800
-[#801]: https://github.com/rojo-rbx/rojo/pull/801
-[#803]: https://github.com/rojo-rbx/rojo/pull/803
-[#807]: https://github.com/rojo-rbx/rojo/pull/807
-[#809]: https://github.com/rojo-rbx/rojo/pull/809
-
-## [7.4.0-rc2] - October 3, 2023
-* Fixed bug with parsing version for plugin validation ([#797])
-
-[#797]: https://github.com/rojo-rbx/rojo/pull/797
-
-## [7.4.0-rc1] - October 3, 2023
-### Additions
-#### Project format
-* Added support for `.toml` files to `$path` ([#633])
-* Added support for `Font` and `CFrame` attributes ([rbx-dom#299], [rbx-dom#296])
-* Added the `emitLegacyScripts` field to the project format ([#765]). The behavior is outlined below:
-
-	| `emitLegacyScripts` Value | Action Taken by Rojo                                                                                             |
-	|---------------------------|------------------------------------------------------------------------------------------------------------------|
-	| false                     | Rojo emits Scripts with the appropriate `RunContext` for `*.client.lua` and `*.server.lua` files in the project. |
-	| true   (default)          | Rojo emits LocalScripts and Scripts with legacy `RunContext` (same behavior as previously).                      |
-
-
-	It can be used like this:
-	```json
-	{
-		"emitLegacyScripts": false,
-		"name": "MyCoolRunContextProject",
-		"tree": {
-			"$path": "src"
-		}
-	}
-	```
-
-* Added `Terrain` classname inference, similar to services ([#771])
-
-	`Terrain` may now be defined in projects without using `$className`:
-	```json
-	"Workspace": {
-		"Terrain": {
-			"$path": "path/to/terrain.rbxm"
-		}
-	}
-	```
-
-* Added support for `Terrain.MaterialColors` ([#770])
-
-	`Terrain.MaterialColors` is now represented in projects in a human readable format:
-	```json
-	"Workspace": {
-		"Terrain": {
-			"$path": "path/to/terrain.rbxm"
-			"$properties": {
-				"MaterialColors": {
-					"Grass": [10, 20, 30],
-					"Asphalt": [40, 50, 60],
-					"LeafyGrass": [255, 155, 55]
-				}
-			}
-		}
-	}
-	```
-
-* Added better support for `Font` properties ([#731])
-
-	`FontFace` properties may now be defined using implicit property syntax:
-	```json
-	"TextBox": {
-		"$className": "TextBox",
-		"$properties": {
-			"FontFace": {
-				"family": "rbxasset://fonts/families/RobotoMono.json",
-				"weight": "Thin",
-				"style": "Normal"
-			}
-		}
-	}
-	```
-
-#### Patch visualizer and notifications
-* Added a setting to control patch confirmation behavior ([#774])
-
-	This is a new setting for controlling when the Rojo plugin prompts for confirmation before syncing. It has four options:
-    * Initial (default): prompts only once for a project in a given Studio session
-    * Always: always prompts for confirmation
-    * Large Changes: only prompts when there are more than X changed instances. The number of instances is configurable - an additional setting for the number of instances becomes available when this option is chosen
-    * Unlisted PlaceId: only prompts if the place ID is not present in servePlaceIds
-
-* Added the ability to select Instances in patch visualizer ([#709])
-
-	Double-clicking an instance in the patch visualizer sets Roblox Studio's selection to the instance.
-
-* Added a sync reminder notification. ([#689])
-
-	Rojo detects if you have previously synced to a place, and displays a notification reminding you to sync again:
-
-	![Rojo reminds you to sync a place that you've synced previously](https://user-images.githubusercontent.com/40185666/242397435-ccdfddf2-a63f-420c-bc18-a6e3d6455bba.png)
-
-* Added rich Source diffs in patch visualizer ([#748])
-
-	A "View Diff" button for script sources is now present in the patch visualizer. Clicking it displays a side-by-side diff of the script changes:
-
-	![The patch visualizer contains a "view diff" button](https://user-images.githubusercontent.com/40185666/256065992-3f03558f-84b0-45a1-80eb-901f348cf067.png)
-
-	![The "View Diff" button opens a widget that displays a diff](https://user-images.githubusercontent.com/40185666/256066084-1d9d8fe8-7dad-4ee7-a542-b4aee35a5644.png)
-
-* Patch visualizer now indicates what changes failed to apply. ([#717])
-
-	A clickable warning label is displayed when the Rojo plugin is unable to apply changes. Clicking the label displays precise information about which changes failed:
-
-	![Patch visualizer displays a clickable warning label when changes fail to apply](https://user-images.githubusercontent.com/40185666/252063660-f08399ef-1e16-4f1c-bed8-552821f98cef.png)
-
-
-#### Miscellaneous
-* Added `plugin` flag to the `build` command that outputs to the local plugins folder ([#735])
-
-	This is a flag that builds a Rojo project into Roblox Studio's plugins directory. This allows you to build a Rojo project and load it into Studio as a plugin without having to type the full path to the plugins directory. It can be used like this: `rojo build <PATH-TO-PROJECT> --plugin <FILE-NAME>`
-
-* Added new plugin template to the `init` command ([#738])
-
-	This is a new template geared towards plugins. It is similar to the model template, but creates a `Script` instead of a `ModuleScript` in the `src` directory. It can be used like this: `rojo init --kind plugin`
-
-* Added protection against syncing non-place projects as a place. ([#691])
-* Add buttons for navigation on the Connected page ([#722])
-
-### Fixes
-* Significantly improved performance of `rojo sourcemap` ([#668])
-* Fixed the diff visualizer of connected sessions. ([#674])
-* Fixed disconnected session activity. ([#675])
-* Skip confirming patches that contain only a datamodel name change. ([#688])
-* Fix Rojo breaking when users undo/redo in Studio ([#708])
-* Improve tooltip behavior ([#723])
-* Better settings controls ([#725])
-* Rework patch visualizer with many fixes and improvements ([#713], [#726], [#755])
-
-[#668]: https://github.com/rojo-rbx/rojo/pull/668
-[#674]: https://github.com/rojo-rbx/rojo/pull/674
-[#675]: https://github.com/rojo-rbx/rojo/pull/675
-[#688]: https://github.com/rojo-rbx/rojo/pull/688
-[#689]: https://github.com/rojo-rbx/rojo/pull/689
-[#691]: https://github.com/rojo-rbx/rojo/pull/691
-[#709]: https://github.com/rojo-rbx/rojo/pull/709
-[#708]: https://github.com/rojo-rbx/rojo/pull/708
-[#713]: https://github.com/rojo-rbx/rojo/pull/713
-[#717]: https://github.com/rojo-rbx/rojo/pull/717
-[#722]: https://github.com/rojo-rbx/rojo/pull/722
-[#723]: https://github.com/rojo-rbx/rojo/pull/723
-[#725]: https://github.com/rojo-rbx/rojo/pull/725
-[#726]: https://github.com/rojo-rbx/rojo/pull/726
-[#633]: https://github.com/rojo-rbx/rojo/pull/633
-[#735]: https://github.com/rojo-rbx/rojo/pull/735
-[#731]: https://github.com/rojo-rbx/rojo/pull/731
-[#738]: https://github.com/rojo-rbx/rojo/pull/738
-[#748]: https://github.com/rojo-rbx/rojo/pull/748
-[#755]: https://github.com/rojo-rbx/rojo/pull/755
-[#765]: https://github.com/rojo-rbx/rojo/pull/765
-[#770]: https://github.com/rojo-rbx/rojo/pull/770
-[#771]: https://github.com/rojo-rbx/rojo/pull/771
-[#774]: https://github.com/rojo-rbx/rojo/pull/774
-[rbx-dom#299]: https://github.com/rojo-rbx/rbx-dom/pull/299
-[rbx-dom#296]: https://github.com/rojo-rbx/rbx-dom/pull/296
-
-## [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])
+## Unreleased Changes
 * 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])
@@ -907,4 +500,4 @@ This is a general maintenance release for the Rojo 0.5.x release series.
 * More robust syncing with a new reconciler
 
 ## [0.1.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.1.0) (November 29, 2017)
-* Initial release, functionally very similar to [rbxfs](https://github.com/LPGhatguy/rbxfs)
+* Initial release, functionally very similar to [rbxfs](https://github.com/LPGhatguy/rbxfs)

CONTRIBUTING.md

@@ -16,23 +16,6 @@ You'll want these tools to work on Rojo:
 * Latest stable Rust compiler
 * Latest stable [Rojo](https://github.com/rojo-rbx/rojo)
 * [Foreman](https://github.com/Roblox/foreman)
-* [Luau Language Server](https://github.com/JohnnyMorganz/luau-lsp) (Only needed if working on the Studio plugin.)
-
-When working on the Studio plugin, we recommend using this command to automatically rebuild the plugin when you save a change:
-
-*(Make sure you've enabled the Studio setting to reload plugins on file change!)*
-
-```bash
-bash scripts/watch-build-plugin.sh
-```
-
-You can also run the plugin's unit tests with the following:
-
-*(Make sure you have `run-in-roblox` installed first!)*
-
-```bash
-bash scripts/unit-test-plugin.sh
-```
 
 ## Documentation
 Documentation impacts way more people than the individual lines of code we write.

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rojo"
-version = "7.5.1"
-rust-version = "1.70.0"
+version = "7.1.1"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "Enables professional-grade development tools for Roblox developers"
 license = "MPL-2.0"
@@ -9,10 +8,12 @@ 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 = ["/test-projects/**"]
+exclude = [
+    "/test-projects/**",
+]
 
 [profile.dev]
 panic = "abort"
@@ -26,9 +27,7 @@ default = []
 # Enable this feature to live-reload assets from the web UI.
 dev_live_assets = []
 
-# Run Rojo with this feature to open a Tracy session.
-# Currently uses protocol v63, last supported in Tracy 0.9.1.
-profile-with-tracy = ["profiling/profile-with-tracy"]
+profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"]
 
 [workspace]
 members = ["crates/*"]
@@ -42,7 +41,7 @@ name = "build"
 harness = false
 
 [dependencies]
-memofs = { version = "0.3.0", path = "crates/memofs" }
+memofs = { version = "0.2.0", path = "crates/memofs" }
 
 # These dependencies can be uncommented when working on rbx-dom simultaneously
 # rbx_binary = { path = "../rbx-dom/rbx_binary" }
@@ -51,65 +50,66 @@ memofs = { version = "0.3.0", path = "crates/memofs" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "1.0.0"
-rbx_dom_weak = "3.0.0"
-rbx_reflection = "5.0.0"
-rbx_reflection_database = "1.0.3"
-rbx_xml = "1.0.0"
+rbx_binary = { git = "https://github.com/rojo-rbx/rbx-dom" }
+rbx_dom_weak = { git = "https://github.com/rojo-rbx/rbx-dom" }
+rbx_reflection = { git = "https://github.com/rojo-rbx/rbx-dom" }
+rbx_reflection_database = { git = "https://github.com/rojo-rbx/rbx-dom" }
+rbx_xml = { git = "https://github.com/rojo-rbx/rbx-dom" }
 
-anyhow = "1.0.80"
-backtrace = "0.3.69"
+# rbx_binary = "0.6.4"
+# rbx_dom_weak = "2.3.0"
+# rbx_reflection = "4.2.0"
+# rbx_reflection_database = "0.2.2"
+# rbx_xml = "0.12.3"
+
+anyhow = "1.0.44"
+backtrace = "0.3.61"
 bincode = "1.3.3"
-crossbeam-channel = "0.5.12"
-csv = "1.3.0"
-env_logger = "0.9.3"
-fs-err = "2.11.0"
-futures = "0.3.30"
-globset = "0.4.14"
+crossbeam-channel = "0.5.1"
+csv = "1.1.6"
+env_logger = "0.9.0"
+fs-err = "2.6.0"
+futures = "0.3.17"
+globset = "0.4.8"
 humantime = "2.1.0"
-hyper = { version = "0.14.28", features = ["server", "tcp", "http1"] }
+hyper = { version = "0.14.13", features = ["server", "tcp", "http1"] }
 jod-thread = "0.1.2"
-log = "0.4.21"
-num_cpus = "1.16.0"
-opener = "0.5.2"
-rayon = "1.9.0"
-reqwest = { version = "0.11.24", default-features = false, features = [
-    "blocking",
-    "json",
-    "rustls-tls",
-] }
+log = "0.4.14"
+maplit = "1.0.2"
+notify = "4.0.17"
+opener = "0.5.0"
+reqwest = { version = "0.11.10", features = ["blocking", "json"] }
 ritz = "0.1.0"
 roblox_install = "1.0.0"
-serde = { version = "1.0.197", features = ["derive", "rc"] }
-serde_json = "1.0.114"
-toml = "0.5.11"
-termcolor = "1.4.1"
-thiserror = "1.0.57"
-tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread"] }
-uuid = { version = "1.7.0", features = ["v4", "serde"] }
-clap = { version = "3.2.25", features = ["derive"] }
-profiling = "1.0.15"
+serde = { version = "1.0.130", features = ["derive", "rc"] }
+serde_json = "1.0.68"
+termcolor = "1.1.2"
+thiserror = "1.0.30"
+tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
+uuid = { version = "1.0.0", features = ["v4", "serde"] }
+clap = { version = "3.1.18", features = ["derive"] }
+profiling = "1.0.6"
+tracy-client = { version = "0.13.2", optional = true }
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
 
 [build-dependencies]
-memofs = { version = "0.3.0", path = "crates/memofs" }
+memofs = { version = "0.2.0", path = "crates/memofs" }
 
-embed-resource = "1.8.0"
-anyhow = "1.0.80"
+embed-resource = "1.6.4"
+anyhow = "1.0.44"
 bincode = "1.3.3"
-fs-err = "2.11.0"
+fs-err = "2.6.0"
 maplit = "1.0.2"
-semver = "1.0.22"
 
 [dev-dependencies]
 rojo-insta-ext = { path = "crates/rojo-insta-ext" }
 
-criterion = "0.3.6"
-insta = { version = "1.36.1", features = ["redactions", "yaml"] }
-paste = "1.0.14"
-pretty_assertions = "1.4.0"
-serde_yaml = "0.8.26"
-tempfile = "3.10.1"
-walkdir = "2.5.0"
+criterion = "0.3.5"
+insta = { version = "1.8.0", features = ["redactions"] }
+paste = "1.0.5"
+pretty_assertions = "1.2.1"
+serde_yaml = "0.8.21"
+tempfile = "3.2.0"
+walkdir = "2.3.2"

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <a href="https://rojo.space"><img src="assets/brand_images/logo-512.png" alt="Rojo" height="217" /></a>
+    <a href="https://rojo.space"><img src="assets/logo-512.png" alt="Rojo" height="217" /></a>
 </div>
 
 <div>&nbsp;</div>
@@ -40,7 +40,7 @@ Check out our [contribution guide](CONTRIBUTING.md) for detailed instructions fo
 
 Pull requests are welcome!
 
-Rojo supports Rust 1.70.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
+Rojo supports Rust 1.46.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
 
 ## License
-Rojo is available under the terms of the Mozilla Public License, Version 2.0. See [LICENSE.txt](LICENSE.txt) for details.
+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]
-rojo = "rojo-rbx/rojo@7.4.1"
-selene = "Kampfkarren/selene@0.27.1"
-stylua = "JohnnyMorganz/stylua@0.20.0"
-run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0"

assets/default-model-project/README.md

@@ -2,7 +2,7 @@
 Generated by [Rojo](https://github.com/rojo-rbx/rojo) {rojo_version}.
 
 ## Getting Started
-To build this library, use:
+To build this library or plugin, use:
 
 ```bash
 rojo build -o "{project_name}.rbxmx"

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

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

assets/default-plugin-project/README.md

@@ -1,17 +0,0 @@
-# {project_name}
-Generated by [Rojo](https://github.com/rojo-rbx/rojo) {rojo_version}.
-
-## Getting Started
-To build this plugin to your local plugins folder, use:
-
-```bash
-rojo build -p "{project_name}.rbxm"
-```
-
-You can include the `watch` flag to re-build it on save:
-
-```bash
-rojo build -p "{project_name}.rbxm" --watch
-```
-
-For more help, check out [the Rojo documentation](https://rojo.space/docs).

assets/default-plugin-project/default.project.json

@@ -1,6 +0,0 @@
-{
-  "name": "{project_name}",
-  "tree": {
-    "$path": "src"
-  }
-}

assets/default-plugin-project/gitignore.txt

@@ -1,3 +0,0 @@
-# Plugin model files
-/{project_name}.rbxmx
-/{project_name}.rbxm

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,
         )
     });
@@ -31,12 +31,11 @@ fn bench_build_place(c: &mut Criterion, name: &str, path: &str) {
 fn place_setup<P: AsRef<Path>>(input_path: P) -> (TempDir, BuildCommand) {
     let dir = tempdir().unwrap();
     let input = input_path.as_ref().to_path_buf();
-    let output = Some(dir.path().join("output.rbxlx"));
+    let output = dir.path().join("output.rbxlx");
 
     let options = BuildCommand {
         project: input,
         watch: false,
-        plugin: None,
         output,
     };
 

build.rs

@@ -7,7 +7,6 @@ use fs_err as fs;
 use fs_err::File;
 use maplit::hashmap;
 use memofs::VfsSnapshot;
-use semver::Version;
 
 fn snapshot_from_fs_path(path: &Path) -> io::Result<VfsSnapshot> {
     println!("cargo:rerun-if-changed={}", path.display());
@@ -20,13 +19,9 @@ fn snapshot_from_fs_path(path: &Path) -> io::Result<VfsSnapshot> {
 
             let file_name = entry.file_name().to_str().unwrap().to_owned();
 
-            if file_name.starts_with(".git") {
-                continue;
-            }
-
             // 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;
             }
 
@@ -45,33 +40,36 @@ fn snapshot_from_fs_path(path: &Path) -> io::Result<VfsSnapshot> {
 fn main() -> Result<(), anyhow::Error> {
     let out_dir = env::var_os("OUT_DIR").unwrap();
 
-    let root_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let plugin_dir = root_dir.join("plugin");
+    let root_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+    let plugin_root = PathBuf::from(root_dir).join("plugin");
 
-    let our_version = Version::parse(env::var_os("CARGO_PKG_VERSION").unwrap().to_str().unwrap())?;
-    let plugin_version =
-        Version::parse(fs::read_to_string(plugin_dir.join("Version.txt"))?.trim())?;
-
-    assert_eq!(
-        our_version, plugin_version,
-        "plugin version does not match Cargo version"
-    );
+    let plugin_modules = plugin_root.join("modules");
 
     let snapshot = VfsSnapshot::dir(hashmap! {
-        "default.project.json" => snapshot_from_fs_path(&root_dir.join("plugin.project.json"))?,
-        "plugin" => VfsSnapshot::dir(hashmap! {
-            "fmt" => snapshot_from_fs_path(&plugin_dir.join("fmt"))?,
-            "http" => snapshot_from_fs_path(&plugin_dir.join("http"))?,
-            "log" => snapshot_from_fs_path(&plugin_dir.join("log"))?,
-            "rbx_dom_lua" => snapshot_from_fs_path(&plugin_dir.join("rbx_dom_lua"))?,
-            "src" => snapshot_from_fs_path(&plugin_dir.join("src"))?,
-            "Packages" => snapshot_from_fs_path(&plugin_dir.join("Packages"))?,
-            "Version.txt" => snapshot_from_fs_path(&plugin_dir.join("Version.txt"))?,
+        "default.project.json" => snapshot_from_fs_path(&plugin_root.join("default.project.json"))?,
+        "fmt" => snapshot_from_fs_path(&plugin_root.join("fmt"))?,
+        "http" => snapshot_from_fs_path(&plugin_root.join("http"))?,
+        "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"))?,
+        "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");
-    let out_file = File::create(out_path)?;
+    let out_file = File::create(&out_path)?;
 
     bincode::serialize_into(out_file, &snapshot)?;
 

crates/memofs/CHANGELOG.md

@@ -2,13 +2,6 @@
 
 ## Unreleased Changes
 
-## 0.3.0 (2024-03-15)
-* Changed `StdBackend` file watching component to use minimal recursive watches. [#830]
-* Added `Vfs::read_to_string` and `Vfs::read_to_string_lf_normalized` [#854]
-
-[#830]: https://github.com/rojo-rbx/rojo/pull/830
-[#854]: https://github.com/rojo-rbx/rojo/pull/854
-
 ## 0.2.0 (2021-08-23)
 * Updated to `crossbeam-channel` 0.5.1.
 
@@ -22,4 +15,4 @@
 * Improved error messages using the [fs-err](https://crates.io/crates/fs-err) crate.
 
 ## 0.1.0 (2020-03-10)
-* Initial release
+* Initial release

crates/memofs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "memofs"
 description = "Virtual filesystem with configurable backends."
-version = "0.3.0"
+version = "0.2.0"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 edition = "2018"
 readme = "README.md"
@@ -11,7 +11,7 @@ homepage = "https://github.com/rojo-rbx/rojo/tree/master/memofs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-crossbeam-channel = "0.5.12"
-fs-err = "2.11.0"
-notify = "4.0.17"
-serde = { version = "1.0.197", features = ["derive"] }
+crossbeam-channel = "0.5.1"
+fs-err = "2.3.0"
+notify = "4.0.15"
+serde = { version = "1.0", features = ["derive"] }

crates/memofs/src/in_memory_fs.rs

@@ -50,12 +50,6 @@ impl InMemoryFs {
     }
 }
 
-impl Default for InMemoryFs {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 #[derive(Debug)]
 struct InMemoryFsInner {
     entries: HashMap<PathBuf, Entry>,

crates/memofs/src/lib.rs

@@ -22,9 +22,9 @@ mod noop_backend;
 mod snapshot;
 mod std_backend;
 
+use std::io;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, MutexGuard};
-use std::{io, str};
 
 pub use in_memory_fs::InMemoryFs;
 pub use noop_backend::NoopBackend;
@@ -155,24 +155,6 @@ impl VfsInner {
         Ok(Arc::new(contents))
     }
 
-    fn read_to_string<P: AsRef<Path>>(&mut self, path: P) -> io::Result<Arc<String>> {
-        let path = path.as_ref();
-        let contents = self.backend.read(path)?;
-
-        if self.watch_enabled {
-            self.backend.watch(path)?;
-        }
-
-        let contents_str = str::from_utf8(&contents).map_err(|_| {
-            io::Error::new(
-                io::ErrorKind::InvalidData,
-                format!("File was not valid UTF-8: {}", path.display()),
-            )
-        })?;
-
-        Ok(Arc::new(contents_str.into()))
-    }
-
     fn write<P: AsRef<Path>, C: AsRef<[u8]>>(&mut self, path: P, contents: C) -> io::Result<()> {
         let path = path.as_ref();
         let contents = contents.as_ref();
@@ -212,8 +194,11 @@ impl VfsInner {
     }
 
     fn commit_event(&mut self, event: &VfsEvent) -> io::Result<()> {
-        if let VfsEvent::Remove(path) = event {
-            let _ = self.backend.unwatch(path);
+        match event {
+            VfsEvent::Remove(path) => {
+                let _ = self.backend.unwatch(&path);
+            }
+            _ => {}
         }
 
         Ok(())
@@ -276,33 +261,6 @@ impl Vfs {
         self.inner.lock().unwrap().read(path)
     }
 
-    /// Read a file from the VFS (or from the underlying backend if it isn't
-    /// resident) into a string.
-    ///
-    /// Roughly equivalent to [`std::fs::read_to_string`][std::fs::read_to_string].
-    ///
-    /// [std::fs::read_to_string]: https://doc.rust-lang.org/stable/std/fs/fn.read_to_string.html
-    #[inline]
-    pub fn read_to_string<P: AsRef<Path>>(&self, path: P) -> io::Result<Arc<String>> {
-        let path = path.as_ref();
-        self.inner.lock().unwrap().read_to_string(path)
-    }
-
-    /// Read a file from the VFS (or the underlying backend if it isn't
-    /// resident) into a string, and normalize its line endings to LF.
-    ///
-    /// Roughly equivalent to [`std::fs::read_to_string`][std::fs::read_to_string], but also performs
-    /// line ending normalization.
-    ///
-    /// [std::fs::read_to_string]: https://doc.rust-lang.org/stable/std/fs/fn.read_to_string.html
-    #[inline]
-    pub fn read_to_string_lf_normalized<P: AsRef<Path>>(&self, path: P) -> io::Result<Arc<String>> {
-        let path = path.as_ref();
-        let contents = self.inner.lock().unwrap().read_to_string(path)?;
-
-        Ok(contents.replace("\r\n", "\n").into())
-    }
-
     /// Write a file to the VFS and the underlying backend.
     ///
     /// Roughly equivalent to [`std::fs::write`][std::fs::write].
@@ -473,23 +431,3 @@ impl VfsLock<'_> {
         self.inner.commit_event(event)
     }
 }
-
-#[cfg(test)]
-mod test {
-    use crate::{InMemoryFs, Vfs, VfsSnapshot};
-
-    /// https://github.com/rojo-rbx/rojo/issues/899
-    #[test]
-    fn read_to_string_lf_normalized_keeps_trailing_newline() {
-        let mut imfs = InMemoryFs::new();
-        imfs.load_snapshot("test", VfsSnapshot::file("bar\r\nfoo\r\n\r\n"))
-            .unwrap();
-
-        let vfs = Vfs::new(imfs);
-
-        assert_eq!(
-            vfs.read_to_string_lf_normalized("test").unwrap().as_str(),
-            "bar\nfoo\n\n"
-        );
-    }
-}

crates/memofs/src/noop_backend.rs

@@ -74,9 +74,3 @@ impl VfsBackend for NoopBackend {
         ))
     }
 }
-
-impl Default for NoopBackend {
-    fn default() -> Self {
-        Self::new()
-    }
-}

crates/memofs/src/std_backend.rs

@@ -1,8 +1,8 @@
-use std::path::{Path, PathBuf};
+use std::io;
+use std::path::Path;
 use std::sync::mpsc;
 use std::thread;
 use std::time::Duration;
-use std::{collections::HashSet, io};
 
 use crossbeam_channel::Receiver;
 use notify::{watcher, DebouncedEvent, RecommendedWatcher, RecursiveMode, Watcher};
@@ -13,7 +13,6 @@ use crate::{DirEntry, Metadata, ReadDir, VfsBackend, VfsEvent};
 pub struct StdBackend {
     watcher: RecommendedWatcher,
     watcher_receiver: Receiver<VfsEvent>,
-    watches: HashSet<PathBuf>,
 }
 
 impl StdBackend {
@@ -49,7 +48,6 @@ impl StdBackend {
         Self {
             watcher,
             watcher_receiver: rx,
-            watches: HashSet::new(),
         }
     }
 }
@@ -99,30 +97,14 @@ impl VfsBackend for StdBackend {
     }
 
     fn watch(&mut self, path: &Path) -> io::Result<()> {
-        if self.watches.contains(path)
-            || path
-                .ancestors()
-                .any(|ancestor| self.watches.contains(ancestor))
-        {
-            Ok(())
-        } else {
-            self.watches.insert(path.to_path_buf());
-            self.watcher
-                .watch(path, RecursiveMode::Recursive)
-                .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
-        }
+        self.watcher
+            .watch(path, RecursiveMode::NonRecursive)
+            .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
     }
 
     fn unwatch(&mut self, path: &Path) -> io::Result<()> {
-        self.watches.remove(path);
         self.watcher
             .unwatch(path)
             .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
     }
 }
-
-impl Default for StdBackend {
-    fn default() -> Self {
-        Self::new()
-    }
-}

crates/rojo-insta-ext/Cargo.toml

@@ -6,5 +6,5 @@ edition = "2018"
 publish = false
 
 [dependencies]
-serde = "1.0.197"
-serde_yaml = "0.8.26"
+serde = "1.0.99"
+serde_yaml = "0.8.9"

crates/rojo-insta-ext/src/redaction_map.rs

@@ -5,13 +5,19 @@ use serde::Serialize;
 /// Enables redacting any value that serializes as a string.
 ///
 /// Used for transforming Rojo instance IDs into something deterministic.
-#[derive(Default)]
 pub struct RedactionMap {
     ids: HashMap<String, usize>,
     last_id: usize,
 }
 
 impl RedactionMap {
+    pub fn new() -> Self {
+        Self {
+            ids: HashMap::new(),
+            last_id: 0,
+        }
+    }
+
     pub fn get_redacted_value(&self, id: impl ToString) -> Option<String> {
         let id = id.to_string();
 

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.project.json

@@ -1,27 +0,0 @@
-{
-  "name": "Rojo",
-  "tree": {
-    "$className": "Folder",
-    "Plugin": {
-      "$path": "plugin/src"
-    },
-    "Packages": {
-      "$path": "plugin/Packages",
-      "Log": {
-        "$path": "plugin/log"
-      },
-      "Http": {
-        "$path": "plugin/http"
-      },
-      "Fmt": {
-        "$path": "plugin/fmt"
-      },
-      "RbxDom": {
-        "$path": "plugin/rbx_dom_lua"
-      }
-    },
-    "Version": {
-      "$path": "plugin/Version.txt"
-    }
-  }
-}

plugin/Version.txt

@@ -1 +0,0 @@
-7.5.1

plugin/default.project.json

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

plugin/fmt/init.lua

@@ -70,7 +70,7 @@ local function debugImpl(buffer, value, extendedForm)
 	elseif valueType == "table" then
 		local valueMeta = getmetatable(value)
 
-		if valueMeta ~= nil and valueMeta.__fmtDebug ~= nil then
+		if valueMeta ~= nil and  valueMeta.__fmtDebug ~= nil then
 			-- This type implement's the metamethod we made up to line up with
 			-- Rust's 'Debug' trait.
 
@@ -242,4 +242,4 @@ return {
 	debugOutputBuffer = debugOutputBuffer,
 	fmt = fmt,
 	debugify = debugify,
-}
+}

plugin/http/Error.lua

@@ -3,12 +3,12 @@ Error.__index = Error
 
 Error.Kind = {
 	HttpNotEnabled = {
-		message = "Rojo requires HTTP access, which is not enabled.\n"
-			.. "Check your game settings, located in the 'Home' tab of Studio.",
+		message = "Rojo requires HTTP access, which is not enabled.\n" ..
+			"Check your game settings, located in the 'Home' tab of Studio.",
 	},
 	ConnectFailed = {
-		message = "Couldn't connect to the Rojo server.\n"
-			.. "Make sure the server is running — use 'rojo serve' to run it!",
+		message = "Couldn't connect to the Rojo server.\n" ..
+			"Make sure the server is running — use 'rojo serve' to run it!",
 	},
 	Timeout = {
 		message = "HTTP request timed out.",
@@ -63,13 +63,4 @@ function Error.fromRobloxErrorString(message)
 	return Error.new(Error.Kind.Unknown, message)
 end
 
-function Error.fromResponse(response)
-	local lower = (response.body or ""):lower()
-	if response.code == 408 or response.code == 504 or lower:find("timed? ?out") then
-		return Error.new(Error.Kind.Timeout)
-	end
-
-	return Error.new(Error.Kind.Unknown, string.format("%s: %s", tostring(response.code), tostring(response.body)))
-end
-
 return Error

plugin/http/Response.lua

@@ -31,4 +31,4 @@ function Response:json()
 	return HttpService:JSONDecode(self.body)
 end
 
-return Response
+return Response

plugin/http/init.lua

@@ -30,13 +30,8 @@ local function performRequest(requestParams)
 			end)
 
 			if success then
-				Log.trace("Request {} success, response {:#?}", requestId, response)
-				local httpResponse = HttpResponse.fromRobloxResponse(response)
-				if httpResponse:isSuccess() then
-					resolve(httpResponse)
-				else
-					reject(HttpError.fromResponse(httpResponse))
-				end
+				Log.trace("Request {} success, status code {}", requestId, response.StatusCode)
+				resolve(HttpResponse.fromRobloxResponse(response))
 			else
 				Log.trace("Request {} failure: {:?}", requestId, response)
 				reject(HttpError.fromRobloxErrorString(response))
@@ -68,4 +63,4 @@ function Http.jsonDecode(source)
 	return HttpService:JSONDecode(source)
 end
 
-return Http
+return Http

plugin/http/init.spec.lua

@@ -2,4 +2,4 @@ return function()
 	it("should load", function()
 		require(script.Parent)
 	end)
-end
+end

plugin/log/init.lua

@@ -57,4 +57,4 @@ function Log.error(template, ...)
 	error(Fmt.fmt(template, ...))
 end
 
-return Log
+return Log

plugin/log/init.spec.lua

@@ -2,4 +2,4 @@ return function()
 	it("should load", function()
 		require(script.Parent)
 	end)
-end
+end

plugin/rbx_dom_lua/EncodedValue.lua

@@ -20,54 +20,11 @@ local function serializeFloat(value)
 	return value
 end
 
-local ALL_AXES = { "X", "Y", "Z" }
-local ALL_FACES = { "Right", "Top", "Back", "Left", "Bottom", "Front" }
-
-local EncodedValue = {}
+local ALL_AXES = {"X", "Y", "Z"}
+local ALL_FACES = {"Right", "Top", "Back", "Left", "Bottom", "Front"}
 
 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 = {}
@@ -117,7 +74,6 @@ types = {
 			local pos = pod.position
 			local orient = pod.orientation
 
-			--stylua: ignore
 			return CFrame.new(
 				pos[1], pos[2], pos[3],
 				orient[1][1], orient[1][2], orient[1][3],
@@ -127,14 +83,17 @@ types = {
 		end,
 
 		toPod = function(roblox)
-			local x, y, z, r00, r01, r02, r10, r11, r12, r20, r21, r22 = roblox:GetComponents()
+			local x, y, z,
+				r00, r01, r02,
+				r10, r11, r12,
+				r20, r21, r22 = roblox:GetComponents()
 
 			return {
-				position = { x, y, z },
+				position = {x, y, z},
 				orientation = {
-					{ r00, r01, r02 },
-					{ r10, r11, r12 },
-					{ r20, r21, r22 },
+					{r00, r01, r02},
+					{r10, r11, r12},
+					{r20, r21, r22},
 				},
 			}
 		end,
@@ -144,7 +103,7 @@ types = {
 		fromPod = unpackDecoder(Color3.new),
 
 		toPod = function(roblox)
-			return { roblox.r, roblox.g, roblox.b }
+			return {roblox.r, roblox.g, roblox.b}
 		end,
 	},
 
@@ -165,7 +124,10 @@ types = {
 			local keypoints = {}
 
 			for index, keypoint in ipairs(pod.keypoints) do
-				keypoints[index] = ColorSequenceKeypoint.new(keypoint.time, types.Color3.fromPod(keypoint.color))
+				keypoints[index] = ColorSequenceKeypoint.new(
+					keypoint.time,
+					types.Color3.fromPod(keypoint.color)
+				)
 			end
 
 			return ColorSequence.new(keypoints)
@@ -188,38 +150,6 @@ types = {
 	},
 
 	Content = {
-		fromPod = function(pod): Content
-			if type(pod) == "string" then
-				if pod == "None" then
-					return Content.none
-				else
-					error(`unexpected Content value '{pod}'`)
-				end
-			else
-				local ty, value = next(pod)
-				if ty == "Uri" then
-					return Content.fromUri(value)
-				elseif ty == "Object" then
-					error("Object deserializing is not currently implemented")
-				else
-					error(`Unknown Content type '{ty}' (could not deserialize)`)
-				end
-			end
-		end,
-		toPod = function(roblox: Content)
-			if roblox.SourceType == Enum.ContentSourceType.None then
-				return "None"
-			elseif roblox.SourceType == Enum.ContentSourceType.Uri then
-				return { Uri = roblox.Uri }
-			elseif roblox.SourceType == Enum.ContentSourceType.Object then
-				error("Object serializing is not currently implemented")
-			else
-				error(`Unknown Content type '{roblox.SourceType} (could not serialize)`)
-			end
-		end,
-	},
-
-	ContentId = {
 		fromPod = identity,
 		toPod = identity,
 	},
@@ -237,19 +167,6 @@ types = {
 		end,
 	},
 
-	EnumItem = {
-		fromPod = function(pod)
-			return Enum[pod.type]:FromValue(pod.value)
-		end,
-
-		toPod = function(roblox)
-			return {
-				type = tostring(roblox.EnumType),
-				value = roblox.Value,
-			}
-		end,
-	},
-
 	Faces = {
 		fromPod = function(pod)
 			local faces = {}
@@ -284,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,
@@ -311,32 +211,11 @@ types = {
 		toPod = identity,
 	},
 
-	MaterialColors = {
-		fromPod = function(pod: { [string]: { number } })
-			local real = {}
-			for name, color in pod do
-				real[Enum.Material[name]] = Color3.fromRGB(color[1], color[2], color[3])
-			end
-			return real
-		end,
-		toPod = function(roblox: { [Enum.Material]: Color3 })
-			local pod = {}
-			for material, color in roblox do
-				pod[material.Name] = {
-					math.round(math.clamp(color.R, 0, 1) * 255),
-					math.round(math.clamp(color.G, 0, 1) * 255),
-					math.round(math.clamp(color.B, 0, 1) * 255),
-				}
-			end
-			return pod
-		end,
-	},
-
 	NumberRange = {
 		fromPod = unpackDecoder(NumberRange.new),
 
 		toPod = function(roblox)
-			return { roblox.Min, roblox.Max }
+			return {roblox.Min, roblox.Max}
 		end,
 	},
 
@@ -345,12 +224,11 @@ types = {
 			local keypoints = {}
 
 			for index, keypoint in ipairs(pod.keypoints) do
-				-- TODO: Add a test for NaN or Infinity values and envelopes
-				-- Right now it isn't possible because it'd fail the roundtrip.
-				-- It's more important that it works right now, though.
-				local value = keypoint.value or 0
-				local envelope = keypoint.envelope or 0
-				keypoints[index] = NumberSequenceKeypoint.new(keypoint.time, value, envelope)
+				keypoints[index] = NumberSequenceKeypoint.new(
+					keypoint.time,
+					keypoint.value,
+					keypoint.envelope
+				)
 			end
 
 			return NumberSequence.new(keypoints)
@@ -405,7 +283,10 @@ types = {
 
 	Ray = {
 		fromPod = function(pod)
-			return Ray.new(types.Vector3.fromPod(pod.origin), types.Vector3.fromPod(pod.direction))
+			return Ray.new(
+				types.Vector3.fromPod(pod.origin),
+				types.Vector3.fromPod(pod.direction)
+			)
 		end,
 
 		toPod = function(roblox)
@@ -418,7 +299,10 @@ types = {
 
 	Rect = {
 		fromPod = function(pod)
-			return Rect.new(types.Vector2.fromPod(pod[1]), types.Vector2.fromPod(pod[2]))
+			return Rect.new(
+				types.Vector2.fromPod(pod[1]),
+				types.Vector2.fromPod(pod[2])
+			)
 		end,
 
 		toPod = function(roblox)
@@ -430,28 +314,31 @@ types = {
 	},
 
 	Ref = {
-		fromPod = function(_)
+		fromPod = function(_pod)
 			error("Ref cannot be decoded on its own")
 		end,
 
-		toPod = function(_)
+		toPod = function(_roblox)
 			error("Ref can not be encoded on its own")
 		end,
 	},
 
 	Region3 = {
-		fromPod = function(_)
+		fromPod = function(pod)
 			error("Region3 is not implemented")
 		end,
 
-		toPod = function(_)
+		toPod = function(roblox)
 			error("Region3 is not implemented")
 		end,
 	},
 
 	Region3int16 = {
 		fromPod = function(pod)
-			return Region3int16.new(types.Vector3int16.fromPod(pod[1]), types.Vector3int16.fromPod(pod[2]))
+			return Region3int16.new(
+				types.Vector3int16.fromPod(pod[1]),
+				types.Vector3int16.fromPod(pod[2])
+			)
 		end,
 
 		toPod = function(roblox)
@@ -463,11 +350,11 @@ types = {
 	},
 
 	SharedString = {
-		fromPod = function(_pod)
+		fromPod = function(pod)
 			error("SharedString is not supported")
 		end,
 
-		toPod = function(_roblox)
+		toPod = function(roblox)
 			error("SharedString is not supported")
 		end,
 	},
@@ -481,13 +368,16 @@ types = {
 		fromPod = unpackDecoder(UDim.new),
 
 		toPod = function(roblox)
-			return { roblox.Scale, roblox.Offset }
+			return {roblox.Scale, roblox.Offset}
 		end,
 	},
 
 	UDim2 = {
 		fromPod = function(pod)
-			return UDim2.new(types.UDim.fromPod(pod[1]), types.UDim.fromPod(pod[2]))
+			return UDim2.new(
+				types.UDim.fromPod(pod[1]),
+				types.UDim.fromPod(pod[2])
+			)
 		end,
 
 		toPod = function(roblox)
@@ -518,7 +408,7 @@ types = {
 		fromPod = unpackDecoder(Vector2int16.new),
 
 		toPod = function(roblox)
-			return { roblox.X, roblox.Y }
+			return {roblox.X, roblox.Y}
 		end,
 	},
 
@@ -538,37 +428,16 @@ types = {
 		fromPod = unpackDecoder(Vector3int16.new),
 
 		toPod = function(roblox)
-			return { roblox.X, roblox.Y, roblox.Z }
+			return {roblox.X, roblox.Y, roblox.Z}
 		end,
 	},
 }
 
-types.OptionalCFrame = {
-	fromPod = function(pod)
-		if pod == nil then
-			return nil
-		else
-			return types.CFrame.fromPod(pod)
-		end
-	end,
-
-	toPod = function(roblox)
-		if roblox == nil then
-			return nil
-		else
-			return types.CFrame.toPod(roblox)
-		end
-	end,
-}
+local EncodedValue = {}
 
 function EncodedValue.decode(encodedValue)
 	local ty, value = next(encodedValue)
 
-	if ty == nil then
-		-- If the encoded pair is empty, assume it is an unoccupied optional value
-		return true, nil
-	end
-
 	local typeImpl = types[ty]
 	if typeImpl == nil then
 		return false, "Couldn't decode value " .. tostring(ty)
@@ -590,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/EncodedValue.spec.lua

@@ -0,0 +1,72 @@
+return function()
+	local HttpService = game:GetService("HttpService")
+	
+	local EncodedValue = require(script.Parent.EncodedValue)
+	local allValues = require(script.Parent.allValues)
+
+	local function deepEq(a, b)
+		if typeof(a) ~= typeof(b) then
+			return false
+		end
+
+		local ty = typeof(a)
+
+		if ty == "table" then
+			local visited = {}
+			
+			for key, valueA in pairs(a) do
+				visited[key] = true
+				
+				if not deepEq(valueA, b[key]) then
+					return false
+				end
+			end
+
+			for key, valueB in pairs(b) do
+				if visited[key] then
+					continue
+				end
+
+				if not deepEq(valueB, a[key]) then
+					return false
+				end
+			end
+
+			return true
+		else
+			return a == b
+		end
+	end
+
+	local extraAssertions = {
+		CFrame = function(value)
+			expect(value).to.equal(CFrame.new(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12))
+		end,
+	}
+
+	for testName, testEntry in pairs(allValues) do
+		it("round trip " .. testName, function()
+			local ok, decoded = EncodedValue.decode(testEntry.value)
+			assert(ok, decoded)
+
+			if extraAssertions[testName] ~= nil then
+				extraAssertions[testName](decoded)
+			end
+
+			local ok, encoded = EncodedValue.encode(decoded, testEntry.ty)
+			assert(ok, encoded)
+
+			if not deepEq(encoded, testEntry.value) then
+				local expected = HttpService:JSONEncode(testEntry.value)
+				local actual = HttpService:JSONEncode(encoded)
+
+				local message = string.format(
+					"Round-trip results did not match.\nExpected:\n%s\nActual:\n%s",
+					expected, actual
+				)
+
+				error(message)
+			end
+		end)
+	end
+end

plugin/rbx_dom_lua/Error.lua

@@ -5,7 +5,6 @@ Error.Kind = {
 	UnknownProperty = "UnknownProperty",
 	PropertyNotReadable = "PropertyNotReadable",
 	PropertyNotWritable = "PropertyNotWritable",
-	CannotParseBinaryString = "CannotParseBinaryString",
 	Roblox = "Roblox",
 }
 
@@ -26,4 +25,4 @@ function Error:__tostring()
 	return ("Error(%s: %s)"):format(self.kind, tostring(self.extra))
 end
 
-return Error
+return Error

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,79 +1,4 @@
 {
-  "Attributes": {
-    "value": {
-      "Attributes": {
-        "TestBool": {
-          "Bool": true
-        },
-        "TestBrickColor": {
-          "BrickColor": 24
-        },
-        "TestColor3": {
-          "Color3": [
-            1.0,
-            0.5,
-            0.0
-          ]
-        },
-        "TestEnumItem": {
-          "EnumItem": {
-            "type": "Material",
-            "value": 256
-          }
-        },
-        "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": [
@@ -176,23 +101,9 @@
     },
     "ty": "ColorSequence"
   },
-  "ContentId": {
+  "Content": {
     "value": {
-      "ContentId": "rbxassetid://12345"
-    },
-    "ty": "ContentId"
-  },
-  "Content_None": {
-    "value": {
-      "Content": "None"
-    },
-    "ty": "Content"
-  },
-  "Content_Uri": {
-    "value": {
-      "Content": {
-        "Uri": "rbxasset://abc/123.rojo"
-      }
+      "Content": "rbxassetid://12345"
     },
     "ty": "Content"
   },
@@ -202,15 +113,6 @@
     },
     "ty": "Enum"
   },
-  "EnumItem": {
-    "value": {
-      "EnumItem": {
-        "type": "Material",
-        "value": 256
-      }
-    },
-    "ty": "EnumItem"
-  },
   "Faces": {
     "value": {
       "Faces": [
@@ -236,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
@@ -259,118 +150,6 @@
     },
     "ty": "Int64"
   },
-  "MaterialColors": {
-    "value": {
-      "MaterialColors": {
-        "Grass": [
-          106,
-          127,
-          63
-        ],
-        "Slate": [
-          63,
-          127,
-          107
-        ],
-        "Concrete": [
-          127,
-          102,
-          63
-        ],
-        "Brick": [
-          138,
-          86,
-          62
-        ],
-        "Sand": [
-          143,
-          126,
-          95
-        ],
-        "WoodPlanks": [
-          139,
-          109,
-          79
-        ],
-        "Rock": [
-          102,
-          108,
-          111
-        ],
-        "Glacier": [
-          101,
-          176,
-          234
-        ],
-        "Snow": [
-          195,
-          199,
-          218
-        ],
-        "Sandstone": [
-          137,
-          90,
-          71
-        ],
-        "Mud": [
-          58,
-          46,
-          36
-        ],
-        "Basalt": [
-          30,
-          30,
-          37
-        ],
-        "Ground": [
-          102,
-          92,
-          59
-        ],
-        "CrackedLava": [
-          232,
-          156,
-          74
-        ],
-        "Asphalt": [
-          115,
-          123,
-          107
-        ],
-        "Cobblestone": [
-          132,
-          123,
-          90
-        ],
-        "Ice": [
-          129,
-          194,
-          224
-        ],
-        "LeafyGrass": [
-          115,
-          132,
-          74
-        ],
-        "Salt": [
-          198,
-          189,
-          181
-        ],
-        "Limestone": [
-          206,
-          173,
-          148
-        ],
-        "Pavement": [
-          148,
-          148,
-          140
-        ]
-      }
-    },
-    "ty": "MaterialColors"
-  },
   "NumberRange": {
     "value": {
       "NumberRange": [
@@ -399,41 +178,6 @@
     },
     "ty": "NumberSequence"
   },
-  "OptionalCFrame-None": {
-    "value": {
-      "OptionalCFrame": null
-    },
-    "ty": "OptionalCFrame"
-  },
-  "OptionalCFrame-Some": {
-    "value": {
-      "OptionalCFrame": {
-        "position": [
-          0.0,
-          0.0,
-          0.0
-        ],
-        "orientation": [
-          [
-            1.0,
-            0.0,
-            0.0
-          ],
-          [
-            0.0,
-            1.0,
-            0.0
-          ],
-          [
-            0.0,
-            0.0,
-            1.0
-          ]
-        ]
-      }
-    },
-    "ty": "OptionalCFrame"
-  },
   "PhysicalProperties-Custom": {
     "value": {
       "PhysicalProperties": {

plugin/rbx_dom_lua/base64.lua

@@ -136,4 +136,4 @@ end
 return {
 	decode = decodeBase64,
 	encode = encodeBase64,
-}
+}

plugin/rbx_dom_lua/base64.spec.lua

@@ -0,0 +1,29 @@
+return function()
+	local base64 = require(script.Parent.base64)
+
+	it("should encode and decode", function()
+		local function try(str, expected)
+			local encoded = base64.encode(str)
+			expect(encoded).to.equal(expected)
+			expect(base64.decode(encoded)).to.equal(str)
+		end
+
+		try("Man", "TWFu")
+		try("Ma", "TWE=")
+		try("M", "TQ==")
+		try("ManM", "TWFuTQ==")
+		try(
+			[[Man is distinguished, not only by his reason, but by this ]]..
+			[[singular passion from other animals, which is a lust of the ]]..
+			[[mind, that by a perseverance of delight in the continued and ]]..
+			[[indefatigable generation of knowledge, exceeds the short ]]..
+			[[vehemence of any carnal pleasure.]],
+			[[TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sI]]..
+			[[GJ1dCBieSB0aGlzIHNpbmd1bGFyIHBhc3Npb24gZnJvbSBvdGhlciBhbmltYW]]..
+			[[xzLCB3aGljaCBpcyBhIGx1c3Qgb2YgdGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJ]]..
+			[[zZXZlcmFuY2Ugb2YgZGVsaWdodCBpbiB0aGUgY29udGludWVkIGFuZCBpbmRl]]..
+			[[ZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRoZ]]..
+			[[SBzaG9ydCB2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=]]
+		)
+	end)
+end

plugin/rbx_dom_lua/customProperties.lua

@@ -1,99 +1,10 @@
 local CollectionService = game:GetService("CollectionService")
-local ScriptEditorService = game:GetService("ScriptEditorService")
-
-local Error = require(script.Parent.Error)
-
---- A list of `Enum.Material` values that are used for Terrain.MaterialColors
-local TERRAIN_MATERIAL_COLORS = {
-	Enum.Material.Grass,
-	Enum.Material.Slate,
-	Enum.Material.Concrete,
-	Enum.Material.Brick,
-	Enum.Material.Sand,
-	Enum.Material.WoodPlanks,
-	Enum.Material.Rock,
-	Enum.Material.Glacier,
-	Enum.Material.Snow,
-	Enum.Material.Sandstone,
-	Enum.Material.Mud,
-	Enum.Material.Basalt,
-	Enum.Material.Ground,
-	Enum.Material.CrackedLava,
-	Enum.Material.Asphalt,
-	Enum.Material.Cobblestone,
-	Enum.Material.Ice,
-	Enum.Material.LeafyGrass,
-	Enum.Material.Salt,
-	Enum.Material.Limestone,
-	Enum.Material.Pavement,
-}
-
-local function isAttributeNameValid(attributeName)
-	-- For SetAttribute to succeed, the attribute name must be less than or
-	-- equal to 100 characters...
-	return #attributeName <= 100
-		-- ...and must only contain alphanumeric characters, periods, hyphens,
-		-- underscores, or forward slashes.
-		and attributeName:match("[^%w%.%-_/]") == nil
-end
-
-local function isAttributeNameReserved(attributeName)
-	-- For SetAttribute to succeed, attribute names must not use the RBX
-	-- prefix, which is reserved by Roblox.
-	return attributeName:sub(1, 3) == "RBX"
-end
 
 -- Defines how to read and write properties that aren't directly scriptable.
 --
 -- 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)
-				if typeof(value) ~= "table" then
-					return false, Error.new(Error.Kind.CannotParseBinaryString)
-				end
-
-				local existing = instance:GetAttributes()
-				local didAllWritesSucceed = true
-
-				for attributeName, attributeValue in pairs(value) do
-					if isAttributeNameReserved(attributeName) then
-						-- If the attribute name is reserved, then we don't
-						-- really care about reporting any failures about
-						-- it.
-						continue
-					end
-
-					if not isAttributeNameValid(attributeName) then
-						didAllWritesSucceed = false
-						continue
-					end
-
-					instance:SetAttribute(attributeName, attributeValue)
-				end
-
-				for existingAttributeName in pairs(existing) do
-					if isAttributeNameReserved(existingAttributeName) then
-						continue
-					end
-
-					if not isAttributeNameValid(existingAttributeName) then
-						didAllWritesSucceed = false
-						continue
-					end
-
-					if value[existingAttributeName] == nil then
-						instance:SetAttribute(existingAttributeName, nil)
-					end
-				end
-
-				return didAllWritesSucceed
-			end,
-		},
 		Tags = {
 			read = function(instance)
 				return true, CollectionService:GetTags(instance)
@@ -121,91 +32,13 @@ return {
 	},
 	LocalizationTable = {
 		Contents = {
-			read = function(instance, _)
+			read = function(instance, key)
 				return true, instance:GetContents()
 			end,
-			write = function(instance, _, value)
+			write = function(instance, key, value)
 				instance:SetContents(value)
 				return true
 			end,
 		},
 	},
-	Model = {
-		Scale = {
-			read = function(instance, _, _)
-				return true, instance:GetScale()
-			end,
-			write = function(instance, _, value)
-				return true, instance:ScaleTo(value)
-			end,
-		},
-		WorldPivotData = {
-			read = function(instance)
-				return true, instance.WorldPivot
-			end,
-			write = function(instance, _, value)
-				if value == nil then
-					return true, nil
-				else
-					instance.WorldPivot = value
-					return true
-				end
-			end,
-		},
-	},
-	Terrain = {
-		MaterialColors = {
-			read = function(instance: Terrain)
-				-- There's no way to get a list of every color, so we have to
-				-- make one.
-				local colors = {}
-				for _, material in TERRAIN_MATERIAL_COLORS do
-					colors[material] = instance:GetMaterialColor(material)
-				end
-
-				return true, colors
-			end,
-			write = function(instance: Terrain, _, value: { [Enum.Material]: Color3 })
-				if typeof(value) ~= "table" then
-					return false, Error.new(Error.Kind.CannotParseBinaryString)
-				end
-
-				for material, color in value do
-					instance:SetMaterialColor(material, color)
-				end
-
-				return true
-			end,
-		},
-	},
-	Script = {
-		Source = {
-			read = function(instance: Script)
-				return true, ScriptEditorService:GetEditorSource(instance)
-			end,
-			write = function(instance: Script, _, value: string)
-				task.spawn(function()
-					ScriptEditorService:UpdateSourceAsync(instance, function()
-						return value
-					end)
-				end)
-				return true
-			end,
-		},
-	},
-	ModuleScript = {
-		Source = {
-			read = function(instance: ModuleScript)
-				return true, ScriptEditorService:GetEditorSource(instance)
-			end,
-			write = function(instance: ModuleScript, _, value: string)
-				task.spawn(function()
-					ScriptEditorService:UpdateSourceAsync(instance, function()
-						return value
-					end)
-				end)
-				return true
-			end,
-		},
-	},
 }

plugin/rbx_dom_lua/init.lua

@@ -24,8 +24,7 @@ local function findCanonicalPropertyDescriptor(className, propertyName)
 				return PropertyDescriptor.fromRaw(
 					currentClass.Properties[aliasData.AliasFor],
 					currentClassName,
-					aliasData.AliasFor
-				)
+					aliasData.AliasFor)
 			end
 
 			return nil

plugin/rbx_dom_lua/init.spec.lua

@@ -0,0 +1,7 @@
+return function()
+	local RbxDom = require(script.Parent)
+
+	it("should load", function()
+		expect(RbxDom).to.be.ok()
+	end)
+end

plugin/run-tests.server.lua

@@ -1,11 +1,19 @@
 local ReplicatedStorage = game:GetService("ReplicatedStorage")
 
-local TestEZ = require(ReplicatedStorage.Packages:WaitForChild("TestEZ", 10))
+local TestEZ = require(ReplicatedStorage.TestEZ)
 
 local Rojo = ReplicatedStorage.Rojo
 
-local Settings = require(Rojo.Plugin.Settings)
-Settings:set("logLevel", "Trace")
-Settings:set("typecheckingEnabled", true)
+local DevSettings = require(Rojo.Plugin.DevSettings)
+
+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(Packages.Http)
-local Log = require(Packages.Log)
-local Promise = require(Packages.Promise)
+local Http = require(script.Parent.Parent.Http)
+local Log = require(script.Parent.Parent.Log)
+local Promise = require(script.Parent.Parent.Promise)
 
 local Config = require(script.Parent.Config)
 local Types = require(script.Parent.Types)
@@ -11,6 +10,13 @@ local validateApiInfo = Types.ifEnabled(Types.ApiInfoResponse)
 local validateApiRead = Types.ifEnabled(Types.ApiReadResponse)
 local validateApiSubscribe = Types.ifEnabled(Types.ApiSubscribeResponse)
 
+--[[
+	Returns a promise that will never resolve nor reject.
+]]
+local function hangingPromise()
+	return Promise.new(function() end)
+end
+
 local function rejectFailedRequests(response)
 	if response.code >= 400 then
 		local message = string.format("HTTP %s:\n%s", tostring(response.code), response.body)
@@ -24,17 +30,15 @@ end
 local function rejectWrongProtocolVersion(infoResponseBody)
 	if infoResponseBody.protocolVersion ~= Config.protocolVersion then
 		local message = (
-			"Found a Rojo dev server, but it's using a different protocol version, and is incompatible."
-			.. "\nMake sure you have matching versions of both the Rojo plugin and server!"
-			.. "\n\nYour client is version %s, with protocol version %s. It expects server version %s."
-			.. "\nYour server is version %s, with protocol version %s."
-			.. "\n\nGo to https://github.com/rojo-rbx/rojo for more details."
+			"Found a Rojo dev server, but it's using a different protocol version, and is incompatible." ..
+			"\nMake sure you have matching versions of both the Rojo plugin and server!" ..
+			"\n\nYour client is version %s, with protocol version %s. It expects server version %s." ..
+			"\nYour server is version %s, with protocol version %s." ..
+			"\n\nGo to https://github.com/rojo-rbx/rojo for more details."
 		):format(
-			Version.display(Config.version),
-			Config.protocolVersion,
+			Version.display(Config.version), Config.protocolVersion,
 			Config.expectedServerVersionString,
-			infoResponseBody.serverVersion,
-			infoResponseBody.protocolVersion
+			infoResponseBody.serverVersion, infoResponseBody.protocolVersion
 		)
 
 		return Promise.reject(message)
@@ -45,7 +49,14 @@ end
 
 local function rejectWrongPlaceId(infoResponseBody)
 	if infoResponseBody.expectedPlaceIds ~= nil then
-		local foundId = table.find(infoResponseBody.expectedPlaceIds, game.PlaceId)
+		local foundId = false
+
+		for _, id in ipairs(infoResponseBody.expectedPlaceIds) do
+			if id == game.PlaceId then
+				foundId = true
+				break
+			end
+		end
 
 		if not foundId then
 			local idList = {}
@@ -54,31 +65,14 @@ local function rejectWrongPlaceId(infoResponseBody)
 			end
 
 			local message = (
-				"Found a Rojo server, but its project is set to only be used with a specific list of places."
-				.. "\nYour place ID is %u, but needs to be one of these:"
-				.. "\n%s"
-				.. "\n\nTo change this list, edit 'servePlaceIds' in your .project.json file."
-			):format(game.PlaceId, table.concat(idList, "\n"))
-
-			return Promise.reject(message)
-		end
-	end
-
-	if infoResponseBody.unexpectedPlaceIds ~= nil then
-		local foundId = table.find(infoResponseBody.unexpectedPlaceIds, game.PlaceId)
-
-		if foundId then
-			local idList = {}
-			for _, id in ipairs(infoResponseBody.unexpectedPlaceIds) do
-				table.insert(idList, "- " .. tostring(id))
-			end
-
-			local message = (
-				"Found a Rojo server, but its project is set to not be used with a specific list of places."
-				.. "\nYour place ID is %u, but needs to not be one of these:"
-				.. "\n%s"
-				.. "\n\nTo change this list, edit 'blockedPlaceIds' in your .project.json file."
-			):format(game.PlaceId, table.concat(idList, "\n"))
+				"Found a Rojo server, but its project is set to only be used with a specific list of places." ..
+				"\nYour place ID is %s, but needs to be one of these:" ..
+				"\n%s" ..
+				"\n\nTo change this list, edit 'servePlaceIds' in your .project.json file."
+			):format(
+				tostring(game.PlaceId),
+				table.concat(idList, "\n")
+			)
 
 			return Promise.reject(message)
 		end
@@ -91,14 +85,13 @@ 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,
 		__sessionId = nil,
 		__messageCursor = -1,
 		__connected = true,
-		__activeRequests = {},
 	}
 
 	return setmetatable(self, ApiContext)
@@ -119,11 +112,6 @@ end
 
 function ApiContext:disconnect()
 	self.__connected = false
-	for request in self.__activeRequests do
-		Log.trace("Cancelling request {}", request)
-		request:cancel()
-	end
-	self.__activeRequests = {}
 end
 
 function ApiContext:setMessageCursor(index)
@@ -153,15 +141,18 @@ end
 function ApiContext:read(ids)
 	local url = ("%s/api/read/%s"):format(self.__baseUrl, table.concat(ids, ","))
 
-	return Http.get(url):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
-		if body.sessionId ~= self.__sessionId then
-			return Promise.reject("Server changed ID")
-		end
+	return Http.get(url)
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			if body.sessionId ~= self.__sessionId then
+				return Promise.reject("Server changed ID")
+			end
 
-		assert(validateApiRead(body))
+			assert(validateApiRead(body))
 
-		return body
-	end)
+			return body
+		end)
 end
 
 function ApiContext:write(patch)
@@ -198,58 +189,63 @@ function ApiContext:write(patch)
 
 	body = Http.jsonEncode(body)
 
-	return Http.post(url, body):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(responseBody)
-		Log.info("Write response: {:?}", responseBody)
+	return Http.post(url, body)
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			Log.info("Write response: {:?}", body)
 
-		return responseBody
-	end)
+			return body
+		end)
 end
 
 function ApiContext:retrieveMessages()
 	local url = ("%s/api/subscribe/%s"):format(self.__baseUrl, self.__messageCursor)
 
 	local function sendRequest()
-		local request = Http.get(url):catch(function(err)
-			if err.type == Http.Error.Kind.Timeout and self.__connected then
-				return sendRequest()
-			end
+		return Http.get(url)
+			:catch(function(err)
+				if err.type == Http.Error.Kind.Timeout then
+					if self.__connected then
+						return sendRequest()
+					else
+						return hangingPromise()
+					end
+				end
 
-			return Promise.reject(err)
-		end)
-
-		Log.trace("Tracking request {}", request)
-		self.__activeRequests[request] = true
-
-		return request:finally(function(...)
-			Log.trace("Cleaning up request {}", request)
-			self.__activeRequests[request] = nil
-			return ...
-		end)
+				return Promise.reject(err)
+			end)
 	end
 
-	return sendRequest():andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
-		if body.sessionId ~= self.__sessionId then
-			return Promise.reject("Server changed ID")
-		end
+	return sendRequest()
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			if body.sessionId ~= self.__sessionId then
+				return Promise.reject("Server changed ID")
+			end
 
-		assert(validateApiSubscribe(body))
+			assert(validateApiSubscribe(body))
 
-		self:setMessageCursor(body.messageCursor)
+			self:setMessageCursor(body.messageCursor)
 
-		return body.messages
-	end)
+			return body.messages
+		end)
 end
 
 function ApiContext:open(id)
 	local url = ("%s/api/open/%s"):format(self.__baseUrl, id)
 
-	return Http.post(url, ""):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
-		if body.sessionId ~= self.__sessionId then
-			return Promise.reject("Server changed ID")
-		end
+	return Http.post(url, "")
+		:andThen(rejectFailedRequests)
+		:andThen(Http.Response.json)
+		:andThen(function(body)
+			if body.sessionId ~= self.__sessionId then
+				return Promise.reject("Server changed ID")
+			end
 
-		return nil
-	end)
+			return nil
+		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),
-				Position = UDim2.new(0, 1, 0, 1),
+				Size = UDim2.new(1, 0, 1, 0),
 				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 Flipper = require(Packages.Flipper)
+local Roact = require(Rojo.Roact)
+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
 
@@ -23,16 +21,18 @@ end
 
 function Checkbox:didUpdate(lastProps)
 	if lastProps.active ~= self.props.active then
-		self.motor:setGoal(Flipper.Spring.new(self.props.active and 1 or 0, {
-			frequency = 6,
-			dampingRatio = 1.1,
-		}))
+		self.motor:setGoal(
+			Flipper.Spring.new(self.props.active and 1 or 0, {
+				frequency = 6,
+				dampingRatio = 1.1,
+			})
+		)
 	end
 end
 
 function Checkbox:render()
 	return Theme.with(function(theme)
-		local checkboxTheme = theme.Checkbox
+		theme = theme.Checkbox
 
 		local activeTransparency = Roact.joinBindings({
 			self.binding:map(function(value)
@@ -49,29 +49,18 @@ function Checkbox:render()
 			ZIndex = self.props.zIndex,
 			BackgroundTransparency = 1,
 
-			[Roact.Event.Activated] = function()
-				if self.props.locked then
-					return
-				end
-				self.props.onClick()
-			end,
+			[Roact.Event.Activated] = self.props.onClick,
 		}, {
-			StateTip = e(Tooltip.Trigger, {
-				text = (if self.props.locked
-					then (self.props.lockedTooltip or "(Cannot be changed right now)") .. "\n"
-					else "") .. (if self.props.active then "Enabled" else "Disabled"),
-			}),
-
 			Active = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBackground,
-				color = checkboxTheme.Active.BackgroundColor,
+				color = theme.Active.BackgroundColor,
 				transparency = activeTransparency,
 				size = UDim2.new(1, 0, 1, 0),
 				zIndex = 2,
 			}, {
 				Icon = e("ImageLabel", {
-					Image = if self.props.locked then Assets.Images.Checkbox.Locked else Assets.Images.Checkbox.Active,
-					ImageColor3 = checkboxTheme.Active.IconColor,
+					Image = Assets.Images.Checkbox.Active,
+					ImageColor3 = theme.Active.IconColor,
 					ImageTransparency = activeTransparency,
 
 					Size = UDim2.new(0, 16, 0, 16),
@@ -84,15 +73,13 @@ function Checkbox:render()
 
 			Inactive = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBorder,
-				color = checkboxTheme.Inactive.BorderColor,
+				color = theme.Inactive.BorderColor,
 				transparency = self.props.transparency,
 				size = UDim2.new(1, 0, 1, 0),
 			}, {
 				Icon = e("ImageLabel", {
-					Image = if self.props.locked
-						then Assets.Images.Checkbox.Locked
-						else Assets.Images.Checkbox.Inactive,
-					ImageColor3 = checkboxTheme.Inactive.IconColor,
+					Image = Assets.Images.Checkbox.Inactive,
+					ImageColor3 = theme.Inactive.IconColor,
 					ImageTransparency = self.props.transparency,
 
 					Size = UDim2.new(0, 16, 0, 16),
@@ -106,4 +93,4 @@ function Checkbox:render()
 	end)
 end
 
-return Checkbox
+return Checkbox

plugin/src/App/Components/ClassIcon.lua

@@ -1,126 +0,0 @@
-local StudioService = game:GetService("StudioService")
-local AssetService = game:GetService("AssetService")
-
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local e = Roact.createElement
-
-local EditableImage = require(Plugin.App.Components.EditableImage)
-
-local imageCache = {}
-local function getImageSizeAndPixels(image)
-	if not imageCache[image] then
-		local editableImage = AssetService:CreateEditableImageAsync(image)
-		imageCache[image] = {
-			Size = editableImage.Size,
-			Pixels = editableImage:ReadPixels(Vector2.zero, editableImage.Size),
-		}
-	end
-
-	return imageCache[image].Size, table.clone(imageCache[image].Pixels)
-end
-
-local function getRecoloredClassIcon(className, color)
-	local iconProps = StudioService:GetClassIcon(className)
-
-	if iconProps and color then
-		local success, editableImageSize, editableImagePixels = pcall(function()
-			local size, pixels = getImageSizeAndPixels(iconProps.Image)
-
-			local minVal, maxVal = math.huge, -math.huge
-			for i = 1, #pixels, 4 do
-				if pixels[i + 3] == 0 then
-					continue
-				end
-				local pixelVal = math.max(pixels[i], pixels[i + 1], pixels[i + 2])
-
-				minVal = math.min(minVal, pixelVal)
-				maxVal = math.max(maxVal, pixelVal)
-			end
-
-			local hue, sat, val = color:ToHSV()
-			for i = 1, #pixels, 4 do
-				if pixels[i + 3] == 0 then
-					continue
-				end
-
-				local pixelVal = math.max(pixels[i], pixels[i + 1], pixels[i + 2])
-				local newVal = val
-				if minVal < maxVal then
-					-- Remap minVal - maxVal to val*0.9 - val
-					newVal = val * (0.9 + 0.1 * (pixelVal - minVal) / (maxVal - minVal))
-				end
-
-				local newPixelColor = Color3.fromHSV(hue, sat, newVal)
-				pixels[i], pixels[i + 1], pixels[i + 2] = newPixelColor.R, newPixelColor.G, newPixelColor.B
-			end
-			return size, pixels
-		end)
-		if success then
-			iconProps.EditableImagePixels = editableImagePixels
-			iconProps.EditableImageSize = editableImageSize
-		end
-	end
-
-	return iconProps
-end
-
-local ClassIcon = Roact.PureComponent:extend("ClassIcon")
-
-function ClassIcon:init()
-	self.state = {
-		iconProps = nil,
-	}
-end
-
-function ClassIcon:updateIcon()
-	local props = self.props
-	local iconProps = getRecoloredClassIcon(props.className, props.color)
-	self:setState({
-		iconProps = iconProps,
-	})
-end
-
-function ClassIcon:didMount()
-	self:updateIcon()
-end
-
-function ClassIcon:didUpdate(lastProps)
-	if lastProps.className ~= self.props.className or lastProps.color ~= self.props.color then
-		self:updateIcon()
-	end
-end
-
-function ClassIcon:render()
-	local iconProps = self.state.iconProps
-	if not iconProps then
-		return nil
-	end
-
-	return e(
-		"ImageLabel",
-		{
-			Size = self.props.size,
-			Position = self.props.position,
-			LayoutOrder = self.props.layoutOrder,
-			AnchorPoint = self.props.anchorPoint,
-			ImageTransparency = self.props.transparency,
-			Image = iconProps.Image,
-			ImageRectOffset = iconProps.ImageRectOffset,
-			ImageRectSize = iconProps.ImageRectSize,
-			BackgroundTransparency = 1,
-		},
-		if iconProps.EditableImagePixels
-			then e(EditableImage, {
-				size = iconProps.EditableImageSize,
-				pixels = iconProps.EditableImagePixels,
-			})
-			else nil
-	)
-end
-
-return ClassIcon

plugin/src/App/Components/CodeLabel.lua

@@ -1,66 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-local Highlighter = require(Packages.Highlighter)
-Highlighter.matchStudioSettings()
-
-local e = Roact.createElement
-
-local Theme = require(Plugin.App.Theme)
-
-local CodeLabel = Roact.PureComponent:extend("CodeLabel")
-
-function CodeLabel:init()
-	self.labelRef = Roact.createRef()
-	self.highlightsRef = Roact.createRef()
-end
-
-function CodeLabel:didMount()
-	Highlighter.highlight({
-		textObject = self.labelRef:getValue(),
-	})
-	self:updateHighlights()
-end
-
-function CodeLabel:didUpdate()
-	self:updateHighlights()
-end
-
-function CodeLabel:updateHighlights()
-	local highlights = self.highlightsRef:getValue()
-	if not highlights then
-		return
-	end
-
-	for _, lineLabel in highlights:GetChildren() do
-		local lineNum = tonumber(string.match(lineLabel.Name, "%d+") or "0")
-		lineLabel.BackgroundColor3 = self.props.lineBackground
-		lineLabel.BorderSizePixel = 0
-		lineLabel.BackgroundTransparency = if self.props.markedLines[lineNum] then 0.25 else 1
-	end
-end
-
-function CodeLabel:render()
-	return Theme.with(function(theme)
-		return e("TextLabel", {
-			Size = self.props.size,
-			Position = self.props.position,
-			Text = self.props.text,
-			BackgroundTransparency = 1,
-			FontFace = theme.Font.Code,
-			TextSize = theme.TextSize.Code,
-			TextXAlignment = Enum.TextXAlignment.Left,
-			TextYAlignment = Enum.TextYAlignment.Top,
-			TextColor3 = Color3.fromRGB(255, 255, 255),
-			[Roact.Ref] = self.labelRef,
-		}, {
-			SyntaxHighlights = e("Folder", {
-				[Roact.Ref] = self.highlightsRef,
-			}),
-		})
-	end)
-end
-
-return CodeLabel

plugin/src/App/Components/Dropdown.lua

@@ -1,182 +0,0 @@
-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 getTextBoundsAsync = require(Plugin.App.getTextBoundsAsync)
-
-local SlicedImage = require(script.Parent.SlicedImage)
-local ScrollingFrame = require(script.Parent.ScrollingFrame)
-local Tooltip = require(script.Parent.Tooltip)
-
-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(prevProps)
-	if self.props.locked and not prevProps.locked then
-		self:setState({
-			open = false,
-		})
-	end
-
-	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)
-		local dropdownTheme = theme.Dropdown
-
-		local optionButtons = {}
-		local width = -1
-		for i, option in self.props.options do
-			local text = tostring(option or "")
-			local textBounds = getTextBoundsAsync(text, theme.Font.Main, theme.TextSize.Body, math.huge)
-			if textBounds.X > width then
-				width = textBounds.X
-			end
-
-			optionButtons[text] = e("TextButton", {
-				Text = text,
-				LayoutOrder = i,
-				Size = UDim2.new(1, 0, 0, 24),
-				BackgroundColor3 = dropdownTheme.BackgroundColor,
-				TextTransparency = self.props.transparency,
-				BackgroundTransparency = self.props.transparency,
-				BorderSizePixel = 0,
-				TextColor3 = dropdownTheme.TextColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextSize = theme.TextSize.Body,
-				FontFace = theme.Font.Main,
-
-				[Roact.Event.Activated] = function()
-					if self.props.locked then
-						return
-					end
-					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()
-				if self.props.locked then
-					return
-				end
-				self:setState({
-					open = not self.state.open,
-				})
-			end,
-		}, {
-			Border = e(SlicedImage, {
-				slice = Assets.Slices.RoundedBorder,
-				color = dropdownTheme.BorderColor,
-				transparency = self.props.transparency,
-				size = UDim2.new(1, 0, 1, 0),
-			}, {
-				DropArrow = e("ImageLabel", {
-					Image = if self.props.locked then Assets.Images.Dropdown.Locked else Assets.Images.Dropdown.Arrow,
-					ImageColor3 = dropdownTheme.IconColor,
-					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,
-				}, {
-					StateTip = if self.props.locked
-						then e(Tooltip.Trigger, {
-							text = self.props.lockedTooltip or "(Cannot be changed right now)",
-						})
-						else nil,
-				}),
-				Active = e("TextLabel", {
-					Size = UDim2.new(1, -30, 1, 0),
-					Position = UDim2.new(0, 6, 0, 0),
-					BackgroundTransparency = 1,
-					Text = self.props.active,
-					FontFace = theme.Font.Main,
-					TextSize = theme.TextSize.Body,
-					TextColor3 = dropdownTheme.TextColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = self.props.transparency,
-				}),
-			}),
-			Options = if self.state.open
-				then e(SlicedImage, {
-					slice = Assets.Slices.RoundedBackground,
-					color = dropdownTheme.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 = dropdownTheme.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,
-						}),
-						Options = Roact.createFragment(optionButtons),
-					}),
-				})
-				else nil,
-		})
-	end)
-end
-
-return Dropdown

plugin/src/App/Components/EditableImage.lua

@@ -1,41 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local e = Roact.createElement
-
-local EditableImage = Roact.PureComponent:extend("EditableImage")
-
-function EditableImage:init()
-	self.ref = Roact.createRef()
-end
-
-function EditableImage:writePixels()
-	local image = self.ref.current
-	if not image then
-		return
-	end
-	if not self.props.pixels then
-		return
-	end
-
-	image:WritePixels(Vector2.zero, self.props.size, self.props.pixels)
-end
-
-function EditableImage:render()
-	return e("EditableImage", {
-		Size = self.props.size,
-		[Roact.Ref] = self.ref,
-	})
-end
-
-function EditableImage:didMount()
-	self:writePixels()
-end
-
-function EditableImage:didUpdate()
-	self:writePixels()
-end
-
-return EditableImage

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)
@@ -31,13 +30,13 @@ local function Header(props)
 
 			Version = e("TextLabel", {
 				Text = Version.display(Config.version),
-				FontFace = theme.Font.Thin,
-				TextSize = theme.TextSize.Body,
+				Font = Enum.Font.Gotham,
+				TextSize = 14,
 				TextColor3 = theme.Header.VersionColor,
 				TextXAlignment = Enum.TextXAlignment.Left,
 				TextTransparency = props.transparency,
 
-				Size = UDim2.new(1, 0, 0, theme.TextSize.Body),
+				Size = UDim2.new(1, 0, 0, 14),
 
 				LayoutOrder = 2,
 				BackgroundTransparency = 1,
@@ -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 Flipper = require(Packages.Flipper)
+local Roact = require(Rojo.Roact)
+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,
@@ -38,11 +36,15 @@ function IconButton:render()
 		[Roact.Event.Activated] = self.props.onClick,
 
 		[Roact.Event.MouseEnter] = function()
-			self.motor:setGoal(Flipper.Spring.new(1, HOVER_SPRING_PROPS))
+			self.motor:setGoal(
+				Flipper.Spring.new(1, HOVER_SPRING_PROPS)
+			)
 		end,
 
 		[Roact.Event.MouseLeave] = function()
-			self.motor:setGoal(Flipper.Spring.new(0, HOVER_SPRING_PROPS))
+			self.motor:setGoal(
+				Flipper.Spring.new(0, HOVER_SPRING_PROPS)
+			)
 		end,
 	}, {
 		Icon = e("ImageLabel", {
@@ -71,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,281 +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 ScrollingFrame = require(Plugin.App.Components.ScrollingFrame)
-local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-local DisplayValue = require(script.Parent.DisplayValue)
-
-local EMPTY_TABLE = {}
-
-local e = Roact.createElement
-
-local function ViewDiffButton(props)
-	return Theme.with(function(theme)
-		return e("TextButton", {
-			Text = "",
-			Size = UDim2.new(0.7, 0, 1, -4),
-			LayoutOrder = 2,
-			BackgroundTransparency = 1,
-			[Roact.Event.Activated] = props.onClick,
-		}, {
-			e(BorderedContainer, {
-				size = UDim2.new(1, 0, 1, 0),
-				transparency = props.transparency:map(function(t)
-					return 0.5 + (0.5 * t)
-				end),
-			}, {
-				Layout = e("UIListLayout", {
-					FillDirection = Enum.FillDirection.Horizontal,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					HorizontalAlignment = Enum.HorizontalAlignment.Center,
-					VerticalAlignment = Enum.VerticalAlignment.Center,
-					Padding = UDim.new(0, 5),
-				}),
-				Label = e("TextLabel", {
-					Text = "View Diff",
-					BackgroundTransparency = 1,
-					FontFace = theme.Font.Main,
-					TextSize = theme.TextSize.Body,
-					TextColor3 = theme.Settings.Setting.DescriptionColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = props.transparency,
-					TextTruncate = Enum.TextTruncate.AtEnd,
-					Size = UDim2.new(0, 65, 1, 0),
-					LayoutOrder = 1,
-				}),
-				Icon = e("ImageLabel", {
-					Image = Assets.Images.Icons.Expand,
-					ImageColor3 = theme.Settings.Setting.DescriptionColor,
-					ImageTransparency = props.transparency,
-
-					Size = UDim2.new(0, 16, 0, 16),
-					Position = UDim2.new(0.5, 0, 0.5, 0),
-					AnchorPoint = Vector2.new(0.5, 0.5),
-
-					BackgroundTransparency = 1,
-					LayoutOrder = 2,
-				}),
-			}),
-		})
-	end)
-end
-
-local function RowContent(props)
-	local values = props.values
-	local metadata = props.metadata
-
-	if props.showStringDiff and values[1] == "Source" then
-		-- Special case for .Source updates
-		return e(ViewDiffButton, {
-			transparency = props.transparency,
-			onClick = function()
-				if not props.showStringDiff then
-					return
-				end
-				props.showStringDiff(tostring(values[2]), tostring(values[3]))
-			end,
-		})
-	end
-
-	if props.showTableDiff and (type(values[2]) == "table" or type(values[3]) == "table") then
-		-- Special case for table properties (like Attributes/Tags)
-		return e(ViewDiffButton, {
-			transparency = props.transparency,
-			onClick = function()
-				if not props.showTableDiff then
-					return
-				end
-				props.showTableDiff(values[2], values[3])
-			end,
-		})
-	end
-
-	return Theme.with(function(theme)
-		return Roact.createFragment({
-			ColumnB = e(
-				"Frame",
-				{
-					BackgroundTransparency = 1,
-					Size = UDim2.new(0.35, 0, 1, 0),
-					LayoutOrder = 2,
-				},
-				e(DisplayValue, {
-					value = values[2],
-					transparency = props.transparency,
-					textColor = if metadata.isWarning
-						then theme.Diff.Warning
-						else theme.Settings.Setting.DescriptionColor,
-				})
-			),
-			ColumnC = e(
-				"Frame",
-				{
-					BackgroundTransparency = 1,
-					Size = UDim2.new(0.35, 0, 1, 0),
-					LayoutOrder = 3,
-				},
-				e(DisplayValue, {
-					value = values[3],
-					transparency = props.transparency,
-					textColor = if metadata.isWarning
-						then theme.Diff.Warning
-						else theme.Settings.Setting.DescriptionColor,
-				})
-			),
-		})
-	end)
-end
-
-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 rows = {}
-		local pad = {
-			PaddingLeft = UDim.new(0, 5),
-			PaddingRight = UDim.new(0, 5),
-		}
-
-		local headerRow = changes[1]
-		local headers = e("Frame", {
-			Size = UDim2.new(1, 0, 0, 24),
-			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,
-			}),
-			ColumnA = e("TextLabel", {
-				Text = tostring(headerRow[1]),
-				BackgroundTransparency = 1,
-				FontFace = theme.Font.Bold,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = theme.TextColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(0.3, 0, 1, 0),
-				LayoutOrder = 1,
-			}),
-			ColumnB = e("TextLabel", {
-				Text = tostring(headerRow[2]),
-				BackgroundTransparency = 1,
-				FontFace = theme.Font.Bold,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = theme.TextColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(0.35, 0, 1, 0),
-				LayoutOrder = 2,
-			}),
-			ColumnC = e("TextLabel", {
-				Text = tostring(headerRow[3]),
-				BackgroundTransparency = 1,
-				FontFace = theme.Font.Bold,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = theme.TextColor,
-				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
-
-			local metadata = values[4] or EMPTY_TABLE
-			local isWarning = metadata.isWarning
-
-			rows[row] = e("Frame", {
-				Size = UDim2.new(1, 0, 0, 24),
-				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,
-				}),
-				ColumnA = e("TextLabel", {
-					Text = (if isWarning then "⚠ " else "") .. tostring(values[1]),
-					BackgroundTransparency = 1,
-					FontFace = theme.Font.Main,
-					TextSize = theme.TextSize.Body,
-					TextColor3 = if isWarning then theme.Diff.Warning else theme.TextColor,
-					TextXAlignment = Enum.TextXAlignment.Left,
-					TextTransparency = props.transparency,
-					TextTruncate = Enum.TextTruncate.AtEnd,
-					Size = UDim2.new(0.3, 0, 1, 0),
-					LayoutOrder = 1,
-				}),
-				Content = e(RowContent, {
-					values = values,
-					metadata = metadata,
-					transparency = props.transparency,
-					showStringDiff = props.showStringDiff,
-					showTableDiff = props.showTableDiff,
-				}),
-			})
-		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, -24),
-				position = UDim2.new(0, 0, 0, 24),
-				contentSize = self.contentSize,
-				transparency = props.transparency,
-			}, rows),
-		})
-	end)
-end
-
-return ChangeList

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

@@ -1,126 +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,
-					FontFace = theme.Font.Main,
-					TextSize = theme.TextSize.Body,
-					TextColor3 = props.textColor,
-					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 = "{}"
-			elseif next(props.value) == 1 then
-				-- We don't need to support mixed tables, so checking the first key is enough
-				-- to determine if it's a simple array
-				local out, i = table.create(#props.value), 0
-				for _, v in props.value do
-					i += 1
-
-					-- Wrap strings in quotes
-					if type(v) == "string" then
-						v = '"' .. v .. '"'
-					end
-
-					out[i] = tostring(v)
-				end
-				textRepresentation = "{ " .. table.concat(out, ", ") .. " }"
-			else
-				-- Otherwise, show the table contents as a dictionary
-				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,
-				FontFace = theme.Font.Main,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = props.textColor,
-				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.
-
-		local textRepresentation = string.gsub(tostring(props.value), "%s", " ")
-		if t == "string" then
-			textRepresentation = '"' .. textRepresentation .. '"'
-		end
-
-		return e("TextLabel", {
-			Text = textRepresentation,
-			BackgroundTransparency = 1,
-			FontFace = theme.Font.Main,
-			TextSize = theme.TextSize.Body,
-			TextColor3 = props.textColor,
-			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,282 +0,0 @@
-local SelectionService = game:GetService("Selection")
-
-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 Tooltip = require(Plugin.App.Components.Tooltip)
-local ClassIcon = require(Plugin.App.Components.ClassIcon)
-
-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, -24),
-		Position = UDim2.new(0, props.indent, 0, 24),
-	}, {
-		ChangeList = e(ChangeList, {
-			changes = props.changeList,
-			transparency = props.transparency,
-			showStringDiff = props.showStringDiff,
-			showTableDiff = props.showTableDiff,
-		}),
-	})
-end
-
-local DomLabel = Roact.Component:extend("DomLabel")
-
-function DomLabel:init()
-	local initHeight = self.props.elementHeight:getValue()
-	self.expanded = initHeight > 24
-
-	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 > 24
-
-		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:didUpdate(prevProps)
-	if
-		prevProps.instance ~= self.props.instance
-		or prevProps.patchType ~= self.props.patchType
-		or prevProps.name ~= self.props.name
-		or prevProps.changeList ~= self.props.changeList
-	then
-		-- Close the expansion when the domlabel is changed to a different thing
-		self.expanded = false
-		self.motor:setGoal(Flipper.Spring.new(24, {
-			frequency = 5,
-			dampingRatio = 1,
-		}))
-	end
-end
-
-function DomLabel:render()
-	local props = self.props
-	local depth = props.depth or 1
-
-	return Theme.with(function(theme)
-		local color = if props.isWarning
-			then theme.Diff.Warning
-			elseif props.patchType then theme.Diff[props.patchType]
-			else theme.TextColor
-
-		local indent = (depth - 1) * 12 + 15
-
-		-- Line guides help indent depth remain readable
-		local lineGuides = {}
-		for i = 2, depth do
-			if props.depthsComplete[i] then
-				continue
-			end
-			if props.isFinalChild and i == depth then
-				-- This line stops halfway down to merge with our connector for the right angle
-				lineGuides["Line_" .. i] = e("Frame", {
-					Size = UDim2.new(0, 2, 0, 15),
-					Position = UDim2.new(0, (12 * (i - 1)) + 6, 0, -1),
-					BorderSizePixel = 0,
-					BackgroundTransparency = props.transparency,
-					BackgroundColor3 = theme.BorderedContainer.BorderColor,
-				})
-			else
-				-- All other lines go all the way
-				-- with the exception of the final element, which stops halfway down
-				lineGuides["Line_" .. i] = e("Frame", {
-					Size = UDim2.new(0, 2, 1, if props.isFinalElement then -9 else 2),
-					Position = UDim2.new(0, (12 * (i - 1)) + 6, 0, -1),
-					BorderSizePixel = 0,
-					BackgroundTransparency = props.transparency,
-					BackgroundColor3 = theme.BorderedContainer.BorderColor,
-				})
-			end
-		end
-
-		if depth ~= 1 then
-			lineGuides["Connector"] = e("Frame", {
-				Size = UDim2.new(0, 8, 0, 2),
-				Position = UDim2.new(0, 2 + (12 * props.depth), 0, 12),
-				AnchorPoint = Vector2.xAxis,
-				BorderSizePixel = 0,
-				BackgroundTransparency = props.transparency,
-				BackgroundColor3 = theme.BorderedContainer.BorderColor,
-			})
-		end
-
-		return e("Frame", {
-			ClipsDescendants = true,
-			BackgroundTransparency = if props.elementIndex % 2 == 0 then 0.985 else 1,
-			BackgroundColor3 = theme.Diff.Row,
-			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),
-			}),
-			Button = e("TextButton", {
-				BackgroundTransparency = 1,
-				Text = "",
-				Size = UDim2.new(1, 0, 1, 0),
-				[Roact.Event.Activated] = function(_rbx: Instance, _input: InputObject, clickCount: number)
-					if clickCount == 1 then
-						-- Double click opens the instance in explorer
-						self.lastDoubleClickTime = os.clock()
-						if props.instance then
-							SelectionService:Set({ props.instance })
-						end
-					elseif clickCount == 0 then
-						-- Single click expands the changes
-						task.wait(0.25)
-						if os.clock() - (self.lastDoubleClickTime or 0) <= 0.25 then
-							-- This is a double click, so don't expand
-							return
-						end
-
-						if props.changeList then
-							self.expanded = not self.expanded
-							local goalHeight = 24
-								+ (if self.expanded then math.clamp(#props.changeList * 24, 24, 24 * 6) else 0)
-							self.motor:setGoal(Flipper.Spring.new(goalHeight, {
-								frequency = 5,
-								dampingRatio = 1,
-							}))
-						end
-					end
-				end,
-			}, {
-				StateTip = if (props.instance or props.changeList)
-					then e(Tooltip.Trigger, {
-						text = (if props.changeList
-							then "Click to " .. (if self.expanded then "hide" else "view") .. " changes"
-							else "") .. (if props.instance
-							then (if props.changeList then " & d" else "D") .. "ouble click to open in Explorer"
-							else ""),
-					})
-					else nil,
-			}),
-			Expansion = if props.changeList
-				then e(Expansion, {
-					rendered = self.state.renderExpansion,
-					indent = indent,
-					transparency = props.transparency,
-					changeList = props.changeList,
-					showStringDiff = props.showStringDiff,
-					showTableDiff = props.showTableDiff,
-				})
-				else nil,
-			DiffIcon = if props.patchType
-				then e("ImageLabel", {
-					Image = Assets.Images.Diff[props.patchType],
-					ImageColor3 = color,
-					ImageTransparency = props.transparency,
-					BackgroundTransparency = 1,
-					Size = UDim2.new(0, 14, 0, 14),
-					Position = UDim2.new(0, 0, 0, 12),
-					AnchorPoint = Vector2.new(0, 0.5),
-				})
-				else nil,
-			ClassIcon = e(ClassIcon, {
-				className = props.className,
-				color = color,
-				transparency = props.transparency,
-				size = UDim2.new(0, 16, 0, 16),
-				position = UDim2.new(0, indent + 2, 0, 12),
-				anchorPoint = Vector2.new(0, 0.5),
-			}),
-			InstanceName = e("TextLabel", {
-				Text = (if props.isWarning then "⚠ " else "") .. props.name,
-				RichText = true,
-				BackgroundTransparency = 1,
-				FontFace = if props.patchType then theme.Font.Bold else theme.Font.Main,
-				TextSize = theme.TextSize.Body,
-				TextColor3 = color,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-				TextTruncate = Enum.TextTruncate.AtEnd,
-				Size = UDim2.new(1, -indent - 50, 0, 24),
-				Position = UDim2.new(0, indent + 22, 0, 0),
-			}),
-			ChangeInfo = e("Frame", {
-				BackgroundTransparency = 1,
-				Size = UDim2.new(1, -indent - 80, 0, 24),
-				Position = UDim2.new(1, -2, 0, 0),
-				AnchorPoint = Vector2.new(1, 0),
-			}, {
-				Layout = e("UIListLayout", {
-					FillDirection = Enum.FillDirection.Horizontal,
-					HorizontalAlignment = Enum.HorizontalAlignment.Right,
-					VerticalAlignment = Enum.VerticalAlignment.Center,
-					SortOrder = Enum.SortOrder.LayoutOrder,
-					Padding = UDim.new(0, 4),
-				}),
-				Edits = if props.changeInfo and props.changeInfo.edits
-					then e("TextLabel", {
-						Text = props.changeInfo.edits .. if props.changeInfo.failed then "," else "",
-						BackgroundTransparency = 1,
-						FontFace = theme.Font.Thin,
-						TextSize = theme.TextSize.Body,
-						TextColor3 = theme.SubTextColor,
-						TextTransparency = props.transparency,
-						Size = UDim2.new(0, 0, 0, theme.TextSize.Body),
-						AutomaticSize = Enum.AutomaticSize.X,
-						LayoutOrder = 2,
-					})
-					else nil,
-				Failed = if props.changeInfo and props.changeInfo.failed
-					then e("TextLabel", {
-						Text = props.changeInfo.failed,
-						BackgroundTransparency = 1,
-						FontFace = theme.Font.Thin,
-						TextSize = theme.TextSize.Body,
-						TextColor3 = theme.Diff.Warning,
-						TextTransparency = props.transparency,
-						Size = UDim2.new(0, 0, 0, theme.TextSize.Body),
-						AutomaticSize = Enum.AutomaticSize.X,
-						LayoutOrder = 6,
-					})
-					else nil,
-			}),
-			LineGuides = e("Folder", nil, lineGuides),
-		})
-	end)
-end
-
-return DomLabel

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

@@ -1,152 +0,0 @@
-local Rojo = script:FindFirstAncestor("Rojo")
-local Plugin = Rojo.Plugin
-local Packages = Rojo.Packages
-
-local Roact = require(Packages.Roact)
-
-local PatchTree = require(Plugin.PatchTree)
-local PatchSet = require(Plugin.PatchSet)
-
-local Theme = require(Plugin.App.Theme)
-local VirtualScroller = require(Plugin.App.Components.VirtualScroller)
-local BorderedContainer = require(Plugin.App.Components.BorderedContainer)
-
-local e = Roact.createElement
-
-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)
-	if self.props.patchTree ~= nextProps.patchTree then
-		return true
-	end
-
-	local currentPatch, nextPatch = self.props.patch, nextProps.patch
-	if currentPatch ~= nil or nextPatch ~= nil then
-		return not PatchSet.isEqual(currentPatch, nextPatch)
-	end
-
-	return false
-end
-
-function PatchVisualizer:render()
-	local patchTree = self.props.patchTree
-	if patchTree == nil and self.props.patch ~= nil then
-		patchTree = PatchTree.build(
-			self.props.patch,
-			self.props.instanceMap,
-			self.props.changeListHeaders or { "Property", "Current", "Incoming" }
-		)
-		if self.props.unappliedPatch then
-			patchTree =
-				PatchTree.updateMetadata(patchTree, self.props.patch, self.props.instanceMap, self.props.unappliedPatch)
-		end
-	end
-
-	-- Recusively draw tree
-	local scrollElements, elementHeights, elementIndex = {}, {}, 0
-
-	if patchTree then
-		local elementTotal = patchTree:getCount()
-		local depthsComplete = {}
-		local function drawNode(node, depth)
-			elementIndex += 1
-
-			local parentNode = patchTree:getNode(node.parentId)
-			local isFinalChild = true
-			if parentNode then
-				for _id, sibling in parentNode.children do
-					if type(sibling) == "table" and sibling.name and sibling.name > node.name then
-						isFinalChild = false
-						break
-					end
-				end
-			end
-
-			local elementHeight, setElementHeight = Roact.createBinding(24)
-			elementHeights[elementIndex] = elementHeight
-			scrollElements[elementIndex] = e(DomLabel, {
-				transparency = self.props.transparency,
-				showStringDiff = self.props.showStringDiff,
-				showTableDiff = self.props.showTableDiff,
-				updateEvent = self.updateEvent,
-				elementHeight = elementHeight,
-				setElementHeight = setElementHeight,
-				elementIndex = elementIndex,
-				isFinalElement = elementIndex == elementTotal,
-				depth = depth,
-				depthsComplete = table.clone(depthsComplete),
-				hasChildren = (node.children ~= nil and next(node.children) ~= nil),
-				isFinalChild = isFinalChild,
-				patchType = node.patchType,
-				className = node.className,
-				isWarning = node.isWarning,
-				instance = node.instance,
-				name = node.name,
-				changeInfo = node.changeInfo,
-				changeList = node.changeList,
-			})
-
-			if isFinalChild then
-				depthsComplete[depth] = true
-			end
-		end
-
-		patchTree:forEach(function(node, depth)
-			depthsComplete[depth] = false
-			for i = depth + 1, #depthsComplete do
-				depthsComplete[i] = nil
-			end
-
-			drawNode(node, depth)
-		end)
-	end
-
-	return Theme.with(function(theme)
-		return e(BorderedContainer, {
-			transparency = self.props.transparency,
-			size = self.props.size,
-			position = self.props.position,
-			anchorPoint = self.props.anchorPoint,
-			layoutOrder = self.props.layoutOrder,
-		}, {
-			CleanMerge = e("TextLabel", {
-				Visible = #scrollElements == 0,
-				Text = "No changes to sync, project is up to date.",
-				FontFace = theme.Font.Main,
-				TextSize = theme.TextSize.Medium,
-				TextColor3 = theme.TextColor,
-				TextWrapped = true,
-				Size = UDim2.new(1, 0, 1, 0),
-				BackgroundTransparency = 1,
-			}),
-
-			VirtualScroller = e(VirtualScroller, {
-				size = UDim2.new(1, 0, 1, -2),
-				position = UDim2.new(0, 0, 0, 2),
-				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)
-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)
@@ -10,12 +9,6 @@ local bindingUtil = require(Plugin.App.bindingUtil)
 
 local e = Roact.createElement
 
-local scrollDirToAutoSize = {
-	[Enum.ScrollingDirection.X] = Enum.AutomaticSize.X,
-	[Enum.ScrollingDirection.Y] = Enum.AutomaticSize.Y,
-	[Enum.ScrollingDirection.XY] = Enum.AutomaticSize.XY,
-}
-
 local function ScrollingFrame(props)
 	return Theme.with(function(theme)
 		return e("ScrollingFrame", {
@@ -29,33 +22,21 @@ local function ScrollingFrame(props)
 			BottomImage = Assets.Images.ScrollBar.Bottom,
 
 			ElasticBehavior = Enum.ElasticBehavior.Always,
-			ScrollingDirection = props.scrollingDirection or Enum.ScrollingDirection.Y,
+			ScrollingDirection = Enum.ScrollingDirection.Y,
 
 			Size = props.size,
 			Position = props.position,
 			AnchorPoint = props.anchorPoint,
-			CanvasSize = if props.contentSize
-				then props.contentSize:map(function(value)
-					return UDim2.new(
-						0,
-						if (props.scrollingDirection and props.scrollingDirection ~= Enum.ScrollingDirection.Y)
-							then value.X
-							else 0,
-						0,
-						value.Y
-					)
-				end)
-				else UDim2.new(),
-			AutomaticCanvasSize = if props.contentSize == nil
-				then scrollDirToAutoSize[props.scrollingDirection or Enum.ScrollingDirection.XY]
-				else nil,
+			CanvasSize = props.contentSize:map(function(value)
+				return UDim2.new(0, 0, 0, value.Y)
+			end),
 
 			BorderSizePixel = 0,
 			BackgroundTransparency = 1,
 
-			[Roact.Change.AbsoluteSize] = props[Roact.Change.AbsoluteSize],
+			[Roact.Change.AbsoluteSize] = props[Roact.Change.AbsoluteSize]
 		}, props[Roact.Children])
 	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
 
@@ -20,7 +19,6 @@ local function SlicedImage(props)
 		Size = props.size,
 		Position = props.position,
 		AnchorPoint = props.anchorPoint,
-		AutomaticSize = props.automaticSize,
 
 		ZIndex = props.zIndex,
 		LayoutOrder = props.layoutOrder,
@@ -28,4 +26,4 @@ local function SlicedImage(props)
 	}, props[Roact.Children])
 end
 
-return SlicedImage
+return SlicedImage