From 050b6d468085ac7ea02598537cbe8c1a863dc6e0 Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Tue, 10 Oct 2023 20:04:52 +0900 Subject: [PATCH 1/2] add `Deno` as a reserved name --- jscomp/ext/js_reserved_map.ml | 1 + scripts/build_reserved.ml | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jscomp/ext/js_reserved_map.ml b/jscomp/ext/js_reserved_map.ml index 21cef5b3bf..c60bea0975 100644 --- a/jscomp/ext/js_reserved_map.ml +++ b/jscomp/ext/js_reserved_map.ml @@ -169,6 +169,7 @@ let sorted_keywords = [| "DecompressionStream"; "DelayNode"; "DelegatedInkTrailPresenter"; + "Deno"; "Document"; "DocumentFragment"; "DocumentPictureInPictureEvent"; diff --git a/scripts/build_reserved.ml b/scripts/build_reserved.ml index 148117ee65..6e5103a1e9 100644 --- a/scripts/build_reserved.ml +++ b/scripts/build_reserved.ml @@ -24,7 +24,7 @@ let reserved_words = [| - (* keywork *) + (* keywords *) "break"; "case"; "catch"; "continue"; "debugger";"default";"delete";"do"; @@ -130,7 +130,10 @@ "__esModule"; (* Bun global obj *) - "Bun" + "Bun"; + + (* Deno global obj *) + "Deno"; |] From eb18d237f4acdd33bc87f416bf55e99cf5381991 Mon Sep 17 00:00:00 2001 From: Hyeseong Kim Date: Wed, 11 Oct 2023 03:17:39 +0900 Subject: [PATCH 2/2] [skip ci] add CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b46fc57ec5..c04cfd6268 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ # 11.0.0-rc.5 (Unreleased) +#### :nail_care: Polish + +- Add [`Deno`](https://deno.land/api?s=Deno) to reserved names, so that modules named `Deno` don't clash with the globally exposed `Deno` object. https://github.com/rescript-lang/rescript-compiler/pull/6428 + # 11.0.0-rc.4 #### :rocket: New Feature