[pull] master from DefinitelyTyped:master

.github/CODEOWNERS

@@ -1600,7 +1600,7 @@
 /types/draco3d/                                         @donmccurdy @horizon0514
 /types/draco3dgltf/                                     @donmccurdy
 /types/draft-convert/                                   @avaleriani @vadim-ch
-/types/draft-js/                                        @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar @sulf @pablopunk @claudiopro @khawkinson @PeterDekkers @ankitr
+/types/draft-js/                                        @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar @sulf @pablopunk @khawkinson @PeterDekkers @ankitr
 /types/draftjs-to-html/                                 @1cheese
 /types/drag-controls/                                   @MGHawes
 /types/drag-timetable/                                  @chinkan
@@ -3220,7 +3220,6 @@
 /types/html-escaper/                                    @panManfredini
 /types/html-minifier/                                   @tkrotoff @peterblazejewicz
 /types/html-minifier/v1/                                @tkrotoff
-/types/html-minifier-next/                              @orpheus6678
 /types/html-minifier-terser/                            @peterblazejewicz
 /types/html-parser/                                     @maxbogus
 /types/html-pdf/                                        @westy92
@@ -5600,7 +5599,6 @@
 /types/password-hash/                                   @mugeso
 /types/password-hash-and-salt/                          @alitaheri
 /types/path-browserify/                                 @Methuselah96
-/types/path-complete-extname/                           @melangue
 /types/path-is-absolute/                                @mhegazy
 /types/path-is-inside/                                  @aomarks
 /types/path-regex/                                      @BendingBender
@@ -6246,7 +6244,6 @@
 /types/react-gamepad/                                   @eventualbuddha
 /types/react-gateway/                                   @jsonunger
 /types/react-gauge-chart/                               @meirkl
-/types/react-geocode/                                   @stevemu
 /types/react-geosuggest/                                @brmenchl
 /types/react-github-button/                             @ifiokjr
 /types/react-global-configuration/                      @ryokik

types/ali-oss/ali-oss-tests.ts

@@ -22,6 +22,42 @@ const clusterClient = new OSS.ClusterClient(clusterOptions);
 
 clusterClient.deleteMulti(["cluster"], { quiet: true });
 
+// $ExpectType string
+clusterClient.signatureUrl("ossdemo.txt", {
+    expires: 3600,
+    response: { "content-type": "text/custom", "content-disposition": "attachment" },
+}, false);
+
+// $ExpectType Promise<string>
+clusterClient.asyncSignatureUrl("ossdemo.txt", {
+    expires: 3600,
+    response: { "content-type": "text/custom", "content-disposition": "attachment" },
+}, false);
+
+// $ExpectType Promise<string>
+clusterClient.signatureUrlV4("GET", 60, undefined, "your object name");
+
+// $ExpectType Promise<string>
+clusterClient.signatureUrlV4(
+    "GET",
+    60,
+    { headers: { "Cache-Control": "no-cache" }, queries: { versionId: "version ID of your object" } },
+    "your object name",
+    ["Cache-Control"],
+);
+
+// $ExpectType Promise<string>
+clusterClient.signatureUrlV4("PUT", 60, undefined, "your object name");
+
+// $ExpectType Promise<string>
+clusterClient.signatureUrlV4(
+    "PUT",
+    60,
+    { headers: { "Content-Type": "text/plain", "Content-MD5": "xxx", "Content-Length": 1 } },
+    "your obejct name",
+    ["Content-Length"],
+);
+
 const imageOptions: OSS.ImageClientOptions = {
     imageHost: "xxxx",
     accessKeyId: "xxxx",

types/ali-oss/index.d.ts

@@ -693,9 +693,24 @@ declare namespace OSS {
 
         deleteMulti(names: string[], options?: DeleteMultiOptions): Promise<DeleteMultiResult>;
 
-        signatureUrl(name: string, options?: SignatureUrlOptions): string;
+        signatureUrl(name: string, options?: SignatureUrlOptions, strictObjectNameValidation?: boolean): string;
+
+        signatureUrlV4(
+            method: HTTPMethods,
+            expires: number,
+            request?: {
+                headers?: object | undefined;
+                queries?: object | undefined;
+            },
+            objectName?: string,
+            additionalHeaders?: string[],
+        ): Promise<string>;
 
-        asyncSignatureUrl(name: string, options?: SignatureUrlOptions): Promise<string>;
+        asyncSignatureUrl(
+            name: string,
+            options?: SignatureUrlOptions,
+            strictObjectNameValidation?: boolean,
+        ): Promise<string>;
 
         putACL(name: string, acl: ACLType, options?: RequestOptions): Promise<NormalSuccessResponse>;
 

types/blocked/index.d.ts

@@ -10,7 +10,7 @@
 
 export = Blocked;
 
-declare function Blocked(callback: (ms: number) => void, options?: Blocked.Options): NodeJS.Timer;
+declare function Blocked(callback: (ms: number) => void, options?: Blocked.Options): NodeJS.Timeout;
 
 declare namespace Blocked {
     interface Options {