@travetto/email-compiler 3.3.7 → 3.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "3.3.7",
+  "version": "3.3.8",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,11 +26,11 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/base": "^3.3.3",
-    "@travetto/config": "^3.3.4",
-    "@travetto/di": "^3.3.3",
-    "@travetto/email": "^3.3.4",
-    "@travetto/image": "^3.3.3",
+    "@travetto/base": "^3.3.4",
+    "@travetto/config": "^3.3.5",
+    "@travetto/di": "^3.3.4",
+    "@travetto/email": "^3.3.5",
+    "@travetto/image": "^3.3.4",
     "@types/inline-css": "^3.0.1",
     "html-entities": "^2.4.0",
     "inline-css": "^4.0.2",
@@ -38,7 +38,7 @@
     "sass": "^1.68.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.3.5"
+    "@travetto/cli": "^3.3.6"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -22,25 +22,13 @@ export class EmailCompiler {
     }
     const root = (await import(entry.outputFile)).default;
     const og: EmailCompileSource = await root.wrap();
-    const res = {
+    const res: EmailCompileContext = {
       file: entry.sourceFile,
       module: entry.module,
+      images: {},
+      styles: {},
       ...og
     };
-
-    const mod = RootIndex.getModule(entry.module)!;
-
-    const resourcePaths = [
-      path.resolve(mod.sourcePath, 'resources'),
-      path.resolve(RootIndex.manifest.workspacePath, 'resources')
-    ];
-
-    const styles = res.styles ??= {};
-    (styles.search ??= []).push(...resourcePaths);
-
-    const images = res.images ??= {};
-    (images.search ??= []).push(...resourcePaths);
-
     return res;
   }
 

package/src/util.ts

@@ -137,11 +137,11 @@ export class EmailCompileUtil {
   static async inlineImages(html: string, opts: EmailTemplateImageConfig): Promise<string> {
     const { tokens, finalize } = await this.tokenizeResources(html, this.#HTML_CSS_IMAGE_URLS);
     const pendingImages: [token: string, ext: string, stream: Readable | Promise<Readable>][] = [];
-    const resources = new FileResourceProvider(opts.search ?? []);
+    const resource = new FileResourceProvider({ includeCommon: true, paths: opts.search ?? [] });
 
     for (const [token, src] of tokens) {
       const ext = path.extname(src);
-      const stream = await resources.readStream(src);
+      const stream = await resource.readStream(src);
       pendingImages.push([token, ext, /^[.](jpe?g|png)$/.test(ext) ?
         ImageConverter.optimize(ext === '.png' ? 'png' : 'jpeg', stream) : stream]);
     }
@@ -183,7 +183,7 @@ export class EmailCompileUtil {
       styles.push(opts.global);
     }
 
-    const resource = new FileResourceProvider(opts.search ?? []);
+    const resource = new FileResourceProvider({ includeCommon: true, paths: opts.search ?? [] });
     const main = await resource.read('/email/main.scss').then(d => d, () => '');
 
     if (main) {
@@ -191,9 +191,7 @@ export class EmailCompileUtil {
     }
 
     if (styles.length) {
-      const compiled = await this.compileSass(
-        { data: styles.join('\n') },
-        [...opts.search ?? []]);
+      const compiled = await this.compileSass({ data: styles.join('\n') }, resource.paths);
 
       // Remove all unused styles
       const finalStyles = await this.pruneCss(html, compiled);