@travetto/email-compiler 5.0.18 → 5.0.20

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "5.0.18",
+  "version": "5.0.20",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,20 +26,20 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/config": "^5.0.13",
-    "@travetto/di": "^5.0.13",
-    "@travetto/email": "^5.0.13",
-    "@travetto/image": "^5.0.17",
-    "@travetto/runtime": "^5.0.13",
-    "@travetto/worker": "^5.0.15",
+    "@travetto/config": "^5.0.15",
+    "@travetto/di": "^5.0.15",
+    "@travetto/email": "^5.0.15",
+    "@travetto/image": "^5.0.19",
+    "@travetto/runtime": "^5.0.15",
+    "@travetto/worker": "^5.0.17",
     "@types/inline-css": "^3.0.3",
     "html-entities": "^2.5.2",
     "inline-css": "^4.0.2",
-    "purgecss": "^6.0.0",
-    "sass": "^1.80.4"
+    "purgecss": "^7.0.2",
+    "sass": "^1.83.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.16"
+    "@travetto/cli": "^5.0.18"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { TypedObject, RuntimeIndex, watchCompiler, Runtime, BinaryUtil } from '@travetto/runtime';
+import { TypedObject, RuntimeIndex, watchCompiler, Runtime, BinaryUtil, castTo } from '@travetto/runtime';
 import { EmailCompiled, MailUtil, EmailTemplateImport, EmailTemplateModule } from '@travetto/email';
 
 import { EmailCompileUtil } from './util';
@@ -15,7 +15,10 @@ export class EmailCompiler {
    * Load Template
    */
   static async loadTemplate(file: string): Promise<EmailTemplateModule> {
-    const root = (await Runtime.importFrom<{ default: EmailTemplateImport }>(file)).default;
+    let root = (await Runtime.importFrom<{ default: EmailTemplateImport }>(file)).default;
+    if ('default' in root) {
+      root = castTo(root.default);
+    }
     const entry = RuntimeIndex.getEntry(file)!;
     return await root.prepare({ file, module: entry.module });
   }

package/src/util.ts

@@ -11,13 +11,15 @@ type Tokenized = {
   finalize: (onToken: (token: string) => string) => string;
 };
 
+const SUPPORT_SRC = /(?:support|src)\//;
+
 /**
  * Email compile tools
  */
 export class EmailCompileUtil {
   static #HTML_CSS_IMAGE_URLS = [
-    /(?<pre><img[^>]src=\s*["'])(?<src>[^"{}]+)/g,
-    /(?<pre>background(?:-image)?:\s*url[(]['"]?)(?<src>[^"'){}]+)/g
+    /(?<pre><img[^>]src=\s{0,10}["'])(?<src>[^"{}]{1,1000})/g,
+    /(?<pre>background(?:-image)?:\s{0,10}url[(]['"]?)(?<src>[^"'){}]{1,1000})/g
   ];
 
   static #EXT = /[.]email[.]tsx$/;
@@ -33,7 +35,7 @@ export class EmailCompileUtil {
    * Generate singular output path given a file
    */
   static buildOutputPath(file: string, suffix: string, prefix?: string): string {
-    const res = file.replace(/.*(support|src)\//, '').replace(this.#EXT, suffix);
+    const res = (SUPPORT_SRC.test(file) ? file.split(SUPPORT_SRC)[1] : file).replace(this.#EXT, suffix);
     return prefix ? path.join(prefix, res) : res;
   }
 
@@ -68,7 +70,7 @@ export class EmailCompileUtil {
         text = text.replace(all, `${pre}${token}`);
       }
     }
-    const finalize = (onToken: (token: string) => string): string => text.replace(/@@[^@]+@@/g, t => onToken(t));
+    const finalize = (onToken: (token: string) => string): string => text.replace(/@@[^@]{1,100}@@/g, t => onToken(t));
 
     return { text, tokens, finalize };
   }
@@ -161,7 +163,7 @@ export class EmailCompileUtil {
   static handleHtmlEdgeCases(html: string): string {
     return html
       .replace(/\n{3,100}/msg, '\n\n')
-      .replace(/<(meta|img|link|hr|br)[^>]*>/g, a => a.replace('>', '/>')) // Fix self closing
+      .replace(/<(meta|img|link|hr|br)[^>]{0,200}>/g, a => a.replace(/>/g, '/>')) // Fix self closing
       .replace(/&apos;/g, '&#39;') // Fix apostrophes, as outlook hates them
       .replace(/(background(?:-color)?:\s*)([#0-9a-f]{6,8})([^>.#,]+)>/ig,
         (all, p, col, rest) => `${p}${col}${rest} bgcolor="${col}">`) // Inline bg-color
@@ -173,7 +175,6 @@ export class EmailCompileUtil {
       .concat('\n');
   }
 
-
   /**
    * Apply styles into a given html document
    */