@maizzle/framework 5.0.0-beta.16 → 5.0.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maizzle/framework",
-  "version": "5.0.0-beta.16",
+  "version": "5.0.0-beta.18",
   "description": "Maizzle is a framework that helps you quickly build HTML emails with Tailwind CSS.",
   "license": "MIT",
   "type": "module",

package/src/generators/render.js

@@ -60,8 +60,6 @@ export async function render(html = '', config = {}) {
    * @param {string} options.html - The HTML to be transformed
    * @param {Object} options.matter - The front matter data
    * @param {Object} options.config - The current template config
-   * @param {function} options.posthtml - The PostHTML compiler
-   * @param {Object} options.transform - The transformers object
    * @returns {string} - The transformed HTML, or the original one if nothing was returned
    */
   if (typeof templateConfig.beforeRender === 'function') {
@@ -69,7 +67,6 @@ export async function render(html = '', config = {}) {
       html: content,
       matter: matterData,
       config: templateConfig,
-      posthtml: compilePostHTML,
     })) ?? content
   }
 
@@ -83,8 +80,6 @@ export async function render(html = '', config = {}) {
    * @param {string} options.html - The HTML to be transformed
    * @param {Object} options.matter - The front matter data
    * @param {Object} options.config - The current template config
-   * @param {function} options.posthtml - The PostHTML compiler
-   * @param {Object} options.transform - The transformers object
    * @returns {string} - The transformed HTML, or the original one if nothing was returned
    */
   if (typeof templateConfig.afterRender === 'function') {
@@ -92,7 +87,6 @@ export async function render(html = '', config = {}) {
       html: compiled.html,
       matter: matterData,
       config: templateConfig,
-      posthtml: compilePostHTML,
     })) ?? compiled.html
   }
 
@@ -118,8 +112,6 @@ export async function render(html = '', config = {}) {
    * @param {string} options.html - The HTML to be transformed
    * @param {Object} options.matter - The front matter data
    * @param {Object} options.config - The current template config
-   * @param {function} options.posthtml - The PostHTML compiler
-   * @param {Object} options.transform - The transformers object
    * @returns {string} - The transformed HTML, or the original one if nothing was returned
    */
   if (typeof templateConfig.afterTransformers === 'function') {
@@ -127,7 +119,6 @@ export async function render(html = '', config = {}) {
       html: compiled.html,
       matter: matterData,
       config: templateConfig,
-      posthtml: compilePostHTML,
     })) ?? compiled.html
   }
 

package/src/posthtml/index.js

@@ -63,7 +63,7 @@ export async function process(html = '', config = {}) {
           },
         ),
       },
-      get(config, 'build.fetch', {})
+      get(config, 'fetch', {})
     )
   )
 
@@ -87,6 +87,8 @@ export async function process(html = '', config = {}) {
     ),
     expandLinkTag,
     postcssPlugin,
+    envTags(config.env),
+    envAttributes(config.env),
     ...get(config, 'posthtml.plugins.after', get(config, 'posthtml.plugins', []))
   ])
     .process(html, posthtmlOptions)

package/src/transformers/index.js

@@ -178,21 +178,6 @@ export async function run(html = '', config = {}) {
     posthtmlPlugins.push(
       baseUrl(get(config, 'baseURL', get(config, 'baseUrl', {})))
     )
-  } else {
-    /**
-     * Set baseURL to `build.static.destination` if it's not already set.
-     */
-    const destination = get(config, 'build.static.destination', '')
-    if (destination && !config._dev) {
-      posthtmlPlugins.push(
-        baseUrl({
-          url: destination,
-          allTags: true,
-          styleTag: true,
-          inlineCss: true,
-        })
-      )
-    }
   }
 
   /**

package/src/transformers/replaceStrings.js

@@ -15,9 +15,11 @@ const posthtmlPlugin = (replacements = {}) => tree => {
       render(tree).replace(patterns, matched => {
         for (const [regex, replacement] of regexes) {
           if (regex.test(matched)) {
-            return replacement
+            return matched.replace(regex, replacement)
           }
         }
+
+        return matched
       }),
       defaultPostHTMLConfig
     )

package/types/config.d.ts

@@ -12,6 +12,7 @@ import type WidowWordsConfig from './widowWords';
 import type { CoreBeautifyOptions } from 'js-beautify';
 import type { BaseURLConfig } from 'posthtml-base-url';
 import type URLParametersConfig from './urlParameters';
+import type { PostHTMLFetchConfig } from 'posthtml-fetch';
 import type { PostHTMLComponents } from 'posthtml-component';
 
 import type { Config as TailwindConfig } from 'tailwindcss';
@@ -169,6 +170,11 @@ export default interface Config {
     tailwind?: TailwindConfig;
   }
 
+  /**
+   * Configure the [`<fetch>`](https://maizzle.com/docs/tags#fetch) tag.
+   */
+  fetch?: PostHTMLFetchConfig;
+
   /**
    * Transform text inside elements marked with custom attributes.
    * Filters work only on elements that contain only text.

package/types/events.d.ts

@@ -1,7 +1,5 @@
 import type Config from "./config";
 
-type PostHTMLType = (html: string, config: Config) => { html: string; config: Config };
-
 export default interface Events {
   /**
   * Runs after the Environment config has been computed, but before Templates are processed.
@@ -18,7 +16,12 @@ export default interface Events {
   * }
   * ```
   */
-  beforeCreate?: (params: { config: Config }) => void | Promise<void>;
+  beforeCreate?: (params: {
+    /**
+     * The computed Maizzle config object.
+     */
+    config: Config
+  }) => void | Promise<void>;
 
   /**
   * Runs after the Template's config has been computed, but just before it is compiled.
@@ -43,20 +46,15 @@ export default interface Events {
      */
     html: string;
     /**
-     * The Template's Front Matter.
+     * The Template's Front Matter data.
      */
     matter: { [key: string]: string };
     /**
      * The Template's computed config.
-     */
-    config: Config;
-    /**
-     * A function to process an HTML string with PostHTML.
      *
-     * @param {string} html The HTML string to process.
-     * @param {Config} config The Maizzle config object.
+     * This is the Environment config merged with the Template's Front Matter.
      */
-    posthtml: PostHTMLType;
+    config: Config;
   }) => string | Promise<string>;
 
   /**
@@ -82,20 +80,15 @@ export default interface Events {
      */
     html: string;
     /**
-     * The Template's Front Matter.
+     * The Template's Front Matter data.
      */
     matter: { [key: string]: string };
     /**
      * The Template's computed config.
+     *
+     * This is the Environment config merged with the Template's Front Matter.
      */
     config: Config;
-    /**
-    * A function to process an HTML string with PostHTML.
-    *
-    * @param {string} html The HTML string to process.
-    * @param {Config} config The Maizzle config object.
-    */
-    posthtml: PostHTMLType;
   }) => string | Promise<string>;
 
   /**
@@ -121,20 +114,15 @@ export default interface Events {
      */
     html: string;
     /**
-     * The Template's Front Matter.
+     * The Template's Front Matter data.
      */
     matter: { [key: string]: string };
     /**
      * The Template's computed config.
+     *
+     * This is the Environment config merged with the Template's Front Matter.
      */
     config: Config;
-    /**
-    * A function to process an HTML string with PostHTML.
-    *
-    * @param {string} html The HTML string to process.
-    * @param {Config} config The Maizzle config object.
-    */
-    posthtml: PostHTMLType;
   }) => string | Promise<string>;
 
   /**
@@ -146,7 +134,7 @@ export default interface Events {
   * @example
   * ```
   * export default {
-  *   afterBuild: async ({files, config}) => {
+  *   afterBuild: async ({config, files}) => {
   *     // do something...
   *   }
   * }
@@ -154,12 +142,12 @@ export default interface Events {
   */
   afterBuild?: (params: {
     /**
-     * An array of paths to all the files inside the `build.output.path` directory.
+     * The computed Maizzle config object.
      */
-    files: string[];
+    config: Config;
     /**
-     * The Maizzle config object.
+     * An array of paths to all the files inside the `build.output.path` directory.
      */
-    config: Config;
+    files: string[];
   }) => string | Promise<string>;
 }