Add --git-since option to rojo serve

- Add new GitFilter struct for tracking files changed since a Git reference
- Only sync changed (added/deleted/modified) files to Roblox Studio
- Files remain acknowledged once synced, even if content is reverted
- Add enhanced logging for debugging sync issues
- Force acknowledge project structure to prevent 'Cannot sync a model as a place' errors

.dir-locals.el

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

.editorconfig

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

.git-blame-ignore-revs

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

.gitattributes

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

.github/FUNDING.yml

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

.github/workflows/changelog.yml

@@ -0,0 +1,23 @@
+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,23 +12,28 @@ on:
 jobs:
   build:
     name: Build and Test
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
-        rust_version: [stable, 1.57.0]
+        os: [ubuntu-22.04, windows-latest, macos-latest, windows-11-arm, ubuntu-22.04-arm]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@stable
+
+    - name: Restore Rust Cache
+      uses: actions/cache/restore@v4
       with:
-        toolchain: ${{ matrix.rust_version }}
+        path: |
-        override: true
+          ~/.cargo/registry
-        profile: minimal
+          ~/.cargo/git
+          target
+        key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Build
       run: cargo build --locked --verbose
@@ -36,24 +41,93 @@ jobs:
     - name: Test
       run: cargo test --locked --verbose
 
-  lint:
+    - name: Save Rust Cache
-    name: Rustfmt and Clippy
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+  msrv:
+    name: Check MSRV
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@1.88.0
+
+    - name: Restore Rust Cache
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Build
+      run: cargo build --locked --verbose
+
+    - name: Save Rust Cache
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+  lint:
+    name: Rustfmt, Clippy, Stylua, & Selene
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: stable
-        override: true
         components: rustfmt, clippy
 
+    - name: Restore Rust Cache
+      uses: actions/cache/restore@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+    - name: Setup Rokit
+      uses: CompeyDev/setup-rokit@v0.1.2
+      with:
+        version: 'v1.1.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
+
+    - name: Save Rust Cache
+      uses: actions/cache/save@v4
+      with:
+        path: |
+          ~/.cargo/registry
+          ~/.cargo/git
+          target
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

.github/workflows/release.yml

@@ -8,49 +8,39 @@ 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 }}
-        with:
+        run: |
-          tag_name: ${{ github.ref }}
+          gh release create ${{ github.ref_name }} --draft --verify-tag --title ${{ github.ref_name }}
-          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@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: Setup Foreman
+      - name: Setup Rokit
-        uses: Roblox/setup-foreman@v1
+        uses: CompeyDev/setup-rokit@v0.1.2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          version: 'v1.1.0'
 
       - name: Build Plugin
-        run: rojo build plugin --output Rojo.rbxm
+        run: rojo build plugin.project.json --output Rojo.rbxm
 
       - name: Upload Plugin to Release
-        uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
+        run: |
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
+          gh release upload ${{ github.ref_name }} Rojo.rbxm
-          asset_path: Rojo.rbxm
-          asset_name: Rojo.rbxm
-          asset_content_type: application/octet-stream
 
       - name: Upload Plugin to Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Rojo.rbxm
           path: Rojo.rbxm
@@ -61,25 +51,31 @@ 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-18.04
+            os: ubuntu-22.04
             target: x86_64-unknown-linux-gnu
-            label: linux
+            label: linux-x86_64
+
+          - host: linux
+            os: ubuntu-22.04-arm
+            target: aarch64-unknown-linux-gnu
+            label: linux-aarch64
 
           - host: windows
             os: windows-latest
             target: x86_64-pc-windows-msvc
-            label: win64
+            label: windows-x86_64
+
+          - host: windows
+            os: windows-11-arm
+            target: aarch64-pc-windows-msvc
+            label: windows-aarch64
 
           - host: macos
             os: macos-latest
             target: x86_64-apple-darwin
-            label: macos
+            label: macos-x86_64
 
           - host: macos
             os: macos-latest
@@ -91,63 +87,64 @@ jobs:
     env:
       BIN: rojo
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - 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: Install Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
+          targets: ${{ matrix.target }}
-          target: ${{ matrix.target }}
+
-          override: true
+      - name: Restore Rust Cache
-          profile: minimal
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Build Release
-        run: cargo build --release --locked --verbose
+        run: cargo build --release --locked --verbose --target ${{ matrix.target }}
-        env:
-          # Build into a known directory so we can find our build artifact more
-          # easily.
-          CARGO_TARGET_DIR: output
 
-          # On platforms that use OpenSSL, ensure it is statically linked to
+      - name: Save Rust Cache
-          # make binaries more portable.
+        uses: actions/cache/save@v4
-          OPENSSL_STATIC: 1
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ matrix.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Create Release Archive
+      - 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"
+
+      - name: Create Archive and Upload to Release
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           mkdir staging
 
           if [ "${{ matrix.host }}" = "windows" ]; then
-            cp "output/release/$BIN.exe" staging/
+            cp "target/${{ matrix.target }}/release/$BIN.exe" staging/
             cd staging
-            7z a ../release.zip *
+            7z a ../$ARTIFACT_NAME *
           else
-            cp "output/release/$BIN" staging/
+            cp "target/${{ matrix.target }}/release/$BIN" staging/
             cd staging
-            zip ../release.zip *
+            zip ../$ARTIFACT_NAME *
           fi
 
-      - name: Upload Archive to Release
+          gh release upload ${{ github.ref_name }} ../$ARTIFACT_NAME
-        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@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.BIN }}-${{ env.PROJECT_VERSION }}-${{ matrix.label }}.zip
+          path: ${{ env.ARTIFACT_NAME }}
-          path: release.zip
+          name: ${{ env.ARTIFACT_NAME }}

.gitignore

@@ -10,8 +10,8 @@
 /*.rbxl
 /*.rbxlx
 
-# Test places for the Roblox Studio Plugin
+# Sourcemap for the Rojo plugin (for better intellisense)
-/plugin/*.rbxlx
+/sourcemap.json
 
 # Roblox Studio holds 'lock' files on places
 *.rbxl.lock
@@ -19,3 +19,7 @@
 
 # Snapshot files from the 'insta' Rust crate
 **/*.snap.new
+
+# Macos file system junk
+._*
+.DS_STORE

.gitmodules

@@ -1,15 +1,18 @@
-[submodule "plugin/modules/roact"]
+[submodule "plugin/Packages/Roact"]
-	path = plugin/modules/roact
+	path = plugin/Packages/Roact
-	url = https://github.com/Roblox/roact.git
+	url = https://github.com/roblox/roact.git
-[submodule "plugin/modules/testez"]
+[submodule "plugin/Packages/Flipper"]
-	path = plugin/modules/testez
+	path = plugin/Packages/Flipper
-	url = https://github.com/Roblox/testez.git
+	url = https://github.com/reselim/flipper.git
-[submodule "plugin/modules/promise"]
+[submodule "plugin/Packages/Promise"]
-	path = plugin/modules/promise
+	path = plugin/Packages/Promise
-	url = https://github.com/LPGhatguy/roblox-lua-promise.git
+	url = https://github.com/evaera/roblox-lua-promise.git
-[submodule "plugin/modules/t"]
+[submodule "plugin/Packages/t"]
-	path = plugin/modules/t
+	path = plugin/Packages/t
 	url = https://github.com/osyrisrblx/t.git
-[submodule "plugin/modules/flipper"]
+[submodule "plugin/Packages/TestEZ"]
-	path = plugin/modules/flipper
+	path = plugin/Packages/TestEZ
-	url = https://github.com/Reselim/Flipper
+	url = https://github.com/roblox/testez.git
+[submodule "plugin/Packages/Highlighter"]
+	path = plugin/Packages/Highlighter
+	url = https://github.com/boatbomber/highlighter.git

.vscode/extensions.json

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

.vscode/settings.json

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

CONTRIBUTING.md

@@ -15,12 +15,29 @@ 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)
+* [Rokit](https://github.com/rojo-rbx/rokit)
+* [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.
 
-If you find any problems in documentation, including typos, bad grammar, misleading phrasing, or missing content, feel free to file issues and pull requests to fix them.
+If you find any problems in the documentation, including typos, bad grammar, misleading phrasing, or missing content, feel free to file issues and pull requests to fix them.
 
 ## Bug Reports and Feature Requests
 Most of the tools around Rojo try to be clear when an issue is a bug. Even if they aren't, sometimes things don't work quite right.

Cargo.toml

@@ -1,8 +1,12 @@
 [package]
 name = "rojo"
-version = "7.2.0"
+version = "7.7.0-rc.1"
-rust-version = "1.57.0"
+rust-version = "1.88"
-authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+authors = [
+    "Lucien Greathouse <me@lpghatguy.com>",
+    "Micah Reid <git@dekkonot.com>",
+    "Ken Loeffler <kenloef@gmail.com>",
+]
 description = "Enables professional-grade development tools for Roblox developers"
 license = "MPL-2.0"
 homepage = "https://rojo.space"
@@ -12,9 +16,7 @@ readme = "README.md"
 edition = "2021"
 build = "build.rs"
 
-exclude = [
+exclude = ["/test-projects/**"]
-    "/test-projects/**",
-]
 
 [profile.dev]
 panic = "abort"
@@ -28,7 +30,9 @@ default = []
 # Enable this feature to live-reload assets from the web UI.
 dev_live_assets = []
 
-profile-with-tracy = ["profiling/profile-with-tracy", "tracy-client"]
+# 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"]
 
 [workspace]
 members = ["crates/*"]
@@ -42,69 +46,85 @@ name = "build"
 harness = false
 
 [dependencies]
-memofs = { version = "0.2.0", path = "crates/memofs" }
+memofs = { version = "0.3.1", path = "crates/memofs" }
 
 # These dependencies can be uncommented when working on rbx-dom simultaneously
-# rbx_binary = { path = "../rbx-dom/rbx_binary" }
+# rbx_binary = { path = "../rbx-dom/rbx_binary", features = [
+#     "unstable_text_format",
+# ] }
 # rbx_dom_weak = { path = "../rbx-dom/rbx_dom_weak" }
 # rbx_reflection = { path = "../rbx-dom/rbx_reflection" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "0.6.5"
+rbx_binary = { version = "2.0.1", features = ["unstable_text_format"] }
-rbx_dom_weak = "2.4.0"
+rbx_dom_weak = "4.1.0"
-rbx_reflection = "4.2.0"
+rbx_reflection = "6.1.0"
-rbx_reflection_database = "0.2.2"
+rbx_reflection_database = "2.0.2"
-rbx_xml = "0.12.3"
+rbx_xml = "2.0.1"
 
-anyhow = "1.0.44"
+anyhow = "1.0.80"
-backtrace = "0.3.61"
+backtrace = "0.3.69"
 bincode = "1.3.3"
-crossbeam-channel = "0.5.1"
+crossbeam-channel = "0.5.12"
-csv = "1.1.6"
+csv = "1.3.0"
-env_logger = "0.9.0"
+env_logger = "0.9.3"
-fs-err = "2.6.0"
+fs-err = "2.11.0"
-futures = "0.3.17"
+futures = "0.3.30"
-globset = "0.4.8"
+globset = "0.4.14"
 humantime = "2.1.0"
-hyper = { version = "0.14.13", features = ["server", "tcp", "http1"] }
+hyper = { version = "0.14.28", features = ["server", "tcp", "http1"] }
+hyper-tungstenite = "0.11.0"
 jod-thread = "0.1.2"
-log = "0.4.14"
+log = "0.4.21"
-maplit = "1.0.2"
+num_cpus = "1.16.0"
-notify = "4.0.17"
+opener = "0.5.2"
-opener = "0.5.0"
+rayon = "1.9.0"
-reqwest = { version = "0.11.10", features = ["blocking", "json"] }
+reqwest = { version = "0.11.24", default-features = false, features = [
+    "blocking",
+    "json",
+    "rustls-tls",
+] }
 ritz = "0.1.0"
 roblox_install = "1.0.0"
-serde = { version = "1.0.130", features = ["derive", "rc"] }
+serde = { version = "1.0.197", features = ["derive", "rc"] }
-serde_json = "1.0.68"
+serde_json = "1.0.145"
-termcolor = "1.1.2"
+jsonc-parser = { version = "0.27.0", features = ["serde"] }
-thiserror = "1.0.30"
+strum = { version = "0.27", features = ["derive"] }
-tokio = { version = "1.12.0", features = ["rt", "rt-multi-thread"] }
+toml = "0.5.11"
-uuid = { version = "1.0.0", features = ["v4", "serde"] }
+termcolor = "1.4.1"
-clap = { version = "3.1.18", features = ["derive"] }
+thiserror = "1.0.57"
-profiling = "1.0.6"
+tokio = { version = "1.36.0", features = ["rt", "rt-multi-thread", "macros"] }
-tracy-client = { version = "0.13.2", optional = true }
+uuid = { version = "1.7.0", features = ["v4", "serde"] }
+clap = { version = "3.2.25", features = ["derive"] }
+profiling = "1.0.15"
+yaml-rust2 = "0.10.3"
+data-encoding = "2.8.0"
+
+blake3 = "1.5.0"
+float-cmp = "0.9.0"
+indexmap = { version = "2.10.0", features = ["serde"] }
 
 [target.'cfg(windows)'.dependencies]
 winreg = "0.10.1"
 
 [build-dependencies]
-memofs = { version = "0.2.0", path = "crates/memofs" }
+memofs = { version = "0.3.0", path = "crates/memofs" }
 
-embed-resource = "1.6.4"
+embed-resource = "1.8.0"
-anyhow = "1.0.44"
+anyhow = "1.0.80"
 bincode = "1.3.3"
-fs-err = "2.6.0"
+fs-err = "2.11.0"
 maplit = "1.0.2"
+semver = "1.0.22"
 
 [dev-dependencies]
 rojo-insta-ext = { path = "crates/rojo-insta-ext" }
 
-criterion = "0.3.5"
+criterion = "0.3.6"
-insta = { version = "1.8.0", features = ["redactions"] }
+insta = { version = "1.36.1", features = ["redactions", "yaml"] }
-paste = "1.0.5"
+paste = "1.0.14"
-pretty_assertions = "1.2.1"
+pretty_assertions = "1.4.0"
-serde_yaml = "0.8.21"
+serde_yaml = "0.8.26"
-tempfile = "3.2.0"
+tempfile = "3.10.1"
-walkdir = "2.3.2"
+walkdir = "2.5.0"

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <a href="https://rojo.space"><img src="assets/logo-512.png" alt="Rojo" height="217" /></a>
+    <a href="https://rojo.space"><img src="assets/brand_images/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.57.0 and newer. The minimum supported version of Rust is based on the latest versions of the dependencies that Rojo has.
+Rojo supports Rust 1.88 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.

assets/index.css

@@ -17,6 +17,10 @@ html {
   line-height: 1.4;
 }
 
+body {
+  background-color: #e7e7e7
+}
+
 img {
   max-width:100%;
   max-height:100%;

assets/project-templates/model/README.md

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

assets/project-templates/model/gitignore.txt

@@ -1,3 +1,5 @@
 # Roblox Studio lock files
 /*.rbxlx.lock
-/*.rbxl.lock
+/*.rbxl.lock
+
+sourcemap.json

assets/project-templates/model/src/init.luau

@@ -2,4 +2,4 @@ return {
 	hello = function()
 		print("Hello world, from {project_name}!")
 	end,
-}
+}

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

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

assets/project-templates/place/gitignore.txt

@@ -3,4 +3,6 @@
 
 # Roblox Studio lock files
 /*.rbxlx.lock
-/*.rbxl.lock
+/*.rbxl.lock
+
+sourcemap.json

assets/project-templates/place/src/client/init.client.luau

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

assets/project-templates/place/src/server/init.server.luau

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

assets/project-templates/place/src/shared/Hello.luau

@@ -0,0 +1,3 @@
+return function()
+	print("Hello, world!")
+end

assets/project-templates/plugin/README.md

@@ -0,0 +1,17 @@
+# {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/project-templates/plugin/default.project.json

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

assets/project-templates/plugin/gitignore.txt

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

assets/project-templates/plugin/src/init.server.luau

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

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::{build, BuildCommand};
+use librojo::cli::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)| build(options).unwrap(),
+            |(_dir, options)| options.run().unwrap(),
             BatchSize::SmallInput,
         )
     });
@@ -31,11 +31,12 @@ 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 = dir.path().join("output.rbxlx");
+    let output = Some(dir.path().join("output.rbxlx"));
 
     let options = BuildCommand {
         project: input,
         watch: false,
+        plugin: None,
         output,
     };
 

build.rs

@@ -7,6 +7,7 @@ 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());
@@ -19,6 +20,10 @@ 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") {
@@ -40,38 +45,39 @@ 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 = env::var_os("CARGO_MANIFEST_DIR").unwrap();
+    let root_dir = PathBuf::from(env::var_os("CARGO_MANIFEST_DIR").unwrap());
-    let plugin_root = PathBuf::from(root_dir).join("plugin");
+    let plugin_dir = root_dir.join("plugin");
+    let templates_dir = root_dir.join("assets").join("project-templates");
 
-    let plugin_modules = plugin_root.join("modules");
+    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())?;
 
-    let snapshot = VfsSnapshot::dir(hashmap! {
+    assert_eq!(
-        "default.project.json" => snapshot_from_fs_path(&plugin_root.join("default.project.json"))?,
+        our_version, plugin_version,
-        "fmt" => snapshot_from_fs_path(&plugin_root.join("fmt"))?,
+        "plugin version does not match Cargo version"
-        "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"))?,
+    let template_snapshot = snapshot_from_fs_path(&templates_dir)?;
-        "src" => snapshot_from_fs_path(&plugin_root.join("src"))?,
+
-        "modules" => VfsSnapshot::dir(hashmap! {
+    let plugin_snapshot = VfsSnapshot::dir(hashmap! {
-            "roact" => VfsSnapshot::dir(hashmap! {
+        "default.project.json" => snapshot_from_fs_path(&root_dir.join("plugin.project.json"))?,
-                "src" => snapshot_from_fs_path(&plugin_modules.join("roact").join("src"))?
+        "plugin" => VfsSnapshot::dir(hashmap! {
-            }),
+            "fmt" => snapshot_from_fs_path(&plugin_dir.join("fmt"))?,
-            "promise" => VfsSnapshot::dir(hashmap! {
+            "http" => snapshot_from_fs_path(&plugin_dir.join("http"))?,
-                "lib" => snapshot_from_fs_path(&plugin_modules.join("promise").join("lib"))?
+            "log" => snapshot_from_fs_path(&plugin_dir.join("log"))?,
-            }),
+            "rbx_dom_lua" => snapshot_from_fs_path(&plugin_dir.join("rbx_dom_lua"))?,
-            "t" => VfsSnapshot::dir(hashmap! {
+            "src" => snapshot_from_fs_path(&plugin_dir.join("src"))?,
-                "lib" => snapshot_from_fs_path(&plugin_modules.join("t").join("lib"))?
+            "Packages" => snapshot_from_fs_path(&plugin_dir.join("Packages"))?,
-            }),
+            "Version.txt" => snapshot_from_fs_path(&plugin_dir.join("Version.txt"))?,
-            "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 template_file = File::create(Path::new(&out_dir).join("templates.bincode"))?;
-    let out_file = File::create(&out_path)?;
+    let plugin_file = File::create(Path::new(&out_dir).join("plugin.bincode"))?;
 
-    bincode::serialize_into(out_file, &snapshot)?;
+    bincode::serialize_into(plugin_file, &plugin_snapshot)?;
+    bincode::serialize_into(template_file, &template_snapshot)?;
 
     println!("cargo:rerun-if-changed=build/windows/rojo-manifest.rc");
     println!("cargo:rerun-if-changed=build/windows/rojo.manifest");

crates/memofs/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased Changes
 
+## 0.3.1 (2025-11-27)
+* Added `Vfs::exists`. [#1169]
+* Added `create_dir` and `create_dir_all` to allow creating directories. [#937]
+
+[#1169]: https://github.com/rojo-rbx/rojo/pull/1169
+[#937]: https://github.com/rojo-rbx/rojo/pull/937
+
+## 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.
 
@@ -15,4 +29,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,8 +1,12 @@
 [package]
 name = "memofs"
 description = "Virtual filesystem with configurable backends."
-version = "0.2.0"
+version = "0.3.1"
-authors = ["Lucien Greathouse <me@lpghatguy.com>"]
+authors = [
+    "Lucien Greathouse <me@lpghatguy.com>",
+    "Micah Reid <git@dekkonot.com>",
+    "Ken Loeffler <kenloef@gmail.com>",
+]
 edition = "2018"
 readme = "README.md"
 license = "MIT"
@@ -11,7 +15,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.1"
+crossbeam-channel = "0.5.12"
-fs-err = "2.3.0"
+fs-err = "2.11.0"
-notify = "4.0.15"
+notify = "4.0.17"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.197", features = ["derive"] }

crates/memofs/src/in_memory_fs.rs

@@ -50,6 +50,12 @@ impl InMemoryFs {
     }
 }
 
+impl Default for InMemoryFs {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 #[derive(Debug)]
 struct InMemoryFsInner {
     entries: HashMap<PathBuf, Entry>,
@@ -151,6 +157,11 @@ impl VfsBackend for InMemoryFs {
         )
     }
 
+    fn exists(&mut self, path: &Path) -> io::Result<bool> {
+        let inner = self.inner.lock().unwrap();
+        Ok(inner.entries.contains_key(path))
+    }
+
     fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir> {
         let inner = self.inner.lock().unwrap();
 
@@ -170,6 +181,21 @@ impl VfsBackend for InMemoryFs {
         }
     }
 
+    fn create_dir(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        inner.load_snapshot(path.to_path_buf(), VfsSnapshot::empty_dir())
+    }
+
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        let mut inner = self.inner.lock().unwrap();
+        let mut path_buf = path.to_path_buf();
+        while let Some(parent) = path_buf.parent() {
+            inner.load_snapshot(parent.to_path_buf(), VfsSnapshot::empty_dir())?;
+            path_buf.pop();
+        }
+        inner.load_snapshot(path.to_path_buf(), VfsSnapshot::empty_dir())
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         let mut inner = self.inner.lock().unwrap();
 
@@ -222,23 +248,17 @@ impl VfsBackend for InMemoryFs {
 }
 
 fn must_be_file<T>(path: &Path) -> io::Result<T> {
-    Err(io::Error::new(
+    Err(io::Error::other(format!(
-        io::ErrorKind::Other,
+        "path {} was a directory, but must be a file",
-        format!(
+        path.display()
-            "path {} was a directory, but must be a file",
+    )))
-            path.display()
-        ),
-    ))
 }
 
 fn must_be_dir<T>(path: &Path) -> io::Result<T> {
-    Err(io::Error::new(
+    Err(io::Error::other(format!(
-        io::ErrorKind::Other,
+        "path {} was a file, but must be a directory",
-        format!(
+        path.display()
-            "path {} was a file, but must be a directory",
+    )))
-            path.display()
-        ),
-    ))
 }
 
 fn not_found<T>(path: &Path) -> io::Result<T> {

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;
@@ -70,7 +70,10 @@ impl<T> IoResultExt<T> for io::Result<T> {
 pub trait VfsBackend: sealed::Sealed + Send + 'static {
     fn read(&mut self, path: &Path) -> io::Result<Vec<u8>>;
     fn write(&mut self, path: &Path, data: &[u8]) -> io::Result<()>;
+    fn exists(&mut self, path: &Path) -> io::Result<bool>;
     fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir>;
+    fn create_dir(&mut self, path: &Path) -> io::Result<()>;
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()>;
     fn metadata(&mut self, path: &Path) -> io::Result<Metadata>;
     fn remove_file(&mut self, path: &Path) -> io::Result<()>;
     fn remove_dir_all(&mut self, path: &Path) -> io::Result<()>;
@@ -155,6 +158,29 @@ 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 exists<P: AsRef<Path>>(&mut self, path: P) -> io::Result<bool> {
+        let path = path.as_ref();
+        self.backend.exists(path)
+    }
+
     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();
@@ -172,6 +198,16 @@ impl VfsInner {
         Ok(dir)
     }
 
+    fn create_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.backend.create_dir(path)
+    }
+
+    fn create_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.backend.create_dir_all(path)
+    }
+
     fn remove_file<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
         let path = path.as_ref();
         let _ = self.backend.unwatch(path);
@@ -194,11 +230,8 @@ impl VfsInner {
     }
 
     fn commit_event(&mut self, event: &VfsEvent) -> io::Result<()> {
-        match event {
+        if let VfsEvent::Remove(path) = event {
-            VfsEvent::Remove(path) => {
+            let _ = self.backend.unwatch(path);
-                let _ = self.backend.unwatch(&path);
-            }
-            _ => {}
         }
 
         Ok(())
@@ -261,6 +294,33 @@ 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].
@@ -284,6 +344,42 @@ impl Vfs {
         self.inner.lock().unwrap().read_dir(path)
     }
 
+    /// Return whether the given path exists.
+    ///
+    /// Roughly equivalent to [`std::fs::exists`][std::fs::exists].
+    ///
+    /// [std::fs::exists]: https://doc.rust-lang.org/stable/std/fs/fn.exists.html
+    #[inline]
+    pub fn exists<P: AsRef<Path>>(&self, path: P) -> io::Result<bool> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().exists(path)
+    }
+
+    /// Creates a directory at the provided location.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir`][std::fs::create_dir].
+    /// Similiar to that function, this function will fail if the parent of the
+    /// path does not exist.
+    ///
+    /// [std::fs::create_dir]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir.html
+    #[inline]
+    pub fn create_dir<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().create_dir(path)
+    }
+
+    /// Creates a directory at the provided location, recursively creating
+    /// all parent components if they are missing.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir_all`][std::fs::create_dir_all].
+    ///
+    /// [std::fs::create_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir_all.html
+    #[inline]
+    pub fn create_dir_all<P: AsRef<Path>>(&self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.lock().unwrap().create_dir_all(path)
+    }
+
     /// Remove a file.
     ///
     /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
@@ -386,6 +482,31 @@ impl VfsLock<'_> {
         self.inner.read_dir(path)
     }
 
+    /// Creates a directory at the provided location.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir`][std::fs::create_dir].
+    /// Similiar to that function, this function will fail if the parent of the
+    /// path does not exist.
+    ///
+    /// [std::fs::create_dir]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir.html
+    #[inline]
+    pub fn create_dir<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.create_dir(path)
+    }
+
+    /// Creates a directory at the provided location, recursively creating
+    /// all parent components if they are missing.
+    ///
+    /// Roughly equivalent to [`std::fs::create_dir_all`][std::fs::create_dir_all].
+    ///
+    /// [std::fs::create_dir_all]: https://doc.rust-lang.org/stable/std/fs/fn.create_dir_all.html
+    #[inline]
+    pub fn create_dir_all<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
+        let path = path.as_ref();
+        self.inner.create_dir_all(path)
+    }
+
     /// Remove a file.
     ///
     /// Roughly equivalent to [`std::fs::remove_file`][std::fs::remove_file].
@@ -431,3 +552,23 @@ 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

@@ -15,45 +15,39 @@ impl NoopBackend {
 
 impl VfsBackend for NoopBackend {
     fn read(&mut self, _path: &Path) -> io::Result<Vec<u8>> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
-            "NoopBackend doesn't do anything",
-        ))
     }
 
     fn write(&mut self, _path: &Path, _data: &[u8]) -> io::Result<()> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
+    }
-            "NoopBackend doesn't do anything",
+
-        ))
+    fn exists(&mut self, _path: &Path) -> io::Result<bool> {
+        Err(io::Error::other("NoopBackend doesn't do anything"))
     }
 
     fn read_dir(&mut self, _path: &Path) -> io::Result<ReadDir> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
+    }
-            "NoopBackend doesn't do anything",
+
-        ))
+    fn create_dir(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::other("NoopBackend doesn't do anything"))
+    }
+
+    fn create_dir_all(&mut self, _path: &Path) -> io::Result<()> {
+        Err(io::Error::other("NoopBackend doesn't do anything"))
     }
 
     fn remove_file(&mut self, _path: &Path) -> io::Result<()> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
-            "NoopBackend doesn't do anything",
-        ))
     }
 
     fn remove_dir_all(&mut self, _path: &Path) -> io::Result<()> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
-            "NoopBackend doesn't do anything",
-        ))
     }
 
     fn metadata(&mut self, _path: &Path) -> io::Result<Metadata> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
-            "NoopBackend doesn't do anything",
-        ))
     }
 
     fn event_receiver(&self) -> crossbeam_channel::Receiver<VfsEvent> {
@@ -61,16 +55,16 @@ impl VfsBackend for NoopBackend {
     }
 
     fn watch(&mut self, _path: &Path) -> io::Result<()> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
-            "NoopBackend doesn't do anything",
-        ))
     }
 
     fn unwatch(&mut self, _path: &Path) -> io::Result<()> {
-        Err(io::Error::new(
+        Err(io::Error::other("NoopBackend doesn't do anything"))
-            io::ErrorKind::Other,
+    }
-            "NoopBackend doesn't do anything",
+}
-        ))
+
+impl Default for NoopBackend {
+    fn default() -> Self {
+        Self::new()
     }
 }

crates/memofs/src/std_backend.rs

@@ -1,8 +1,8 @@
-use std::io;
+use std::path::{Path, PathBuf};
-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,6 +13,7 @@ use crate::{DirEntry, Metadata, ReadDir, VfsBackend, VfsEvent};
 pub struct StdBackend {
     watcher: RecommendedWatcher,
     watcher_receiver: Receiver<VfsEvent>,
+    watches: HashSet<PathBuf>,
 }
 
 impl StdBackend {
@@ -48,6 +49,7 @@ impl StdBackend {
         Self {
             watcher,
             watcher_receiver: rx,
+            watches: HashSet::new(),
         }
     }
 }
@@ -61,6 +63,10 @@ impl VfsBackend for StdBackend {
         fs_err::write(path, data)
     }
 
+    fn exists(&mut self, path: &Path) -> io::Result<bool> {
+        std::fs::exists(path)
+    }
+
     fn read_dir(&mut self, path: &Path) -> io::Result<ReadDir> {
         let entries: Result<Vec<_>, _> = fs_err::read_dir(path)?.collect();
         let mut entries = entries?;
@@ -76,6 +82,14 @@ impl VfsBackend for StdBackend {
         })
     }
 
+    fn create_dir(&mut self, path: &Path) -> io::Result<()> {
+        fs_err::create_dir(path)
+    }
+
+    fn create_dir_all(&mut self, path: &Path) -> io::Result<()> {
+        fs_err::create_dir_all(path)
+    }
+
     fn remove_file(&mut self, path: &Path) -> io::Result<()> {
         fs_err::remove_file(path)
     }
@@ -97,14 +111,28 @@ impl VfsBackend for StdBackend {
     }
 
     fn watch(&mut self, path: &Path) -> io::Result<()> {
-        self.watcher
+        if self.watches.contains(path)
-            .watch(path, RecursiveMode::NonRecursive)
+            || path
-            .map_err(|inner| io::Error::new(io::ErrorKind::Other, inner))
+                .ancestors()
+                .any(|ancestor| self.watches.contains(ancestor))
+        {
+            Ok(())
+        } else {
+            self.watches.insert(path.to_path_buf());
+            self.watcher
+                .watch(path, RecursiveMode::Recursive)
+                .map_err(io::Error::other)
+        }
     }
 
     fn unwatch(&mut self, path: &Path) -> io::Result<()> {
-        self.watcher
+        self.watches.remove(path);
-            .unwatch(path)
+        self.watcher.unwatch(path).map_err(io::Error::other)
-            .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.99"
+serde = "1.0.197"
-serde_yaml = "0.8.9"
+serde_yaml = "0.8.26"

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

@@ -5,19 +5,13 @@ 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();
 
@@ -28,6 +22,12 @@ impl RedactionMap {
         }
     }
 
+    /// Returns the numeric ID that was assigned to the provided value,
+    /// if one exists.
+    pub fn get_id_for_value(&self, value: impl ToString) -> Option<usize> {
+        self.ids.get(&value.to_string()).cloned()
+    }
+
     pub fn intern(&mut self, id: impl ToString) {
         let last_id = &mut self.last_id;
 

foreman.toml

@@ -1,4 +0,0 @@
-[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.18.2" }

plugin.project.json

@@ -0,0 +1,27 @@
+{
+  "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

@@ -0,0 +1 @@
+7.7.0-rc.1

plugin/default.project.json

@@ -1,33 +0,0 @@
-{
-  "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

@@ -25,7 +25,7 @@
 local function defaultTableDebug(buffer, input)
 	buffer:writeRaw("{")
 
-	for key, value in pairs(input) do
+	for key, value in input do
 		buffer:write("[{:?}] = {:?}", key, value)
 
 		if next(input, key) ~= nil then
@@ -50,7 +50,7 @@ local function defaultTableDebugExtended(buffer, input)
 	buffer:writeLineRaw("{")
 	buffer:indent()
 
-	for key, value in pairs(input) do
+	for key, value in input do
 		buffer:writeLine("[{:?}] = {:#?},", key, value)
 	end
 
@@ -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" ..
+		message = "Rojo requires HTTP access, which is not enabled.\n"
-			"Check your game settings, located in the 'Home' tab of Studio.",
+			.. "Check your game settings, located in the 'Home' tab of Studio.",
 	},
 	ConnectFailed = {
-		message = "Couldn't connect to the Rojo server.\n" ..
+		message = "Couldn't connect to the Rojo server.\n"
-			"Make sure the server is running — use 'rojo serve' to run it!",
+			.. "Make sure the server is running — use 'rojo serve' to run it!",
 	},
 	Timeout = {
 		message = "HTTP request timed out.",
@@ -63,4 +63,13 @@ 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,8 +30,13 @@ local function performRequest(requestParams)
 			end)
 
 			if success then
-				Log.trace("Request {} success, status code {}", requestId, response.StatusCode)
+				Log.trace("Request {} success, response {:#?}", requestId, response)
-				resolve(HttpResponse.fromRobloxResponse(response))
+				local httpResponse = HttpResponse.fromRobloxResponse(response)
+				if httpResponse:isSuccess() then
+					resolve(httpResponse)
+				else
+					reject(HttpError.fromResponse(httpResponse))
+				end
 			else
 				Log.trace("Request {} failure: {:?}", requestId, response)
 				reject(HttpError.fromRobloxErrorString(response))
@@ -63,4 +68,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,8 +20,8 @@ local function serializeFloat(value)
 	return value
 end
 
-local ALL_AXES = {"X", "Y", "Z"}
+local ALL_AXES = { "X", "Y", "Z" }
-local ALL_FACES = {"Right", "Top", "Back", "Left", "Bottom", "Front"}
+local ALL_FACES = { "Right", "Top", "Back", "Left", "Bottom", "Front" }
 
 local EncodedValue = {}
 
@@ -37,7 +37,10 @@ types = {
 				if ok then
 					output[key] = result
 				else
-					local warning = ("Could not decode attribute value of type %q: %s"):format(typeof(value), tostring(result))
+					local warning = ("Could not decode attribute value of type %q: %s"):format(
+						typeof(value),
+						tostring(result)
+					)
 					warn(warning)
 				end
 			end
@@ -53,7 +56,10 @@ types = {
 				if ok then
 					output[key] = result
 				else
-					local warning = ("Could not encode attribute value of type %q: %s"):format(typeof(value), tostring(result))
+					local warning = ("Could not encode attribute value of type %q: %s"):format(
+						typeof(value),
+						tostring(result)
+					)
 					warn(warning)
 				end
 			end
@@ -111,6 +117,7 @@ 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],
@@ -120,17 +127,14 @@ types = {
 		end,
 
 		toPod = function(roblox)
-			local x, y, z,
+			local x, y, z, r00, r01, r02, r10, r11, r12, r20, r21, r22 = roblox:GetComponents()
-				r00, r01, r02,
-				r10, r11, r12,
-				r20, r21, r22 = roblox:GetComponents()
 
 			return {
-				position = {x, y, z},
+				position = { x, y, z },
 				orientation = {
-					{r00, r01, r02},
+					{ r00, r01, r02 },
-					{r10, r11, r12},
+					{ r10, r11, r12 },
-					{r20, r21, r22},
+					{ r20, r21, r22 },
 				},
 			}
 		end,
@@ -140,7 +144,7 @@ types = {
 		fromPod = unpackDecoder(Color3.new),
 
 		toPod = function(roblox)
-			return {roblox.r, roblox.g, roblox.b}
+			return { roblox.r, roblox.g, roblox.b }
 		end,
 	},
 
@@ -161,10 +165,7 @@ types = {
 			local keypoints = {}
 
 			for index, keypoint in ipairs(pod.keypoints) do
-				keypoints[index] = ColorSequenceKeypoint.new(
+				keypoints[index] = ColorSequenceKeypoint.new(keypoint.time, types.Color3.fromPod(keypoint.color))
-					keypoint.time,
-					types.Color3.fromPod(keypoint.color)
-				)
 			end
 
 			return ColorSequence.new(keypoints)
@@ -187,6 +188,38 @@ 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,
 	},
@@ -204,6 +237,19 @@ 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 = {}
@@ -238,6 +284,23 @@ 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,
@@ -248,11 +311,32 @@ 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,
 	},
 
@@ -261,11 +345,12 @@ types = {
 			local keypoints = {}
 
 			for index, keypoint in ipairs(pod.keypoints) do
-				keypoints[index] = NumberSequenceKeypoint.new(
+				-- TODO: Add a test for NaN or Infinity values and envelopes
-					keypoint.time,
+				-- Right now it isn't possible because it'd fail the roundtrip.
-					keypoint.value,
+				-- It's more important that it works right now, though.
-					keypoint.envelope
+				local value = keypoint.value or 0
-				)
+				local envelope = keypoint.envelope or 0
+				keypoints[index] = NumberSequenceKeypoint.new(keypoint.time, value, envelope)
 			end
 
 			return NumberSequence.new(keypoints)
@@ -293,13 +378,26 @@ types = {
 			if pod == "Default" then
 				return nil
 			else
-				return PhysicalProperties.new(
+				-- Passing `nil` instead of not passing anything gives
-					pod.density,
+				-- different results, so we have to branch here.
-					pod.friction,
+				if pod.acousticAbsorption then
-					pod.elasticity,
+					return (PhysicalProperties.new :: any)(
-					pod.frictionWeight,
+						pod.density,
-					pod.elasticityWeight
+						pod.friction,
-				)
+						pod.elasticity,
+						pod.frictionWeight,
+						pod.elasticityWeight,
+						pod.acousticAbsorption
+					)
+				else
+					return PhysicalProperties.new(
+						pod.density,
+						pod.friction,
+						pod.elasticity,
+						pod.frictionWeight,
+						pod.elasticityWeight
+					)
+				end
 			end
 		end,
 
@@ -313,6 +411,7 @@ types = {
 					elasticity = roblox.Elasticity,
 					frictionWeight = roblox.FrictionWeight,
 					elasticityWeight = roblox.ElasticityWeight,
+					acousticAbsorption = roblox.AcousticAbsorption,
 				}
 			end
 		end,
@@ -320,10 +419,7 @@ types = {
 
 	Ray = {
 		fromPod = function(pod)
-			return Ray.new(
+			return Ray.new(types.Vector3.fromPod(pod.origin), types.Vector3.fromPod(pod.direction))
-				types.Vector3.fromPod(pod.origin),
-				types.Vector3.fromPod(pod.direction)
-			)
 		end,
 
 		toPod = function(roblox)
@@ -336,10 +432,7 @@ types = {
 
 	Rect = {
 		fromPod = function(pod)
-			return Rect.new(
+			return Rect.new(types.Vector2.fromPod(pod[1]), types.Vector2.fromPod(pod[2]))
-				types.Vector2.fromPod(pod[1]),
-				types.Vector2.fromPod(pod[2])
-			)
 		end,
 
 		toPod = function(roblox)
@@ -351,31 +444,28 @@ types = {
 	},
 
 	Ref = {
-		fromPod = function(_pod)
+		fromPod = function(_)
 			error("Ref cannot be decoded on its own")
 		end,
 
-		toPod = function(_roblox)
+		toPod = function(_)
 			error("Ref can not be encoded on its own")
 		end,
 	},
 
 	Region3 = {
-		fromPod = function(pod)
+		fromPod = function(_)
 			error("Region3 is not implemented")
 		end,
 
-		toPod = function(roblox)
+		toPod = function(_)
 			error("Region3 is not implemented")
 		end,
 	},
 
 	Region3int16 = {
 		fromPod = function(pod)
-			return Region3int16.new(
+			return Region3int16.new(types.Vector3int16.fromPod(pod[1]), types.Vector3int16.fromPod(pod[2]))
-				types.Vector3int16.fromPod(pod[1]),
-				types.Vector3int16.fromPod(pod[2])
-			)
 		end,
 
 		toPod = function(roblox)
@@ -387,11 +477,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,
 	},
@@ -405,16 +495,13 @@ 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(
+			return UDim2.new(types.UDim.fromPod(pod[1]), types.UDim.fromPod(pod[2]))
-				types.UDim.fromPod(pod[1]),
-				types.UDim.fromPod(pod[2])
-			)
 		end,
 
 		toPod = function(roblox)
@@ -445,7 +532,7 @@ types = {
 		fromPod = unpackDecoder(Vector2int16.new),
 
 		toPod = function(roblox)
-			return {roblox.X, roblox.Y}
+			return { roblox.X, roblox.Y }
 		end,
 	},
 
@@ -465,14 +552,37 @@ 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,
+}
+
 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)

plugin/rbx_dom_lua/EncodedValue.spec.lua

@@ -1,72 +0,0 @@
-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,6 +5,7 @@ Error.Kind = {
 	UnknownProperty = "UnknownProperty",
 	PropertyNotReadable = "PropertyNotReadable",
 	PropertyNotWritable = "PropertyNotWritable",
+	CannotParseBinaryString = "CannotParseBinaryString",
 	Roblox = "Roblox",
 }
 
@@ -25,4 +26,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,6 +53,11 @@ 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)
@@ -79,6 +84,11 @@ 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

@@ -15,6 +15,12 @@
             0.0
           ]
         },
+        "TestEnumItem": {
+          "EnumItem": {
+            "type": "Material",
+            "value": 256
+          }
+        },
         "TestNumber": {
           "Float64": 1337.0
         },
@@ -170,9 +176,23 @@
     },
     "ty": "ColorSequence"
   },
-  "Content": {
+  "ContentId": {
     "value": {
-      "Content": "rbxassetid://12345"
+      "ContentId": "rbxassetid://12345"
+    },
+    "ty": "ContentId"
+  },
+  "Content_None": {
+    "value": {
+      "Content": "None"
+    },
+    "ty": "Content"
+  },
+  "Content_Uri": {
+    "value": {
+      "Content": {
+        "Uri": "rbxasset://abc/123.rojo"
+      }
     },
     "ty": "Content"
   },
@@ -182,6 +202,15 @@
     },
     "ty": "Enum"
   },
+  "EnumItem": {
+    "value": {
+      "EnumItem": {
+        "type": "Material",
+        "value": 256
+      }
+    },
+    "ty": "EnumItem"
+  },
   "Faces": {
     "value": {
       "Faces": [
@@ -207,6 +236,17 @@
     },
     "ty": "Float64"
   },
+  "Font": {
+    "value": {
+      "Font": {
+        "family": "rbxasset://fonts/families/SourceSansPro.json",
+        "weight": "Regular",
+        "style": "Normal",
+        "cachedFaceId": null
+      }
+    },
+    "ty": "Font"
+  },
   "Int32": {
     "value": {
       "Int32": 6014
@@ -219,6 +259,118 @@
     },
     "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": [
@@ -247,6 +399,41 @@
     },
     "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": {
@@ -254,7 +441,8 @@
         "friction": 1.0,
         "elasticity": 0.0,
         "frictionWeight": 50.0,
-        "elasticityWeight": 25.0
+        "elasticityWeight": 25.0,
+        "acousticAbsorption": 0.15625
       }
     },
     "ty": "PhysicalProperties"

plugin/rbx_dom_lua/base64.lua

@@ -1,139 +1,10 @@
--- Thanks to Tiffany352 for this base64 implementation!
+local EncodingService = game:GetService("EncodingService")
-
-local floor = math.floor
-local char = string.char
-
-local function encodeBase64(str)
-	local out = {}
-	local nOut = 0
-	local alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-	local strLen = #str
-
-	-- 3 octets become 4 hextets
-	for i = 1, strLen - 2, 3 do
-		local b1, b2, b3 = str:byte(i, i + 3)
-		local word = b3 + b2 * 256 + b1 * 256 * 256
-
-		local h4 = word % 64 + 1
-		word = floor(word / 64)
-		local h3 = word % 64 + 1
-		word = floor(word / 64)
-		local h2 = word % 64 + 1
-		word = floor(word / 64)
-		local h1 = word % 64 + 1
-
-		out[nOut + 1] = alphabet:sub(h1, h1)
-		out[nOut + 2] = alphabet:sub(h2, h2)
-		out[nOut + 3] = alphabet:sub(h3, h3)
-		out[nOut + 4] = alphabet:sub(h4, h4)
-		nOut = nOut + 4
-	end
-
-	local remainder = strLen % 3
-
-	if remainder == 2 then
-		-- 16 input bits -> 3 hextets (2 full, 1 partial)
-		local b1, b2 = str:byte(-2, -1)
-		-- partial is 4 bits long, leaving 2 bits of zero padding ->
-		-- offset = 4
-		local word = b2 * 4 + b1 * 4 * 256
-
-		local h3 = word % 64 + 1
-		word = floor(word / 64)
-		local h2 = word % 64 + 1
-		word = floor(word / 64)
-		local h1 = word % 64 + 1
-
-		out[nOut + 1] = alphabet:sub(h1, h1)
-		out[nOut + 2] = alphabet:sub(h2, h2)
-		out[nOut + 3] = alphabet:sub(h3, h3)
-		out[nOut + 4] = "="
-	elseif remainder == 1 then
-		-- 8 input bits -> 2 hextets (2 full, 1 partial)
-		local b1 = str:byte(-1, -1)
-		-- partial is 2 bits long, leaving 4 bits of zero padding ->
-		-- offset = 16
-		local word = b1 * 16
-
-		local h2 = word % 64 + 1
-		word = floor(word / 64)
-		local h1 = word % 64 + 1
-
-		out[nOut + 1] = alphabet:sub(h1, h1)
-		out[nOut + 2] = alphabet:sub(h2, h2)
-		out[nOut + 3] = "="
-		out[nOut + 4] = "="
-	end
-	-- if the remainder is 0, then no work is needed
-
-	return table.concat(out, "")
-end
-
-local function decodeBase64(str)
-	local out = {}
-	local nOut = 0
-	local alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-	local strLen = #str
-	local acc = 0
-	local nAcc = 0
-
-	local alphabetLut = {}
-	for i = 1, #alphabet do
-		alphabetLut[alphabet:sub(i, i)] = i - 1
-	end
-
-	-- 4 hextets become 3 octets
-	for i = 1, strLen do
-		local ch = str:sub(i, i)
-		local byte = alphabetLut[ch]
-		if byte then
-			acc = acc * 64 + byte
-			nAcc = nAcc + 1
-		end
-
-		if nAcc == 4 then
-			local b3 = acc % 256
-			acc = floor(acc / 256)
-			local b2 = acc % 256
-			acc = floor(acc / 256)
-			local b1 = acc % 256
-
-			out[nOut + 1] = char(b1)
-			out[nOut + 2] = char(b2)
-			out[nOut + 3] = char(b3)
-			nOut = nOut + 3
-			nAcc = 0
-			acc = 0
-		end
-	end
-
-	if nAcc == 3 then
-		-- 3 hextets -> 16 bit output
-		acc = acc * 64
-		acc = floor(acc / 256)
-		local b2 = acc % 256
-		acc = floor(acc / 256)
-		local b1 = acc % 256
-
-		out[nOut + 1] = char(b1)
-		out[nOut + 2] = char(b2)
-	elseif nAcc == 2 then
-		-- 2 hextets -> 8 bit output
-		acc = acc * 64
-		acc = floor(acc / 256)
-		acc = acc * 64
-		acc = floor(acc / 256)
-		local b1 = acc % 256
-
-		out[nOut + 1] = char(b1)
-	elseif nAcc == 1 then
-		error("Base64 has invalid length")
-	end
-
-	return table.concat(out, "")
-end
 
 return {
-	decode = decodeBase64,
+	decode = function(input: string)
-	encode = encodeBase64,
+		return buffer.tostring(EncodingService:Base64Decode(buffer.fromstring(input)))
-}
+	end,
+	encode = function(input: string)
+		return buffer.tostring(EncodingService:Base64Encode(buffer.fromstring(input)))
+	end,
+}

plugin/rbx_dom_lua/base64.spec.lua

@@ -1,29 +0,0 @@
-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,4 +1,47 @@
 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.
 --
@@ -10,19 +53,45 @@ return {
 				return true, instance:GetAttributes()
 			end,
 			write = function(instance, _, value)
-				local existing = instance:GetAttributes()
+				if typeof(value) ~= "table" then
-
+					return false, Error.new(Error.Kind.CannotParseBinaryString)
-				for key, attr in pairs(value) do
-					instance:SetAttribute(key, attr)
 				end
 
-				for key in pairs(existing) do
+				local existing = instance:GetAttributes()
-					if value[key] == nil then
+				local didAllWritesSucceed = true
-						instance:SetAttribute(key, nil)
+
+				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 true
+				return didAllWritesSucceed
 			end,
 		},
 		Tags = {
@@ -52,13 +121,117 @@ return {
 	},
 	LocalizationTable = {
 		Contents = {
-			read = function(instance, key)
+			read = function(instance, _)
 				return true, instance:GetContents()
 			end,
-			write = function(instance, key, value)
+			write = function(instance, _, 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,
+		},
+	},
+	StyleRule = {
+		PropertiesSerialize = {
+			read = function(instance: StyleRule)
+				return true, instance:GetProperties()
+			end,
+			write = function(instance: StyleRule, _, value: { [any]: any })
+				if typeof(value) ~= "table" then
+					return false, Error.new(Error.Kind.CannotParseBinaryString)
+				end
+
+				local existing = instance:GetProperties()
+
+				for itemName, itemValue in pairs(value) do
+					instance:SetProperty(itemName, itemValue)
+				end
+
+				for existingItemName in pairs(existing) do
+					if value[existingItemName] == nil then
+						instance:SetProperty(existingItemName, nil)
+					end
+				end
+
+				return true
+			end,
+		},
+	},
 }

plugin/rbx_dom_lua/init.lua

@@ -24,7 +24,8 @@ 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

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

plugin/run-tests.server.lua

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

plugin/src/ApiContext.lua

@@ -1,6 +1,8 @@
-local Http = require(script.Parent.Parent.Http)
+local Packages = script.Parent.Parent.Packages
-local Log = require(script.Parent.Parent.Log)
+local HttpService = game:GetService("HttpService")
-local Promise = require(script.Parent.Parent.Promise)
+local Http = require(Packages.Http)
+local Log = require(Packages.Log)
+local Promise = require(Packages.Promise)
 
 local Config = require(script.Parent.Config)
 local Types = require(script.Parent.Types)
@@ -8,14 +10,9 @@ local Version = require(script.Parent.Version)
 
 local validateApiInfo = Types.ifEnabled(Types.ApiInfoResponse)
 local validateApiRead = Types.ifEnabled(Types.ApiReadResponse)
-local validateApiSubscribe = Types.ifEnabled(Types.ApiSubscribeResponse)
+local validateApiSocketPacket = Types.ifEnabled(Types.ApiSocketPacket)
-
+local validateApiSerialize = Types.ifEnabled(Types.ApiSerializeResponse)
---[[
+local validateApiRefPatch = Types.ifEnabled(Types.ApiRefPatchResponse)
-	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
@@ -30,15 +27,17 @@ 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." ..
+			"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!" ..
+			.. "\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." ..
+			.. "\n\nYour client is version %s, with protocol version %s. It expects server version %s."
-			"\nYour server is version %s, with protocol version %s." ..
+			.. "\nYour server is version %s, with protocol version %s."
-			"\n\nGo to https://github.com/rojo-rbx/rojo for more details."
+			.. "\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)
@@ -49,14 +48,7 @@ end
 
 local function rejectWrongPlaceId(infoResponseBody)
 	if infoResponseBody.expectedPlaceIds ~= nil then
-		local foundId = false
+		local foundId = table.find(infoResponseBody.expectedPlaceIds, game.PlaceId)
-
-		for _, id in ipairs(infoResponseBody.expectedPlaceIds) do
-			if id == game.PlaceId then
-				foundId = true
-				break
-			end
-		end
 
 		if not foundId then
 			local idList = {}
@@ -65,14 +57,31 @@ 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." ..
+				"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:" ..
+				.. "\nYour place ID is %u, but needs to be one of these:"
-				"\n%s" ..
+				.. "\n%s"
-				"\n\nTo change this list, edit 'servePlaceIds' in your .project.json file."
+				.. "\n\nTo change this list, edit 'servePlaceIds' in your .project.json file."
-			):format(
+			):format(game.PlaceId, table.concat(idList, "\n"))
-				tostring(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"))
 
 			return Promise.reject(message)
 		end
@@ -85,13 +94,15 @@ local ApiContext = {}
 ApiContext.__index = ApiContext
 
 function ApiContext.new(baseUrl)
-	assert(type(baseUrl) == "string")
+	assert(type(baseUrl) == "string", "baseUrl must be a string")
 
 	local self = {
 		__baseUrl = baseUrl,
 		__sessionId = nil,
 		__messageCursor = -1,
+		__wsClient = nil,
 		__connected = true,
+		__activeRequests = {},
 	}
 
 	return setmetatable(self, ApiContext)
@@ -112,6 +123,17 @@ end
 
 function ApiContext:disconnect()
 	self.__connected = false
+	for request in self.__activeRequests do
+		Log.trace("Cancelling request {}", request)
+		request:cancel()
+	end
+	self.__activeRequests = {}
+
+	if self.__wsClient then
+		Log.trace("Closing WebSocket client")
+		self.__wsClient:Close()
+	end
+	self.__wsClient = nil
 end
 
 function ApiContext:setMessageCursor(index)
@@ -141,18 +163,15 @@ end
 function ApiContext:read(ids)
 	local url = ("%s/api/read/%s"):format(self.__baseUrl, table.concat(ids, ","))
 
-	return Http.get(url)
+	return Http.get(url):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
-		:andThen(rejectFailedRequests)
+		if body.sessionId ~= self.__sessionId then
-		:andThen(Http.Response.json)
+			return Promise.reject("Server changed ID")
-		:andThen(function(body)
+		end
-			if body.sessionId ~= self.__sessionId then
-				return Promise.reject("Server changed ID")
-			end
 
-			assert(validateApiRead(body))
+		assert(validateApiRead(body))
 
-			return body
+		return body
-		end)
+	end)
 end
 
 function ApiContext:write(patch)
@@ -189,63 +208,113 @@ function ApiContext:write(patch)
 
 	body = Http.jsonEncode(body)
 
-	return Http.post(url, body)
+	return Http.post(url, body):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(responseBody)
-		:andThen(rejectFailedRequests)
+		Log.info("Write response: {:?}", responseBody)
-		:andThen(Http.Response.json)
-		:andThen(function(body)
-			Log.info("Write response: {:?}", body)
 
-			return body
+		return responseBody
-		end)
+	end)
 end
 
-function ApiContext:retrieveMessages()
+function ApiContext:connectWebSocket(packetHandlers)
-	local url = ("%s/api/subscribe/%s"):format(self.__baseUrl, self.__messageCursor)
+	local url = ("%s/api/socket/%s"):format(self.__baseUrl, self.__messageCursor)
+	-- Convert HTTP/HTTPS URL to WS/WSS
+	url = url:gsub("^http://", "ws://"):gsub("^https://", "wss://")
 
-	local function sendRequest()
+	return Promise.new(function(resolve, reject)
-		return Http.get(url)
+		local success, wsClient =
-			:catch(function(err)
+			pcall(HttpService.CreateWebStreamClient, HttpService, Enum.WebStreamClientType.WebSocket, {
-				if err.type == Http.Error.Kind.Timeout then
+				Url = url,
-					if self.__connected then
+			})
-						return sendRequest()
+		if not success then
-					else
+			reject("Failed to create WebSocket client: " .. tostring(wsClient))
-						return hangingPromise()
+			return
-					end
+		end
-				end
+		self.__wsClient = wsClient
 
-				return Promise.reject(err)
+		local closed, errored, received
-			end)
-	end
 
-	return sendRequest()
+		received = self.__wsClient.MessageReceived:Connect(function(msg)
-		:andThen(rejectFailedRequests)
+			local data = Http.jsonDecode(msg)
-		:andThen(Http.Response.json)
+			if data.sessionId ~= self.__sessionId then
-		:andThen(function(body)
+				Log.warn("Received message with wrong session ID; ignoring")
-			if body.sessionId ~= self.__sessionId then
+				return
-				return Promise.reject("Server changed ID")
 			end
 
-			assert(validateApiSubscribe(body))
+			assert(validateApiSocketPacket(data))
 
-			self:setMessageCursor(body.messageCursor)
+			Log.trace("Received websocket packet: {:#?}", data)
 
-			return body.messages
+			local handler = packetHandlers[data.packetType]
+			if handler then
+				local ok, err = pcall(handler, data.body)
+				if not ok then
+					Log.error("Error in WebSocket packet handler for type '%s': %s", data.packetType, err)
+				end
+			else
+				Log.warn("No handler for WebSocket packet type '%s'", data.packetType)
+			end
 		end)
+
+		closed = self.__wsClient.Closed:Connect(function()
+			closed:Disconnect()
+			errored:Disconnect()
+			received:Disconnect()
+
+			if self.__connected then
+				reject("WebSocket connection closed unexpectedly")
+			else
+				resolve()
+			end
+		end)
+
+		errored = self.__wsClient.Error:Connect(function(code, msg)
+			closed:Disconnect()
+			errored:Disconnect()
+			received:Disconnect()
+
+			reject("WebSocket error: " .. code .. " - " .. msg)
+		end)
+	end)
 end
 
 function ApiContext:open(id)
 	local url = ("%s/api/open/%s"):format(self.__baseUrl, id)
 
-	return Http.post(url, "")
+	return Http.post(url, ""):andThen(rejectFailedRequests):andThen(Http.Response.json):andThen(function(body)
-		:andThen(rejectFailedRequests)
+		if body.sessionId ~= self.__sessionId then
-		:andThen(Http.Response.json)
+			return Promise.reject("Server changed ID")
-		:andThen(function(body)
+		end
-			if body.sessionId ~= self.__sessionId then
-				return Promise.reject("Server changed ID")
-			end
 
-			return nil
+		return nil
-		end)
+	end)
 end
 
-return ApiContext
+function ApiContext:serialize(ids: { string })
+	local url = ("%s/api/serialize/%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
+
+		assert(validateApiSerialize(body))
+
+		return body
+	end)
+end
+
+function ApiContext:refPatch(ids: { string })
+	local url = ("%s/api/ref-patch/%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
+
+		assert(validateApiRefPatch(body))
+
+		return body
+	end)
+end
+
+return ApiContext

plugin/src/App/Components/BorderedContainer.lua

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

plugin/src/App/Components/Checkbox.lua

@@ -1,14 +1,16 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages
 
-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)
-local Flipper = require(Rojo.Flipper)
+local Flipper = require(Packages.Flipper)
 
 local Assets = require(Plugin.Assets)
 local Theme = require(Plugin.App.Theme)
 local bindingUtil = require(Plugin.App.bindingUtil)
 
 local SlicedImage = require(script.Parent.SlicedImage)
+local Tooltip = require(script.Parent.Tooltip)
 
 local e = Roact.createElement
 
@@ -21,18 +23,16 @@ end
 
 function Checkbox:didUpdate(lastProps)
 	if lastProps.active ~= self.props.active then
-		self.motor:setGoal(
+		self.motor:setGoal(Flipper.Spring.new(self.props.active and 1 or 0, {
-			Flipper.Spring.new(self.props.active and 1 or 0, {
+			frequency = 6,
-				frequency = 6,
+			dampingRatio = 1.1,
-				dampingRatio = 1.1,
+		}))
-			})
-		)
 	end
 end
 
 function Checkbox:render()
 	return Theme.with(function(theme)
-		theme = theme.Checkbox
+		local checkboxTheme = theme.Checkbox
 
 		local activeTransparency = Roact.joinBindings({
 			self.binding:map(function(value)
@@ -49,18 +49,29 @@ function Checkbox:render()
 			ZIndex = self.props.zIndex,
 			BackgroundTransparency = 1,
 
-			[Roact.Event.Activated] = self.props.onClick,
+			[Roact.Event.Activated] = function()
+				if self.props.locked then
+					return
+				end
+				self.props.onClick()
+			end,
 		}, {
+			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 = theme.Active.BackgroundColor,
+				color = checkboxTheme.Active.BackgroundColor,
 				transparency = activeTransparency,
 				size = UDim2.new(1, 0, 1, 0),
 				zIndex = 2,
 			}, {
 				Icon = e("ImageLabel", {
-					Image = Assets.Images.Checkbox.Active,
+					Image = if self.props.locked then Assets.Images.Checkbox.Locked else Assets.Images.Checkbox.Active,
-					ImageColor3 = theme.Active.IconColor,
+					ImageColor3 = checkboxTheme.Active.IconColor,
 					ImageTransparency = activeTransparency,
 
 					Size = UDim2.new(0, 16, 0, 16),
@@ -73,13 +84,15 @@ function Checkbox:render()
 
 			Inactive = e(SlicedImage, {
 				slice = Assets.Slices.RoundedBorder,
-				color = theme.Inactive.BorderColor,
+				color = checkboxTheme.Inactive.BorderColor,
 				transparency = self.props.transparency,
 				size = UDim2.new(1, 0, 1, 0),
 			}, {
 				Icon = e("ImageLabel", {
-					Image = Assets.Images.Checkbox.Inactive,
+					Image = if self.props.locked
-					ImageColor3 = theme.Inactive.IconColor,
+						then Assets.Images.Checkbox.Locked
+						else Assets.Images.Checkbox.Inactive,
+					ImageColor3 = checkboxTheme.Inactive.IconColor,
 					ImageTransparency = self.props.transparency,
 
 					Size = UDim2.new(0, 16, 0, 16),
@@ -93,4 +106,4 @@ function Checkbox:render()
 	end)
 end
 
-return Checkbox
+return Checkbox

plugin/src/App/Components/ClassIcon.lua

@@ -0,0 +1,160 @@
+local StudioService = game:GetService("StudioService")
+local AssetService = game:GetService("AssetService")
+
+type CachedImageInfo = {
+	pixels: buffer,
+	size: Vector2,
+}
+
+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: { [string]: CachedImageInfo } = {}
+
+local function cloneBuffer(b: buffer): buffer
+	local newBuffer = buffer.create(buffer.len(b))
+	buffer.copy(newBuffer, 0, b)
+	return newBuffer
+end
+
+local function getImageSizeAndPixels(image: string): (Vector2, buffer)
+	local cachedImage = imageCache[image]
+
+	if not cachedImage then
+		local editableImage = AssetService:CreateEditableImageAsync(Content.fromUri(image))
+		local size = editableImage.Size
+		local pixels = editableImage:ReadPixelsBuffer(Vector2.zero, size)
+		imageCache[image] = {
+			pixels = pixels,
+			size = size,
+		}
+
+		return size, cloneBuffer(pixels)
+	end
+
+	return cachedImage.size, cloneBuffer(cachedImage.pixels)
+end
+
+local function getRecoloredClassIcon(className, color)
+	local iconProps = StudioService:GetClassIcon(className)
+
+	if iconProps and color then
+		--stylua: ignore
+		local success, editableImageSize, editableImagePixels = pcall(function(_iconProps: { [any]: any }, _color: Color3): (Vector2, buffer)
+			local size, pixels = getImageSizeAndPixels(_iconProps.Image)
+			local pixelsLen = buffer.len(pixels)
+
+			local minVal, maxVal = math.huge, -math.huge
+
+			for i = 0, pixelsLen, 4 do
+				if buffer.readu8(pixels, i + 3) == 0 then
+					continue
+				end
+				local pixelVal = math.max(
+					buffer.readu8(pixels, i),
+					buffer.readu8(pixels, i + 1),
+					buffer.readu8(pixels, i + 2)
+				)
+
+				minVal = math.min(minVal, pixelVal)
+				maxVal = math.max(maxVal, pixelVal)
+			end
+
+			local hue, sat, val = _color:ToHSV()
+
+			for i = 0, pixelsLen, 4 do
+				if buffer.readu8(pixels, i + 3) == 0 then
+					continue
+				end
+				local gIndex = i + 1
+				local bIndex = i + 2
+
+				local pixelVal = math.max(
+					buffer.readu8(pixels, i),
+					buffer.readu8(pixels, gIndex),
+					buffer.readu8(pixels, bIndex)
+				)
+				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)
+				buffer.writeu8(pixels, i, newPixelColor.R)
+				buffer.writeu8(pixels, gIndex, newPixelColor.G)
+				buffer.writeu8(pixels, bIndex, newPixelColor.B)
+			end
+			return size, pixels
+		end, iconProps, color)
+		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/Dropdown.lua

@@ -0,0 +1,182 @@
+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

@@ -0,0 +1,42 @@
+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 :: EditableImage
+
+	if not image then
+		return
+	end
+	if not self.props.pixels then
+		return
+	end
+
+	image:WritePixelsBuffer(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,15 +1,78 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages
 
-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)
 
 local Theme = require(Plugin.App.Theme)
 local Assets = require(Plugin.Assets)
 local Config = require(Plugin.Config)
 local Version = require(Plugin.Version)
 
+local Tooltip = require(Plugin.App.Components.Tooltip)
+local SlicedImage = require(script.Parent.SlicedImage)
+
 local e = Roact.createElement
 
+local function VersionIndicator(props)
+	local updateMessage = Version.getUpdateMessage()
+
+	return Theme.with(function(theme)
+		return e("Frame", {
+			LayoutOrder = props.layoutOrder,
+			Size = UDim2.new(0, 0, 0, 25),
+			BackgroundTransparency = 1,
+			AutomaticSize = Enum.AutomaticSize.X,
+		}, {
+			Border = if updateMessage
+				then e(SlicedImage, {
+					slice = Assets.Slices.RoundedBorder,
+					color = theme.Button.Bordered.Enabled.BorderColor,
+					transparency = props.transparency,
+					size = UDim2.fromScale(1, 1),
+					zIndex = 0,
+				}, {
+					Indicator = e("ImageLabel", {
+						Size = UDim2.new(0, 10, 0, 10),
+						ScaleType = Enum.ScaleType.Fit,
+						Image = Assets.Images.Circles[16],
+						ImageColor3 = theme.Header.LogoColor,
+						ImageTransparency = props.transparency,
+						BackgroundTransparency = 1,
+						Position = UDim2.new(1, 0, 0, 0),
+						AnchorPoint = Vector2.new(0.5, 0.5),
+					}),
+				})
+				else nil,
+
+			Tip = if updateMessage
+				then e(Tooltip.Trigger, {
+					text = updateMessage,
+					delay = 0.1,
+				})
+				else nil,
+
+			VersionText = e("TextLabel", {
+				Text = Version.display(Config.version),
+				FontFace = theme.Font.Thin,
+				TextSize = theme.TextSize.Body,
+				TextColor3 = theme.Header.VersionColor,
+				TextXAlignment = Enum.TextXAlignment.Left,
+				TextTransparency = props.transparency,
+				BackgroundTransparency = 1,
+
+				Size = UDim2.new(0, 0, 1, 0),
+				AutomaticSize = Enum.AutomaticSize.X,
+			}, {
+				Padding = e("UIPadding", {
+					PaddingLeft = UDim.new(0, 6),
+					PaddingRight = UDim.new(0, 6),
+				}),
+			}),
+		})
+	end)
+end
+
 local function Header(props)
 	return Theme.with(function(theme)
 		return e("Frame", {
@@ -28,18 +91,9 @@ local function Header(props)
 				BackgroundTransparency = 1,
 			}),
 
-			Version = e("TextLabel", {
+			VersionIndicator = e(VersionIndicator, {
-				Text = Version.display(Config.version),
+				transparency = props.transparency,
-				Font = Enum.Font.Gotham,
+				layoutOrder = 2,
-				TextSize = 14,
-				TextColor3 = theme.Header.VersionColor,
-				TextXAlignment = Enum.TextXAlignment.Left,
-				TextTransparency = props.transparency,
-
-				Size = UDim2.new(1, 0, 0, 14),
-
-				LayoutOrder = 2,
-				BackgroundTransparency = 1,
 			}),
 
 			Layout = e("UIListLayout", {
@@ -52,4 +106,4 @@ local function Header(props)
 	end)
 end
 
-return Header
+return Header

plugin/src/App/Components/IconButton.lua

@@ -1,8 +1,9 @@
 local Rojo = script:FindFirstAncestor("Rojo")
 local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages
 
-local Roact = require(Rojo.Roact)
+local Roact = require(Packages.Roact)
-local Flipper = require(Rojo.Flipper)
+local Flipper = require(Packages.Flipper)
 
 local Assets = require(Plugin.Assets)
 local bindingUtil = require(Plugin.App.bindingUtil)
@@ -29,6 +30,7 @@ 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,
@@ -36,15 +38,11 @@ function IconButton:render()
 		[Roact.Event.Activated] = self.props.onClick,
 
 		[Roact.Event.MouseEnter] = function()
-			self.motor:setGoal(
+			self.motor:setGoal(Flipper.Spring.new(1, HOVER_SPRING_PROPS))
-				Flipper.Spring.new(1, HOVER_SPRING_PROPS)
-			)
 		end,
 
 		[Roact.Event.MouseLeave] = function()
-			self.motor:setGoal(
+			self.motor:setGoal(Flipper.Spring.new(0, HOVER_SPRING_PROPS))
-				Flipper.Spring.new(0, HOVER_SPRING_PROPS)
-			)
 		end,
 	}, {
 		Icon = e("ImageLabel", {
@@ -73,7 +71,9 @@ function IconButton:render()
 
 			BackgroundTransparency = 1,
 		}),
+
+		Children = Roact.createFragment(self.props[Roact.Children]),
 	})
 end
 
-return IconButton
+return IconButton

plugin/src/App/Components/Notifications/FullscreenNotification.lua

@@ -0,0 +1,151 @@
+local StudioService = game:GetService("StudioService")
+
+local Rojo = script:FindFirstAncestor("Rojo")
+local Plugin = Rojo.Plugin
+local Packages = Rojo.Packages
+
+local Roact = require(Packages.Roact)
+local Log = require(Packages.Log)
+
+local Theme = require(Plugin.App.Theme)
+local Assets = require(Plugin.Assets)
+
+local TextButton = require(Plugin.App.Components.TextButton)
+
+local e = Roact.createElement
+
+local FullscreenNotification = Roact.Component:extend("FullscreeFullscreenNotificationnNotification")
+
+function FullscreenNotification:init()
+	self.transparency, self.setTransparency = Roact.createBinding(0)
+	self.lifetime = self.props.timeout
+end
+
+function FullscreenNotification:dismiss()
+	if self.props.onClose then
+		self.props.onClose()
+	end
+end
+
+function FullscreenNotification:didMount()
+	self.props.soundPlayer:play(Assets.Sounds.Notification)
+
+	self.timeout = task.spawn(function()
+		local clock = os.clock()
+		local seen = false
+		while task.wait(1 / 10) do
+			local now = os.clock()
+			local dt = now - clock
+			clock = now
+
+			if not seen then
+				seen = StudioService.ActiveScript == nil
+			end
+
+			if not seen then
+				-- Don't run down timer before being viewed
+				continue
+			end
+
+			self.lifetime -= dt
+			if self.lifetime <= 0 then
+				self:dismiss()
+				break
+			end
+		end
+
+		self.timeout = nil
+	end)
+end
+
+function FullscreenNotification:willUnmount()
+	if self.timeout and coroutine.status(self.timeout) ~= "dead" then
+		task.cancel(self.timeout)
+	end
+end
+
+function FullscreenNotification:render()
+	return Theme.with(function(theme)
+		local actionButtons = {}
+		if self.props.actions then
+			for key, action in self.props.actions do
+				actionButtons[key] = e(TextButton, {
+					text = action.text,
+					style = action.style,
+					onClick = function()
+						self:dismiss()
+						if action.onClick then
+							local success, err = pcall(action.onClick, self)
+							if not success then
+								Log.warn("Error in notification action: " .. tostring(err))
+							end
+						end
+					end,
+					layoutOrder = -action.layoutOrder,
+					transparency = self.transparency,
+				})
+			end
+		end
+
+		return e("Frame", {
+			BackgroundColor3 = theme.BackgroundColor,
+			Size = UDim2.fromScale(1, 1),
+			ZIndex = self.props.layoutOrder,
+		}, {
+			Padding = e("UIPadding", {
+				PaddingLeft = UDim.new(0, 17),
+				PaddingRight = UDim.new(0, 15),
+				PaddingTop = UDim.new(0, 10),
+				PaddingBottom = UDim.new(0, 10),
+			}),
+			Layout = e("UIListLayout", {
+				SortOrder = Enum.SortOrder.LayoutOrder,
+				FillDirection = Enum.FillDirection.Vertical,
+				HorizontalAlignment = Enum.HorizontalAlignment.Center,
+				VerticalAlignment = Enum.VerticalAlignment.Center,
+				Padding = UDim.new(0, 10),
+			}),
+			Logo = e("ImageLabel", {
+				ImageTransparency = self.transparency,
+				Image = Assets.Images.Logo,
+				ImageColor3 = theme.Header.LogoColor,
+				BackgroundTransparency = 1,
+				Size = UDim2.fromOffset(60, 27),
+				LayoutOrder = 1,
+			}),
+			Info = e("TextLabel", {
+				Text = self.props.text,
+				FontFace = theme.Font.Main,
+				TextSize = theme.TextSize.Body,
+				TextColor3 = theme.Notification.InfoColor,
+				TextTransparency = self.transparency,
+				TextXAlignment = Enum.TextXAlignment.Center,
+				TextYAlignment = Enum.TextYAlignment.Center,
+				TextWrapped = true,
+				BackgroundTransparency = 1,
+
+				AutomaticSize = Enum.AutomaticSize.Y,
+				Size = UDim2.fromScale(0.4, 0),
+				LayoutOrder = 2,
+			}),
+			Actions = if self.props.actions
+				then e("Frame", {
+					Size = UDim2.new(1, -40, 0, 37),
+					BackgroundTransparency = 1,
+					LayoutOrder = 3,
+				}, {
+					Layout = e("UIListLayout", {
+						FillDirection = Enum.FillDirection.Horizontal,
+						HorizontalAlignment = Enum.HorizontalAlignment.Center,
+						VerticalAlignment = Enum.VerticalAlignment.Center,
+						SortOrder = Enum.SortOrder.LayoutOrder,
+						Padding = UDim.new(0, 5),
+					}),
+					Buttons = Roact.createFragment(actionButtons),
+				})
+				else nil,
+		})
+	end)
+end
+
+return FullscreenNotification