From 4fc1ea23880a88eeddba82f5adc167d6cfb7c0d2 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 12 Dec 2018 20:08:34 +0100
Subject: [PATCH 1/2] Move old types to sub-dir

---
 types/resolve-from/{ => v2}/index.d.ts            |  2 +-
 types/resolve-from/{ => v2}/resolve-from-tests.ts |  0
 types/resolve-from/{ => v2}/tsconfig.json         | 11 ++++++++---
 types/resolve-from/{ => v2}/tslint.json           |  0
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename types/resolve-from/{ => v2}/index.d.ts (88%)
 rename types/resolve-from/{ => v2}/resolve-from-tests.ts (100%)
 rename types/resolve-from/{ => v2}/tsconfig.json (73%)
 rename types/resolve-from/{ => v2}/tslint.json (100%)

diff --git a/types/resolve-from/index.d.ts b/types/resolve-from/v2/index.d.ts
similarity index 88%
rename from types/resolve-from/index.d.ts
rename to types/resolve-from/v2/index.d.ts
index da968fdaa8..d29d0c1676 100644
--- a/types/resolve-from/index.d.ts
+++ b/types/resolve-from/v2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for resolve-from
+// Type definitions for resolve-from 2.0
 // Project: https://github.com/sindresorhus/resolve-from
 // Definitions by: unional <https://github.com/unional>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/resolve-from/resolve-from-tests.ts b/types/resolve-from/v2/resolve-from-tests.ts
similarity index 100%
rename from types/resolve-from/resolve-from-tests.ts
rename to types/resolve-from/v2/resolve-from-tests.ts
diff --git a/types/resolve-from/tsconfig.json b/types/resolve-from/v2/tsconfig.json
similarity index 73%
rename from types/resolve-from/tsconfig.json
rename to types/resolve-from/v2/tsconfig.json
index b1d826c64c..d9f3015659 100644
--- a/types/resolve-from/tsconfig.json
+++ b/types/resolve-from/v2/tsconfig.json
@@ -8,10 +8,15 @@
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
+        "paths": {
+            "resolve-from": [
+                "resolve-from/v2"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
@@ -20,4 +25,4 @@
         "index.d.ts",
         "resolve-from-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/resolve-from/tslint.json b/types/resolve-from/v2/tslint.json
similarity index 100%
rename from types/resolve-from/tslint.json
rename to types/resolve-from/v2/tslint.json

From 855c9defd9aa92ece0dcf0b63aea14e769ce59f9 Mon Sep 17 00:00:00 2001
From: Dimitri Benin <dimitri.benin@gmail.com>
Date: Wed, 12 Dec 2018 20:13:22 +0100
Subject: [PATCH 2/2] Add types for resolve-from v4

---
 types/resolve-from/index.d.ts            | 13 +++++++++++++
 types/resolve-from/resolve-from-tests.ts |  6 ++++++
 types/resolve-from/tsconfig.json         | 23 +++++++++++++++++++++++
 types/resolve-from/tslint.json           |  3 +++
 4 files changed, 45 insertions(+)
 create mode 100644 types/resolve-from/index.d.ts
 create mode 100644 types/resolve-from/resolve-from-tests.ts
 create mode 100644 types/resolve-from/tsconfig.json
 create mode 100644 types/resolve-from/tslint.json

diff --git a/types/resolve-from/index.d.ts b/types/resolve-from/index.d.ts
new file mode 100644
index 0000000000..9715d3ed25
--- /dev/null
+++ b/types/resolve-from/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for resolve-from 4.0
+// Project: https://github.com/sindresorhus/resolve-from
+// Definitions by: unional <https://github.com/unional>
+//                 BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = resolveFrom;
+
+declare function resolveFrom(fromDir: string, moduleId: string): string;
+
+declare namespace resolveFrom {
+    function silent(fromDir: string, moduleId: string): string | null;
+}
diff --git a/types/resolve-from/resolve-from-tests.ts b/types/resolve-from/resolve-from-tests.ts
new file mode 100644
index 0000000000..dc645103ec
--- /dev/null
+++ b/types/resolve-from/resolve-from-tests.ts
@@ -0,0 +1,6 @@
+import resolveFrom = require("resolve-from");
+
+// $ExpectType string
+resolveFrom('foo', './bar');
+// $ExpectType string | null
+resolveFrom.silent('foo', './baz');
diff --git a/types/resolve-from/tsconfig.json b/types/resolve-from/tsconfig.json
new file mode 100644
index 0000000000..790d2f09ee
--- /dev/null
+++ b/types/resolve-from/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "resolve-from-tests.ts"
+    ]
+}
diff --git a/types/resolve-from/tslint.json b/types/resolve-from/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/resolve-from/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}