rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-23 22:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept .luau files (#552)

Browse Source 
* accept .luau files

* Accept .luau in snapshot creation

* Update versioning and snapshots.

* fix versioning

* Run rustfmt

* Reduce repetition in extension detection

* Tidy build script change

Co-authored-by: Lucien Greathouse <me@lpghatguy.com>
This commit is contained in:
Samuel P
2022-06-29 16:53:10 -06:00
committed by GitHub
parent 8ea41480b7
commit acf7456371
7 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/snapshot_middleware/mod.rs
View File

@@ -57,16 +57,31 @@ 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);
@@ -74,7 +89,11 @@ pub fn snapshot_from_vfs(
snapshot_dir(context, vfs, path)
} else {
if let Ok(name) = path.file_name_trim_end(".lua") {
let script_name = path
.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.