[pull] master from DefinitelyTyped:master

types/toastr/index.d.ts

@@ -355,7 +355,7 @@ interface Toastr {
     subscribe: (callback: (response: ToastrResponse) => void) => void;
 }
 
-declare var toastr: Toastr;
-declare module "toastr" {
-    export = toastr;
-}
+declare const toastr: Toastr;
+
+export = toastr;
+export as namespace toastr;

types/toastr/toastr-global-module-tests.ts

@@ -0,0 +1,10 @@
+// This file has no imports, so use a dummy export to mark this file as a module.
+export {};
+
+// @ts-expect-error - UMD global usage should be prohibited inside modules
+toastr.success("Module files should import toastr explicitly.");
+
+// Explicit global access remains available for script-tag consumers.
+const globalToast: JQuery = globalThis.toastr.success("The UMD value is available on the global object.");
+globalThis.toastr.options.closeButton = true;
+globalThis.toastr.clear(globalToast);

types/toastr/toastr-tests.ts

@@ -1,3 +1,7 @@
+import toastr = require("toastr");
+
+type ToastrOptions = typeof toastr.options;
+
 declare let displayMethodStr: "success" | "info" | "warning" | "error";
 declare let undefinedVal: undefined;
 declare let booleanVal: boolean;

types/toastr/tsconfig.json

@@ -15,6 +15,7 @@
     },
     "files": [
         "index.d.ts",
-        "toastr-tests.ts"
+        "toastr-tests.ts",
+        "toastr-global-module-tests.ts"
     ]
 }