From d617496f921a3f87fae94a969033595fb49dda74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20=C3=81lvarez?= Date: Mon, 10 Mar 2025 15:18:29 +0100 Subject: [PATCH] Put erlang_target back --- compiler-core/src/build.rs | 2 -- compiler-core/src/config.rs | 6 +++++- ...leam_core__config__barebones_package_config_to_json.snap | 2 +- .../gleam_core__config__package_config_to_json.snap | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/compiler-core/src/build.rs b/compiler-core/src/build.rs index 0801a16fb6b..7eb7d37a466 100644 --- a/compiler-core/src/build.rs +++ b/compiler-core/src/build.rs @@ -42,7 +42,6 @@ use strum::{Display, EnumIter, EnumString, EnumVariantNames, VariantNames}; use vec1::Vec1; #[derive( - Default, Debug, Serialize, Deserialize, @@ -59,7 +58,6 @@ use vec1::Vec1; pub enum Target { #[strum(serialize = "erlang", serialize = "erl")] #[serde(rename = "erlang", alias = "erl")] - #[default] Erlang, #[strum(serialize = "javascript", serialize = "js")] #[serde(rename = "javascript", alias = "js")] diff --git a/compiler-core/src/config.rs b/compiler-core/src/config.rs index 3b23f22f2b5..22da9ce4ce4 100644 --- a/compiler-core/src/config.rs +++ b/compiler-core/src/config.rs @@ -25,6 +25,10 @@ fn default_version() -> Version { Version::parse("0.1.0").expect("default version") } +fn erlang_target() -> Target { + Target::Erlang +} + fn default_javascript_runtime() -> Runtime { Runtime::NodeJs } @@ -117,7 +121,7 @@ pub struct PackageConfig { pub erlang: ErlangConfig, #[serde(default, skip_serializing_if = "is_default")] pub javascript: JavaScriptConfig, - #[serde(default, skip_serializing_if = "is_default")] + #[serde(default = "erlang_target")] pub target: Target, #[serde(default, skip_serializing_if = "is_default")] pub internal_modules: Option>, diff --git a/compiler-core/src/snapshots/gleam_core__config__barebones_package_config_to_json.snap b/compiler-core/src/snapshots/gleam_core__config__barebones_package_config_to_json.snap index 9da43ab732c..d2617cccd16 100644 --- a/compiler-core/src/snapshots/gleam_core__config__barebones_package_config_to_json.snap +++ b/compiler-core/src/snapshots/gleam_core__config__barebones_package_config_to_json.snap @@ -2,4 +2,4 @@ source: compiler-core/src/config.rs expression: json --- -{"name":"my_project","version":"1.0.0"} +{"name":"my_project","version":"1.0.0","target":"erlang"} diff --git a/compiler-core/src/snapshots/gleam_core__config__package_config_to_json.snap b/compiler-core/src/snapshots/gleam_core__config__package_config_to_json.snap index 80728ab0ef4..11f3f1b2872 100644 --- a/compiler-core/src/snapshots/gleam_core__config__package_config_to_json.snap +++ b/compiler-core/src/snapshots/gleam_core__config__package_config_to_json.snap @@ -2,4 +2,4 @@ source: compiler-core/src/config.rs expression: json --- -{"name":"my_project","version":"1.0.0","gleam":">= 0.30.0","licences":["Apache-2.0","MIT"],"description":"Pretty complex config","documentation":{"pages":[{"title":"My Page","path":"my-page.html","source":"./path/to/my-page.md"}]},"dependencies":{"my_other_project":{"path":"../my_other_project"},"gleam_stdlib":{"version":">= 0.18.0 and < 2.0.0"}},"dev-dependencies":{"gleeunit":{"version":">= 1.0.0 and < 2.0.0"}},"repository":{"type":"github","user":"example","repo":"my_dep"},"links":[{"title":"Home page","href":"https://example.com/"}],"erlang":{"application_start_module":"my_app/application","extra_applications":["inets","ssl"]},"javascript":{"typescript_declarations":true,"runtime":"nodejs","deno":{"allow_env":["DATABASE_URL"],"allow_net":["example.com:443"],"allow_ffi":true,"allow_read":["./database.sqlite"]}},"internal_modules":["my_app/internal"]} +{"name":"my_project","version":"1.0.0","gleam":">= 0.30.0","licences":["Apache-2.0","MIT"],"description":"Pretty complex config","documentation":{"pages":[{"title":"My Page","path":"my-page.html","source":"./path/to/my-page.md"}]},"dependencies":{"gleam_stdlib":{"version":">= 0.18.0 and < 2.0.0"},"my_other_project":{"path":"../my_other_project"}},"dev-dependencies":{"gleeunit":{"version":">= 1.0.0 and < 2.0.0"}},"repository":{"type":"github","user":"example","repo":"my_dep"},"links":[{"title":"Home page","href":"https://example.com/"}],"erlang":{"application_start_module":"my_app/application","extra_applications":["inets","ssl"]},"javascript":{"typescript_declarations":true,"runtime":"nodejs","deno":{"allow_env":["DATABASE_URL"],"allow_net":["example.com:443"],"allow_ffi":true,"allow_read":["./database.sqlite"]}},"target":"erlang","internal_modules":["my_app/internal"]}