Stub out a command sorta like rostar unpack

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        rust_version: [stable, 1.57.0]
+        rust_version: [stable, 1.55.0]
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/release.yml

@@ -67,7 +67,7 @@ jobs:
         # -x86_64 to each release.
         include:
           - host: linux
-            os: ubuntu-18.04
+            os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             label: linux
 

.gitignore

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

.luacheckrc

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

CHANGELOG.md

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

Cargo.lock

@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.58"
+version = "1.0.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
+checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc"
 
 [[package]]
 name = "arrayref"
@@ -85,6 +85,12 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base64"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
+
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -226,16 +232,16 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "3.2.7"
+version = "3.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7b16274bb247b45177db843202209b12191b631a14a9d06e41b3777d6ecf14"
+checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b"
 dependencies = [
  "atty",
  "bitflags",
  "clap_derive",
  "clap_lex",
  "indexmap",
- "once_cell",
+ "lazy_static",
  "strsim",
  "termcolor",
  "textwrap 0.15.0",
@@ -243,22 +249,22 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "3.2.7"
+version = "3.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213"
 dependencies = [
  "os_str_bytes",
 ]
@@ -336,9 +342,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
+checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -357,26 +363,26 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.9"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
+checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
 dependencies = [
  "autocfg",
  "cfg-if 1.0.0",
  "crossbeam-utils",
+ "lazy_static",
  "memoffset",
- "once_cell",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.10"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
+checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
 dependencies = [
  "cfg-if 1.0.0",
- "once_cell",
+ "lazy_static",
 ]
 
 [[package]]
@@ -417,15 +423,15 @@ version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
 [[package]]
 name = "diff"
-version = "0.1.13"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 
 [[package]]
 name = "digest"
@@ -470,9 +476,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.7.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "embed-resource"
@@ -668,8 +674,8 @@ version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
@@ -737,13 +743,13 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "wasi",
+ "wasi 0.10.2+wasi-snapshot-preview1",
 ]
 
 [[package]]
@@ -754,9 +760,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "globset"
-version = "0.4.9"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -792,9 +798,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "hashbrown"
-version = "0.12.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
 
 [[package]]
 name = "heck"
@@ -819,9 +825,9 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
 
 [[package]]
 name = "http"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
+checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -907,9 +913,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.9.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -937,9 +943,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.15.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4126dd76ebfe2561486a1bd6738a33d2029ffb068a99ac446b7f8c77b2e58dbc"
+checksum = "bcc3e639bcba360d9237acabd22014c16f3df772db463b7446cd81b070714767"
 dependencies = [
  "console",
  "once_cell",
@@ -1004,9 +1010,9 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"
 
 [[package]]
 name = "js-sys"
-version = "0.3.58"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1041,9 +1047,9 @@ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "linked-hash-map"
-version = "0.5.6"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
 [[package]]
 name = "log"
@@ -1169,13 +1175,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys",
 ]
 
@@ -1327,8 +1333,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
@@ -1405,8 +1411,8 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
@@ -1492,8 +1498,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
  "version_check",
 ]
@@ -1504,8 +1510,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "version_check",
 ]
 
@@ -1532,9 +1538,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
 dependencies = [
  "unicode-ident",
 ]
@@ -1555,7 +1561,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98eee3c112f2a6f784b6713fe1d7fb7d6506e066121c0a49371fdb976f72bae5"
 dependencies = [
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
@@ -1570,11 +1576,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
 ]
 
 [[package]]
@@ -1633,13 +1639,12 @@ dependencies = [
 
 [[package]]
 name = "rbx_binary"
-version = "0.6.6"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "842a9253d37ca9df932108806a0f6c97195f2411bf05671e88744be622548807"
+checksum = "68f424adb7a0a24ab4bd153be141035f1404ae40affed902fd2721b42cca7f86"
 dependencies = [
  "log",
  "lz4",
- "profiling",
  "rbx_dom_weak",
  "rbx_reflection",
  "rbx_reflection_database",
@@ -1668,9 +1673,9 @@ dependencies = [
 
 [[package]]
 name = "rbx_reflection_database"
-version = "0.2.5+roblox-530"
+version = "0.2.4+roblox-504"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e790ac1c92dee33669e7e12414caf75eb5cfce6fb5c54998eb9001d204fbab1"
+checksum = "b41e8da85aa697cd04cef48e6dd7d96992786d2e322bafe1d3cc93045f4de1e1"
 dependencies = [
  "lazy_static",
  "rbx_reflection",
@@ -1680,11 +1685,11 @@ dependencies = [
 
 [[package]]
 name = "rbx_types"
-version = "1.4.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a773e53402f2ae7537bbec77badb7e3ff3e6ddac5ee9c2df7edf0a60edf5c9d8"
+checksum = "cbfc0ca9c674968170d4fbbd95dc692d0b3f9405b4830babc76107dc00a66380"
 dependencies = [
- "base64",
+ "base64 0.13.0",
  "bitflags",
  "blake3",
  "lazy_static",
@@ -1695,11 +1700,11 @@ dependencies = [
 
 [[package]]
 name = "rbx_xml"
-version = "0.12.4"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2559683f2f9205d442bd9083d7557be58b6cdcd0e5cc22600a6546a08e6d54f0"
+checksum = "67387cd246cdec9251dd2451672541499ae6ce0a47c768b3ea9ee0a1becda9dd"
 dependencies = [
- "base64",
+ "base64 0.11.0",
  "log",
  "rbx_dom_weak",
  "rbx_reflection",
@@ -1764,11 +1769,11 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb"
 dependencies = [
- "base64",
+ "base64 0.13.0",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -1791,7 +1796,6 @@ dependencies = [
  "serde_urlencoded",
  "tokio",
  "tokio-native-tls",
- "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1858,12 +1862,12 @@ dependencies = [
 
 [[package]]
 name = "rojo"
-version = "7.2.0"
+version = "7.1.1"
 dependencies = [
  "anyhow",
  "backtrace",
  "bincode",
- "clap 3.2.7",
+ "clap 3.1.18",
  "criterion",
  "crossbeam-channel",
  "csv",
@@ -1931,9 +1935,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.7"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
+checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f"
 
 [[package]]
 name = "ryu"
@@ -1997,9 +2001,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.11"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d92beeab217753479be2f74e54187a6aed4c125ff0703a866c3147a02f0c6dd"
+checksum = "8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd"
 
 [[package]]
 name = "serde"
@@ -2026,16 +2030,16 @@ version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.82"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
 dependencies = [
  "itoa 1.0.2",
  "ryu",
@@ -2101,9 +2105,9 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
 
 [[package]]
 name = "smallvec"
-version = "1.8.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "snax"
@@ -2138,12 +2142,12 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "unicode-ident",
 ]
 
@@ -2210,8 +2214,8 @@ version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
@@ -2251,14 +2255,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.19.2"
+version = "1.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
+checksum = "95eec79ea28c00a365f539f1961e9278fbcaf81c0ff6aaf0e93c181352446948"
 dependencies = [
  "bytes",
  "libc",
  "memchr",
- "mio 0.8.4",
+ "mio 0.8.3",
  "num_cpus",
  "once_cell",
  "pin-project-lite",
@@ -2301,15 +2305,15 @@ dependencies = [
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09"
 dependencies = [
  "cfg-if 1.0.0",
  "pin-project-lite",
@@ -2323,18 +2327,18 @@ version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.28"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f"
 dependencies = [
- "once_cell",
+ "lazy_static",
  "valuable",
 ]
 
@@ -2351,13 +2355,13 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.12"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfbbce75cad20b56f4f4200e413b894c990c7bbd7e47245ff5cbc2b82511e4da"
+checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596"
 dependencies = [
  "ansi_term",
+ "lazy_static",
  "matchers",
- "once_cell",
  "regex",
  "sharded-slab",
  "smallvec",
@@ -2380,9 +2384,9 @@ dependencies = [
 
 [[package]]
 name = "tracy-client-sys"
-version = "0.17.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "178d021455e83078bb38c00b70046b95117ef0a0312cbef925f426d833d11c79"
+checksum = "9012b9dfeccaff16e93f5a8b02336125113a80a769902e679d334cbdd4d83f3b"
 dependencies = [
  "cc",
 ]
@@ -2413,15 +2417,15 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.20"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
+checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9"
 dependencies = [
  "tinyvec",
 ]
@@ -2452,9 +2456,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.1.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "c6d5d669b51467dcf7b2f1a796ce0f955f05f01cafda6c19d6e95f730df29238"
 dependencies = [
  "getrandom",
  "serde",
@@ -2519,6 +2523,12 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.10.2+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -2527,9 +2537,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.81"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
+checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -2537,24 +2547,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.81"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
+checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4"
 dependencies = [
  "bumpalo",
  "lazy_static",
  "log",
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.31"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
+checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -2564,22 +2574,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.81"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
+checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5"
 dependencies = [
- "quote 1.0.20",
+ "quote 1.0.18",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.81"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
+checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b"
 dependencies = [
- "proc-macro2 1.0.40",
+ "proc-macro2 1.0.39",
- "quote 1.0.20",
+ "quote 1.0.18",
  "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -2587,15 +2597,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.81"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
+checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744"
 
 [[package]]
 name = "web-sys"
-version = "0.3.58"
+version = "0.3.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
+checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "rojo"
-version = "7.2.0"
+version = "7.1.1"
-rust-version = "1.57.0"
 authors = ["Lucien Greathouse <me@lpghatguy.com>"]
 description = "Enables professional-grade development tools for Roblox developers"
 license = "MPL-2.0"
@@ -9,7 +8,7 @@ homepage = "https://rojo.space"
 documentation = "https://rojo.space/docs"
 repository = "https://github.com/rojo-rbx/rojo"
 readme = "README.md"
-edition = "2021"
+edition = "2018"
 build = "build.rs"
 
 exclude = [
@@ -51,7 +50,7 @@ memofs = { version = "0.2.0", path = "crates/memofs" }
 # rbx_reflection_database = { path = "../rbx-dom/rbx_reflection_database" }
 # rbx_xml = { path = "../rbx-dom/rbx_xml" }
 
-rbx_binary = "0.6.5"
+rbx_binary = "0.6.4"
 rbx_dom_weak = "2.4.0"
 rbx_reflection = "4.2.0"
 rbx_reflection_database = "0.2.2"

README.md

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

build.rs

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

foreman.toml

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

plugin/rbx_dom_lua/EncodedValue.lua

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

plugin/rbx_dom_lua/allValues.json

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

plugin/rbx_dom_lua/customProperties.lua

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

plugin/src/App/Notifications.lua

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

plugin/src/App/PluginSettings.lua

@@ -9,7 +9,6 @@ local Roact = require(Rojo.Roact)
 local defaultSettings = {
 	openScriptsExternally = false,
 	twoWaySync = false,
-	showNotifications = true,
 }
 
 local Settings = {}

plugin/src/App/StatusPages/Settings.lua

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

plugin/src/App/Theme.lua

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

plugin/src/App/init.lua

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

plugin/src/Assets.lua

@@ -45,9 +45,6 @@ local Assets = {
 			[500] = "rbxassetid://2609138523"
 		},
 	},
-	Sounds = {
-		Notification = "rbxassetid://9716079936",
-	},
 	StartSession = "",
 	SessionActive = "",
 	Configure = "",

plugin/src/Config.lua

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

plugin/src/init.server.lua

@@ -18,7 +18,7 @@ local App = require(script.App)
 local app = Roact.createElement(App, {
 	plugin = plugin
 })
-local tree = Roact.mount(app, game:GetService("CoreGui"), "Rojo UI")
+local tree = Roact.mount(app, nil, "Rojo UI")
 
 plugin.Unloading:Connect(function()
 	Roact.unmount(tree)

plugin/src/playSound.lua

@@ -1,22 +0,0 @@
--- Roblox decided that sounds only play in Edit mode when parented to a plugin widget, for some reason
-local plugin = plugin or script:FindFirstAncestorWhichIsA("Plugin")
-local widget = plugin:CreateDockWidgetPluginGui("Rojo_soundPlayer", DockWidgetPluginGuiInfo.new(
-	Enum.InitialDockState.Float,
-	false, true,
-	10, 10,
-	10, 10
-))
-widget.Name = "Rojo_soundPlayer"
-widget.Title = "Rojo Sound Player"
-
-return function(soundId)
-	local sound = Instance.new("Sound")
-	sound.SoundId = soundId
-	sound.Parent = widget
-
-	sound.Ended:Connect(function()
-		sound:Destroy()
-	end)
-
-	sound:Play()
-end

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

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

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

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

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

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

src/cli/mod.rs

@@ -7,6 +7,7 @@ mod init;
 mod plugin;
 mod serve;
 mod sourcemap;
+mod unpack;
 mod upload;
 
 use std::{borrow::Cow, env, path::Path, str::FromStr};
@@ -21,6 +22,7 @@ pub use self::init::{InitCommand, InitKind};
 pub use self::plugin::{PluginCommand, PluginSubcommand};
 pub use self::serve::ServeCommand;
 pub use self::sourcemap::SourcemapCommand;
+pub use self::unpack::UnpackCommand;
 pub use self::upload::UploadCommand;
 
 /// Command line options that Rojo accepts, defined using the clap crate.
@@ -46,6 +48,7 @@ impl Options {
             Subcommand::FmtProject(subcommand) => subcommand.run(),
             Subcommand::Doc(subcommand) => subcommand.run(),
             Subcommand::Plugin(subcommand) => subcommand.run(),
+            Subcommand::Unpack(subcommand) => subcommand.run(),
         }
     }
 }
@@ -119,6 +122,7 @@ pub enum Subcommand {
     FmtProject(FmtProjectCommand),
     Doc(DocCommand),
     Plugin(PluginCommand),
+    Unpack(UnpackCommand),
 }
 
 pub(super) fn resolve_path(path: &Path) -> Cow<'_, Path> {

src/cli/serve.rs

@@ -67,17 +67,15 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io
     let writer = BufferWriter::stdout(color);
     let mut buffer = writer.buffer();
 
-    let address_string = if bind_address.is_loopback() {
-        "localhost".to_owned()
-    } else {
-        bind_address.to_string()
-    };
-
     writeln!(&mut buffer, "Rojo server listening:")?;
 
     write!(&mut buffer, "  Address: ")?;
     buffer.set_color(&green)?;
-    writeln!(&mut buffer, "{}", address_string)?;
+    if bind_address.is_loopback() {
+        writeln!(&mut buffer, "localhost")?;
+    } else {
+        writeln!(&mut buffer, "{}", bind_address)?;
+    }
 
     buffer.set_color(&ColorSpec::new())?;
     write!(&mut buffer, "  Port:    ")?;
@@ -90,7 +88,7 @@ fn show_start_message(bind_address: IpAddr, port: u16, color: ColorChoice) -> io
     write!(&mut buffer, "Visit ")?;
 
     buffer.set_color(&green)?;
-    write!(&mut buffer, "http://{}:{}/", address_string, port)?;
+    write!(&mut buffer, "http://localhost:{}/", port)?;
 
     buffer.set_color(&ColorSpec::new())?;
     writeln!(&mut buffer, " in your browser for more information.")?;

src/cli/unpack.rs

@@ -0,0 +1,65 @@
+use std::{io::BufReader, path::PathBuf};
+
+use anyhow::bail;
+use clap::Parser;
+use fs_err::File;
+use rbx_dom_weak::{Instance, WeakDom};
+
+use crate::{Project, ProjectNode};
+
+use super::resolve_path;
+
+/// Unpack a Roblox place file into an existing Rojo project.
+#[derive(Debug, Parser)]
+pub struct UnpackCommand {
+    /// Path to the project to unpack. Defaults to the current directory.
+    #[clap(long, default_value = "")]
+    pub project: PathBuf,
+
+    /// Path to the place to unpack from.
+    pub place: PathBuf,
+}
+
+impl UnpackCommand {
+    pub fn run(self) -> anyhow::Result<()> {
+        let project_path = resolve_path(&self.project);
+        let project = match Project::load_fuzzy(&project_path)? {
+            Some(project) => project,
+            None => bail!("No project file was found; rojo unpack requires a project file."),
+        };
+
+        let place_ext = self
+            .place
+            .extension()
+            .and_then(|ext| ext.to_str())
+            .map(|ext| ext.to_lowercase());
+
+        let file = BufReader::new(File::open(&self.place)?);
+
+        let dom = match place_ext.as_deref() {
+            Some("rbxl") => rbx_binary::from_reader(file)?,
+            Some("rbxlx") => rbx_xml::from_reader_default(file)?,
+            Some(_) | None => bail!("Place files must end in .rbxl or .rbxlx"),
+        };
+
+        let context = Context { project, dom };
+        context.unpack();
+
+        Ok(())
+    }
+}
+
+struct Context {
+    project: Project,
+    dom: WeakDom,
+}
+
+impl Context {
+    fn unpack(&self) {
+        self.unpack_node(&self.project.tree, self.dom.root());
+    }
+
+    fn unpack_node(&self, node: &ProjectNode, instance: &Instance) {
+        // TODO
+    }
+}

src/resolution.rs

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

src/snapshot_middleware/dir.rs

@@ -82,11 +82,8 @@ pub fn snapshot_dir_no_meta(
         // middleware. Should we figure out a way for that function to add
         // relevant paths to this middleware?
         path.join("init.lua"),
-        path.join("init.luau"),
         path.join("init.server.lua"),
-        path.join("init.server.luau"),
         path.join("init.client.lua"),
-        path.join("init.client.luau"),
     ];
 
     let snapshot = InstanceSnapshot::new()

src/snapshot_middleware/json_model.rs

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

src/snapshot_middleware/lua.rs

@@ -27,12 +27,6 @@ pub fn snapshot_lua(
         ("LocalScript", name)
     } else if let Some(name) = match_trailing(&file_name, ".lua") {
         ("ModuleScript", name)
-    } else if let Some(name) = match_trailing(&file_name, ".server.luau") {
-        ("Script", name)
-    } else if let Some(name) = match_trailing(&file_name, ".client.luau") {
-        ("LocalScript", name)
-    } else if let Some(name) = match_trailing(&file_name, ".luau") {
-        ("ModuleScript", name)
     } else {
         return Ok(None);
     };

src/snapshot_middleware/mod.rs

@@ -57,31 +57,16 @@ pub fn snapshot_from_vfs(
             return snapshot_project(context, vfs, &project_path);
         }
 
-        let init_path = path.join("init.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
         }
 
-        let init_path = path.join("init.server.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.server.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
         }
 
-        let init_path = path.join("init.client.luau");
-        if vfs.metadata(&init_path).with_not_found()?.is_some() {
-            return snapshot_lua_init(context, vfs, &init_path);
-        }
-
         let init_path = path.join("init.client.lua");
         if vfs.metadata(&init_path).with_not_found()?.is_some() {
             return snapshot_lua_init(context, vfs, &init_path);
@@ -89,11 +74,7 @@ pub fn snapshot_from_vfs(
 
         snapshot_dir(context, vfs, path)
     } else {
-        let script_name = path
+        if let Ok(name) = path.file_name_trim_end(".lua") {
-            .file_name_trim_end(".lua")
-            .or_else(|_| path.file_name_trim_end(".luau"));
-
-        if let Ok(name) = script_name {
             match name {
                 // init scripts are handled elsewhere and should not turn into
                 // their own children.

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__empty_folder.snap

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

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__dir__test__folder_in_folder.snap

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

src/snapshot_middleware/snapshots/librojo__snapshot_middleware__json_model__test__model_from_vfs_legacy.snap

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

src/web/api.rs

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

test-projects/attributes/default.project.json

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

test-projects/tags/default.project.json

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

testez.toml

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

testez.yml

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

tests/tests/build.rs

@@ -21,7 +21,6 @@ macro_rules! gen_build_tests {
 }
 
 gen_build_tests! {
-    attributes,
     client_in_folder,
     client_init,
     csv_bug_145,