[pull] master from DefinitelyTyped:master

types/mjml-core/index.d.ts

@@ -65,6 +65,12 @@ export interface MJMLParsingOptions {
      * default: '.'
      */
     filePath?: string | undefined;
+    /**
+     * Directory (or directories) outside the template's own folder from which mj-include
+     * partials may be loaded. Added in mjml 5.1 as part of the include path-traversal hardening;
+     * includes resolving outside these allowed roots are denied.
+     */
+    includePath?: string | string[] | undefined;
     /**
      * The path or directory of the .mjmlconfig file
      * default: process.cwd()

types/mjml-core/mjml-core-tests.ts

@@ -10,6 +10,8 @@ async function tests() {
     const minimal_opts_test = await mjml2html("<mjml>", { beautify: true });
     const validation_level_test = await mjml2html("<mjml>", { validationLevel: "strict" });
     const filePath_test = await mjml2html("<mjml>", { filePath: "." });
+    const includePath_test = await mjml2html("<mjml>", { includePath: "./templates" });
+    const includePath_array_test = await mjml2html("<mjml>", { includePath: ["./templates", "./partials"] });
 
     const jsonObject = { tagName: "mjml", attributes: { width: "100px" }, content: "test content" };
     const jsonObject_test = await mjml2html(jsonObject);

types/mjml-core/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@types/mjml-core",
-    "version": "5.0.9999",
+    "version": "5.1.9999",
     "projects": [
         "https://mjml.io"
     ],