From c128ba5cdb9c98c2d0ceed4f7ba3a65d9fe78de9 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 12 Dec 2018 01:02:54 +0100
Subject: [PATCH] move old version to v1 sub-dir

---
 types/conf/{ => v1}/conf-tests.ts | 10 +++++-----
 types/conf/{ => v1}/index.d.ts    |  0
 types/conf/{ => v1}/tsconfig.json | 11 ++++++++---
 types/conf/{ => v1}/tslint.json   |  0
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename types/conf/{ => v1}/conf-tests.ts (88%)
 rename types/conf/{ => v1}/index.d.ts (100%)
 rename types/conf/{ => v1}/tsconfig.json (76%)
 rename types/conf/{ => v1}/tslint.json (100%)

diff --git a/types/conf/conf-tests.ts b/types/conf/v1/conf-tests.ts
similarity index 88%
rename from types/conf/conf-tests.ts
rename to types/conf/v1/conf-tests.ts
index 1da0e4de2d..4ee492da8d 100644
--- a/types/conf/conf-tests.ts
+++ b/types/conf/v1/conf-tests.ts
@@ -4,18 +4,18 @@ const conf = new Conf<string | number | boolean>();
 new Conf<string>({
     defaults: {
         foo: 'bar',
-        unicorn: 'rainbow'
+        unicorn: 'rainbow',
     },
     configName: '',
     projectName: 'foo',
-    cwd: ''
+    cwd: '',
 });
 // $ExpectError
 new Conf<string>({
     defaults: {
         foo: 'bar',
-        unicorn: ['rainbow']
-    }
+        unicorn: ['rainbow'],
+    },
 });
 conf.set('foo', 'bar');
 conf.set('hello', 1);
@@ -31,7 +31,7 @@ conf.clear();
 
 conf.store = {
     foo: 'bar',
-    unicorn: 'rainbow'
+    unicorn: 'rainbow',
 };
 conf.path; // $ExpectType string
 
diff --git a/types/conf/index.d.ts b/types/conf/v1/index.d.ts
similarity index 100%
rename from types/conf/index.d.ts
rename to types/conf/v1/index.d.ts
diff --git a/types/conf/tsconfig.json b/types/conf/v1/tsconfig.json
similarity index 76%
rename from types/conf/tsconfig.json
rename to types/conf/v1/tsconfig.json
index 84d6bf7657..86b3a62f41 100644
--- a/types/conf/tsconfig.json
+++ b/types/conf/v1/tsconfig.json
@@ -9,10 +9,15 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+            "conf": [
+                "conf/v1"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -21,4 +26,4 @@
         "index.d.ts",
         "conf-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/conf/tslint.json b/types/conf/v1/tslint.json
similarity index 100%
rename from types/conf/tslint.json
rename to types/conf/v1/tslint.json