Merge pull request #13776 from DefinitelyTyped/lint_format_unicorn

Convert format-unicorn types to external module style and include `safe.d.ts` in tsconfig

format-unicorn/format-unicorn-safe-tests.ts

@@ -1,5 +1,3 @@
-/// <reference path="format-unicorn-safe.d.ts"/>
-
 import formatUnicorn = require('format-unicorn/safe');
 
 // Safe version

format-unicorn/format-unicorn-safe.d.ts

@@ -1,12 +0,0 @@
-// Type definitions for format-unicorn
-// Project: https://github.com/tallesl/format-unicorn
-// Definitions by: kruncher <https://github.com/kruncher/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'format-unicorn/safe' {
-
-  function formatUnicornSafe(str: string, replacements: { }): string;
-
-  export = formatUnicornSafe;
-
-}

format-unicorn/index.d.ts

@@ -1,12 +1,8 @@
-// Type definitions for format-unicorn
+// Type definitions for format-unicorn 1.1
 // Project: https://github.com/tallesl/format-unicorn
 // Definitions by: kruncher <https://github.com/kruncher/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface String {
-  formatUnicorn(replacements: { }): string;
-}
-
-declare module "format-unicorn" {
-
+  formatUnicorn(replacements: {}): string;
 }

format-unicorn/safe.d.ts

@@ -0,0 +1,2 @@
+declare function formatUnicornSafe(str: string, replacements: { }): string;
+export = formatUnicornSafe;

format-unicorn/tsconfig.json

@@ -15,6 +15,8 @@
     },
     "files": [
         "index.d.ts",
-        "format-unicorn-tests.ts"
+        "safe.d.ts",
+        "format-unicorn-tests.ts",
+        "format-unicorn-safe-tests.ts"
     ]
 }

format-unicorn/tslint.json

@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }