From b560246f30066f9835633764837e99ff3adcf53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 18 Oct 2022 13:20:11 +0200
Subject: [PATCH] fix: move generated napi symbols to cli/ (#16330)

<!--
Before submitting a PR, please read http://deno.land/manual/contributing

1. Give the PR a descriptive title.

  Examples of good title:
    - fix(std/http): Fix race condition in server
    - docs(console): Update docstrings
    - feat(doc): Handle nested reexports

  Examples of bad title:
    - fix #7123
    - update docs
    - fix bugs

2. Ensure there is a related issue and it is referenced in the PR text.
3. Ensure there are tests that cover the changes.
4. Ensure `cargo test` passes.
5. Ensure `./tools/format.js` passes without changing files.
6. Ensure `./tools/lint.js` passes.
-->
---
 cli/build.rs                                                | 6 +-----
 cli/{napi_sym => }/generated_symbol_exports_list_linux.def  | 0
 cli/{napi_sym => }/generated_symbol_exports_list_macos.def  | 0
 .../generated_symbol_exports_list_windows.def               | 0
 tools/napi/generate_symbols_lists.js                        | 2 +-
 5 files changed, 2 insertions(+), 6 deletions(-)
 rename cli/{napi_sym => }/generated_symbol_exports_list_linux.def (100%)
 rename cli/{napi_sym => }/generated_symbol_exports_list_macos.def (100%)
 rename cli/{napi_sym => }/generated_symbol_exports_list_windows.def (100%)

diff --git a/cli/build.rs b/cli/build.rs
index 48af791012..98d044a3e9 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -333,11 +333,7 @@ fn main() {
   }
 
   let symbols_path = std::path::Path::new(
-    format!(
-      "napi_sym/generated_symbol_exports_list_{}.def",
-      env::consts::OS
-    )
-    .as_str(),
+    format!("generated_symbol_exports_list_{}.def", env::consts::OS).as_str(),
   )
   .canonicalize()
   .expect(
diff --git a/cli/napi_sym/generated_symbol_exports_list_linux.def b/cli/generated_symbol_exports_list_linux.def
similarity index 100%
rename from cli/napi_sym/generated_symbol_exports_list_linux.def
rename to cli/generated_symbol_exports_list_linux.def
diff --git a/cli/napi_sym/generated_symbol_exports_list_macos.def b/cli/generated_symbol_exports_list_macos.def
similarity index 100%
rename from cli/napi_sym/generated_symbol_exports_list_macos.def
rename to cli/generated_symbol_exports_list_macos.def
diff --git a/cli/napi_sym/generated_symbol_exports_list_windows.def b/cli/generated_symbol_exports_list_windows.def
similarity index 100%
rename from cli/napi_sym/generated_symbol_exports_list_windows.def
rename to cli/generated_symbol_exports_list_windows.def
diff --git a/tools/napi/generate_symbols_lists.js b/tools/napi/generate_symbols_lists.js
index 0b43171702..c9a5bca3ec 100755
--- a/tools/napi/generate_symbols_lists.js
+++ b/tools/napi/generate_symbols_lists.js
@@ -17,7 +17,7 @@ const symbolExportLists = {
 
 for await (const [os, def] of Object.entries(symbolExportLists)) {
   const defUrl = new URL(
-    `../../cli/napi_sym/generated_symbol_exports_list_${os}.def`,
+    `../../cli/generated_symbol_exports_list_${os}.def`,
     import.meta.url,
   );
   await Deno.writeTextFile(defUrl.pathname, def, { create: true });