Merge pull request mjmlio#47 from ivank/mjml-config-path

Add a setting for custom config files

README.md

@@ -80,6 +80,7 @@ The following command is available:
 | `mjml.templateGallery` | `false` | Show the template gallery instead of quick pick. |
 | `mjml.templateGalleryAutoClose` | `true` | Automatically close template gallery when selecting a template. |
 | `mjml.switchOnSeparateFileChange` | `true` | Automatically switch previews when editing a different file. |
+| `mjml.mjmlConfigPath` | ` ` | The path or directory of the .mjmlconfig (or .mjmlconfig.js) file (for custom components use) |
 
 
 ## Snippets

package.json

@@ -202,6 +202,11 @@
           "default": true,
           "description": "Automatically switch previews when editing a different file.",
           "type": "boolean"
+        },
+        "mjml.mjmlConfigPath": {
+          "default": "",
+          "description": "The path or directory of the .mjmlconfig (or .mjmlconfig.js) file (for custom components use)",
+          "type": "string"
         }
       }
     },

src/helper.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync, statSync } from 'fs'
-import { basename, dirname, join as joinPath, parse as parsePath } from 'path'
+import { basename, dirname, join as joinPath, parse as parsePath, isAbsolute } from 'path'
 import { TextDocument, TextEditor, window, workspace } from 'vscode'
 
 import { html as jsBeautify } from 'js-beautify'
@@ -27,6 +27,9 @@ export function renderMJML(
         activeTextEditor.document.getText(),
         minify !== undefined ? minify : workspace.getConfiguration('mjml').minifyHtmlOutput,
         beautify !== undefined ? beautify : workspace.getConfiguration('mjml').beautifyHtmlOutput,
+        undefined,
+        'skip',
+        workspace.getConfiguration('mjml').mjmlConfigPath,
     ).html
 
     if (content) {
@@ -53,6 +56,7 @@ export function mjmlToHtml(
     beautify: boolean,
     path?: string,
     validation: 'strict' | 'soft' | 'skip' = 'skip',
+    mjmlConfigPath?: string,
 ): { html: string; errors: any[] } {
     try {
         if (!path) {
@@ -63,7 +67,11 @@ export function mjmlToHtml(
             beautify,
             filePath: path,
             minify,
-            mjmlConfigPath: getCWD(path),
+            mjmlConfigPath: mjmlConfigPath
+                ? isAbsolute(mjmlConfigPath)
+                    ? mjmlConfigPath
+                    : joinPath(getCWD(path), mjmlConfigPath)
+                : getCWD(path),
             validationLevel: validation,
         })
     } catch (error) {
@@ -107,7 +115,7 @@ export function beautifyHTML(mjml: string): string | undefined {
 
         return beautified
     } catch (error) {
-        window.showErrorMessage(error)
+        window.showErrorMessage(error as string)
 
         return
     }

src/linter.ts

@@ -84,6 +84,7 @@ export default class Linter {
                 false,
                 getPath(),
                 'strict',
+                workspace.getConfiguration('mjml').mjmlConfigPath
             ).errors
 
             if (errors && errors[0]) {

src/preview.ts

@@ -135,6 +135,7 @@ export default class Preview {
             false,
             document.uri.fsPath,
             'skip',
+            workspace.getConfiguration('mjml').mjmlConfigPath
         ).html
 
         if (html) {