mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-23 05:51:39 +00:00
Fix init.plugin.lua/init.plugin.luau not being supported
This commit is contained in:
parent
628854c521
commit
01036fda35
4 changed files with 17 additions and 1 deletions
|
|
@ -74,6 +74,8 @@ pub fn snapshot_dir_no_meta(
|
||||||
normalized_path.join("init.server.luau"),
|
normalized_path.join("init.server.luau"),
|
||||||
normalized_path.join("init.client.lua"),
|
normalized_path.join("init.client.lua"),
|
||||||
normalized_path.join("init.client.luau"),
|
normalized_path.join("init.client.luau"),
|
||||||
|
normalized_path.join("init.plugin.lua"),
|
||||||
|
normalized_path.join("init.plugin.luau"),
|
||||||
normalized_path.join("init.csv"),
|
normalized_path.join("init.csv"),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,9 @@ pub fn snapshot_from_vfs(
|
||||||
// TODO: Is this even necessary anymore?
|
// TODO: Is this even necessary anymore?
|
||||||
match file_name {
|
match file_name {
|
||||||
"init.server.luau" | "init.server.lua" | "init.client.luau" | "init.client.lua"
|
"init.server.luau" | "init.server.lua" | "init.client.luau" | "init.client.lua"
|
||||||
| "init.luau" | "init.lua" | "init.csv" => return Ok(None),
|
| "init.plugin.luau" | "init.plugin.lua" | "init.luau" | "init.lua" | "init.csv" => {
|
||||||
|
return Ok(None)
|
||||||
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -124,6 +126,8 @@ fn get_dir_middleware<'path>(
|
||||||
(Middleware::ServerScriptDir, "init.server.lua"),
|
(Middleware::ServerScriptDir, "init.server.lua"),
|
||||||
(Middleware::ClientScriptDir, "init.client.luau"),
|
(Middleware::ClientScriptDir, "init.client.luau"),
|
||||||
(Middleware::ClientScriptDir, "init.client.lua"),
|
(Middleware::ClientScriptDir, "init.client.lua"),
|
||||||
|
(Middleware::PluginScriptDir, "init.plugin.lua"),
|
||||||
|
(Middleware::PluginScriptDir, "init.plugin.luau"),
|
||||||
(Middleware::CsvDir, "init.csv"),
|
(Middleware::CsvDir, "init.csv"),
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
@ -205,6 +209,8 @@ pub enum Middleware {
|
||||||
#[serde(skip_deserializing)]
|
#[serde(skip_deserializing)]
|
||||||
ClientScriptDir,
|
ClientScriptDir,
|
||||||
#[serde(skip_deserializing)]
|
#[serde(skip_deserializing)]
|
||||||
|
PluginScriptDir,
|
||||||
|
#[serde(skip_deserializing)]
|
||||||
ModuleScriptDir,
|
ModuleScriptDir,
|
||||||
#[serde(skip_deserializing)]
|
#[serde(skip_deserializing)]
|
||||||
CsvDir,
|
CsvDir,
|
||||||
|
|
@ -255,6 +261,9 @@ impl Middleware {
|
||||||
Self::ClientScriptDir => {
|
Self::ClientScriptDir => {
|
||||||
snapshot_lua_init(context, vfs, path, name, ScriptType::Client)
|
snapshot_lua_init(context, vfs, path, name, ScriptType::Client)
|
||||||
}
|
}
|
||||||
|
Self::PluginScriptDir => {
|
||||||
|
snapshot_lua_init(context, vfs, path, name, ScriptType::Plugin)
|
||||||
|
}
|
||||||
Self::ModuleScriptDir => {
|
Self::ModuleScriptDir => {
|
||||||
snapshot_lua_init(context, vfs, path, name, ScriptType::Module)
|
snapshot_lua_init(context, vfs, path, name, ScriptType::Module)
|
||||||
}
|
}
|
||||||
|
|
@ -297,6 +306,7 @@ impl Middleware {
|
||||||
Middleware::Dir => syncback_dir(snapshot),
|
Middleware::Dir => syncback_dir(snapshot),
|
||||||
Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
|
Middleware::ServerScriptDir => syncback_lua_init(ScriptType::Server, snapshot),
|
||||||
Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
|
Middleware::ClientScriptDir => syncback_lua_init(ScriptType::Client, snapshot),
|
||||||
|
Middleware::PluginScriptDir => syncback_lua_init(ScriptType::Plugin, snapshot),
|
||||||
Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
|
Middleware::ModuleScriptDir => syncback_lua_init(ScriptType::Module, snapshot),
|
||||||
Middleware::CsvDir => syncback_csv_init(snapshot),
|
Middleware::CsvDir => syncback_csv_init(snapshot),
|
||||||
|
|
||||||
|
|
@ -318,6 +328,7 @@ impl Middleware {
|
||||||
Middleware::Dir
|
Middleware::Dir
|
||||||
| Middleware::ServerScriptDir
|
| Middleware::ServerScriptDir
|
||||||
| Middleware::ClientScriptDir
|
| Middleware::ClientScriptDir
|
||||||
|
| Middleware::PluginScriptDir
|
||||||
| Middleware::ModuleScriptDir
|
| Middleware::ModuleScriptDir
|
||||||
| Middleware::CsvDir
|
| Middleware::CsvDir
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ pub fn name_for_inst<'old>(
|
||||||
| Middleware::CsvDir
|
| Middleware::CsvDir
|
||||||
| Middleware::ServerScriptDir
|
| Middleware::ServerScriptDir
|
||||||
| Middleware::ClientScriptDir
|
| Middleware::ClientScriptDir
|
||||||
|
| Middleware::PluginScriptDir
|
||||||
| Middleware::ModuleScriptDir => Cow::Owned(new_inst.name.clone()),
|
| Middleware::ModuleScriptDir => Cow::Owned(new_inst.name.clone()),
|
||||||
_ => {
|
_ => {
|
||||||
let extension = extension_for_middleware(middleware);
|
let extension = extension_for_middleware(middleware);
|
||||||
|
|
@ -78,6 +79,7 @@ pub fn extension_for_middleware(middleware: Middleware) -> &'static str {
|
||||||
| Middleware::CsvDir
|
| Middleware::CsvDir
|
||||||
| Middleware::ServerScriptDir
|
| Middleware::ServerScriptDir
|
||||||
| Middleware::ClientScriptDir
|
| Middleware::ClientScriptDir
|
||||||
|
| Middleware::PluginScriptDir
|
||||||
| Middleware::ModuleScriptDir => {
|
| Middleware::ModuleScriptDir => {
|
||||||
unimplemented!("directory middleware requires special treatment")
|
unimplemented!("directory middleware requires special treatment")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -359,6 +359,7 @@ pub fn get_best_middleware(snapshot: &SyncbackSnapshot) -> Middleware {
|
||||||
middleware = match middleware {
|
middleware = match middleware {
|
||||||
Middleware::ServerScript => Middleware::ServerScriptDir,
|
Middleware::ServerScript => Middleware::ServerScriptDir,
|
||||||
Middleware::ClientScript => Middleware::ClientScriptDir,
|
Middleware::ClientScript => Middleware::ClientScriptDir,
|
||||||
|
Middleware::PluginScript => Middleware::PluginScriptDir,
|
||||||
Middleware::ModuleScript => Middleware::ModuleScriptDir,
|
Middleware::ModuleScript => Middleware::ModuleScriptDir,
|
||||||
Middleware::Csv => Middleware::CsvDir,
|
Middleware::Csv => Middleware::CsvDir,
|
||||||
Middleware::JsonModel | Middleware::Text => Middleware::Dir,
|
Middleware::JsonModel | Middleware::Text => Middleware::Dir,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue