From f2bb28cbd8dbe5194efbc59b0a0d1b6e0d963dd9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Tue, 26 Nov 2019 08:48:55 -0800
Subject: [PATCH] cldrjs: make directory structure match source (#40664)

Move supplemental files into cldr/ subdirectory.

Also make the test reference supplemental instead of relying on it being
in the global namespace.
---
 types/cldrjs/OTHER_FILES.txt                                  | 2 +-
 types/cldrjs/{cldr.js-event.d.ts => cldr/event.d.ts}          | 0
 .../{cldr.js-supplemental.d.ts => cldr/supplemental.d.ts}     | 0
 types/cldrjs/test/supplemental.ts                             | 4 ++--
 types/cldrjs/tsconfig.json                                    | 4 ++--
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename types/cldrjs/{cldr.js-event.d.ts => cldr/event.d.ts} (100%)
 rename types/cldrjs/{cldr.js-supplemental.d.ts => cldr/supplemental.d.ts} (100%)

diff --git a/types/cldrjs/OTHER_FILES.txt b/types/cldrjs/OTHER_FILES.txt
index 0d87e1fc30..930c01fa1c 100644
--- a/types/cldrjs/OTHER_FILES.txt
+++ b/types/cldrjs/OTHER_FILES.txt
@@ -1 +1 @@
-cldr.js-event.d.ts
+cldr/event.d.ts
diff --git a/types/cldrjs/cldr.js-event.d.ts b/types/cldrjs/cldr/event.d.ts
similarity index 100%
rename from types/cldrjs/cldr.js-event.d.ts
rename to types/cldrjs/cldr/event.d.ts
diff --git a/types/cldrjs/cldr.js-supplemental.d.ts b/types/cldrjs/cldr/supplemental.d.ts
similarity index 100%
rename from types/cldrjs/cldr.js-supplemental.d.ts
rename to types/cldrjs/cldr/supplemental.d.ts
diff --git a/types/cldrjs/test/supplemental.ts b/types/cldrjs/test/supplemental.ts
index b0c5cf5fad..f90058397f 100644
--- a/types/cldrjs/test/supplemental.ts
+++ b/types/cldrjs/test/supplemental.ts
@@ -1,5 +1,5 @@
-
-
+import * as Cldr from "cldrjs";
+import "cldrjs/cldr/supplemental";
 
 const myCldr = new Cldr("en");
 
diff --git a/types/cldrjs/tsconfig.json b/types/cldrjs/tsconfig.json
index b17ea4c0a9..83679f89d6 100644
--- a/types/cldrjs/tsconfig.json
+++ b/types/cldrjs/tsconfig.json
@@ -19,9 +19,9 @@
     },
     "files": [
         "index.d.ts",
-        "cldr.js-supplemental.d.ts",
+        "cldr/supplemental.d.ts",
         "test/index.ts",
         "test/event.ts",
         "test/supplemental.ts"
     ]
-}
\ No newline at end of file
+}