diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9144d548b..47732401b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -86,7 +86,8 @@ -h, --help Print help ``` - For example, if the root project (`project_a`) depends on `package_b` and `package_c`, and `package_c` also depends on `package_b`, the output will be: + For example, if the root project (`project_a`) depends on `package_b` and + `package_c`, and `package_c` also depends on `package_b`, the output will be: ```markdown @@ -113,6 +114,11 @@ ([Ramkarthik Krishnamurthy](https://github.com/ramkarthik)) +- The build tool now checks for modules that would collide with the new Erlang + `json` module in addition to the existing Erlang modules it already checked + for. + ([Louis Pilfold](https://github.com/lpil)) + ### Language server - The language server can now generate the definition of functions that do not diff --git a/compiler-core/src/build/package_loader.rs b/compiler-core/src/build/package_loader.rs index dab30a44123..511ebc36f23 100644 --- a/compiler-core/src/build/package_loader.rs +++ b/compiler-core/src/build/package_loader.rs @@ -881,6 +881,7 @@ fn ensure_gleam_module_does_not_overwrite_standard_erlang_module(input: &Input) | "io_lib_format" | "io_lib_fread" | "io_lib_pretty" + | "json" | "kernel" | "kernel_config" | "kernel_refc"