From fb1c996762a2d64399dc47c04c0675f391f0bfab Mon Sep 17 00:00:00 2001
From: Dimitri Benin <BendingBender@users.noreply.github.com>
Date: Sun, 18 Nov 2018 19:45:32 +0000
Subject: [PATCH] add types for merge-env (#30629)

---
 types/merge-env/index.d.ts         |  9 +++++++++
 types/merge-env/merge-env-tests.ts |  3 +++
 types/merge-env/tsconfig.json      | 23 +++++++++++++++++++++++
 types/merge-env/tslint.json        |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 types/merge-env/index.d.ts
 create mode 100644 types/merge-env/merge-env-tests.ts
 create mode 100644 types/merge-env/tsconfig.json
 create mode 100644 types/merge-env/tslint.json

diff --git a/types/merge-env/index.d.ts b/types/merge-env/index.d.ts
new file mode 100644
index 0000000000..3318b8328f
--- /dev/null
+++ b/types/merge-env/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for merge-env 1.0
+// Project: https://github.com/bholloway/merge-env
+// Definitions by: BendingBender <https://github.com/BendingBender>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = mergeEnv;
+
+declare function mergeEnv(target: object, ...sources: any[]): any;
diff --git a/types/merge-env/merge-env-tests.ts b/types/merge-env/merge-env-tests.ts
new file mode 100644
index 0000000000..26ad7ecc05
--- /dev/null
+++ b/types/merge-env/merge-env-tests.ts
@@ -0,0 +1,3 @@
+import mergeEnv = require("merge-env");
+
+const mergedConfiguration = mergeEnv({}, {}, {});
diff --git a/types/merge-env/tsconfig.json b/types/merge-env/tsconfig.json
new file mode 100644
index 0000000000..a058625dcb
--- /dev/null
+++ b/types/merge-env/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",
+        "merge-env-tests.ts"
+    ]
+}
diff --git a/types/merge-env/tslint.json b/types/merge-env/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/merge-env/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }