@designsystemsinternational/email 0.0.3 → 0.0.5

package/dist/cjs/browser.cjs

@@ -212,7 +212,7 @@ const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`

package/dist/cjs/index.cjs

@@ -6,6 +6,8 @@ var removeAttributes = require('posthtml-remove-attributes');
 var matchHelper = require('posthtml-match-helper');
 var colorConvert = require('color-convert');
 var unescape = require('lodash.unescape');
+var path = require('node:path');
+var fs = require('node:fs');
 var compressing = require('compressing');
 var getStream = require('get-stream');
 var mailchimpAPI = require('@mailchimp/mailchimp_marketing');
@@ -201,10 +203,16 @@ const BASE64_REGEX = /data:image\/([a-zA-Z]*);base64,(.*)/;
  */
 const preparePackageFactory =
   ({ urlPrefix = '', handlePackage }) =>
-  async (body, opts = {}) => {
+  async (body, _opts = {}) => {
     let counter = 0;
     const images = [];
 
+    const opts = Object.assign(
+      {},
+      { basePath: '', includeLocalImages: false },
+      _opts,
+    );
+
     const processed = await posthtml()
       .use((tree) => {
         tree.match({ tag: 'img' }, (node) => {
@@ -215,7 +223,7 @@ const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`
@@ -231,6 +239,18 @@ const preparePackageFactory =
             });
 
             counter++;
+          } else if (!src.startsWith('http') && opts.includeLocalImages) {
+            const filePath = path.join(opts.basePath, src);
+
+            const filename = src.split('/').pop();
+            node.attrs.src = `${urlPrefix}${filename}`;
+
+            const imgBuffer = fs.readFileSync(filePath);
+
+            images.push({
+              filename,
+              buffer: imgBuffer,
+            });
           }
           return node;
         });
@@ -513,7 +533,7 @@ const packageToS3 = async (body, opts = {}) => {
     },
   });
 
-  return await runUpload(body);
+  return await runUpload(body, opts);
 };
 
 const sendEmailSes = async (

package/dist/esm/browser.js

@@ -210,7 +210,7 @@ const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`

package/dist/esm/index.js

@@ -4,6 +4,8 @@ import removeAttributes from 'posthtml-remove-attributes';
 import matchHelper from 'posthtml-match-helper';
 import colorConvert from 'color-convert';
 import unescape from 'lodash.unescape';
+import path from 'node:path';
+import fs from 'node:fs';
 import compressing from 'compressing';
 import getStream from 'get-stream';
 import mailchimpAPI from '@mailchimp/mailchimp_marketing';
@@ -199,10 +201,16 @@ const BASE64_REGEX = /data:image\/([a-zA-Z]*);base64,(.*)/;
  */
 const preparePackageFactory =
   ({ urlPrefix = '', handlePackage }) =>
-  async (body, opts = {}) => {
+  async (body, _opts = {}) => {
     let counter = 0;
     const images = [];
 
+    const opts = Object.assign(
+      {},
+      { basePath: '', includeLocalImages: false },
+      _opts,
+    );
+
     const processed = await posthtml()
       .use((tree) => {
         tree.match({ tag: 'img' }, (node) => {
@@ -213,7 +221,7 @@ const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`
@@ -229,6 +237,18 @@ const preparePackageFactory =
             });
 
             counter++;
+          } else if (!src.startsWith('http') && opts.includeLocalImages) {
+            const filePath = path.join(opts.basePath, src);
+
+            const filename = src.split('/').pop();
+            node.attrs.src = `${urlPrefix}${filename}`;
+
+            const imgBuffer = fs.readFileSync(filePath);
+
+            images.push({
+              filename,
+              buffer: imgBuffer,
+            });
           }
           return node;
         });
@@ -511,7 +531,7 @@ const packageToS3 = async (body, opts = {}) => {
     },
   });
 
-  return await runUpload(body);
+  return await runUpload(body, opts);
 };
 
 const sendEmailSes = async (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@designsystemsinternational/email",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Make working with email more enjoyable (if possible)",
   "main": "src/index.js",
   "type": "module",

package/src/packageBrowser.js

@@ -3,7 +3,7 @@
 import posthtml from 'posthtml';
 
 import { BASE64_REGEX } from './constants.js';
-import { formatFilename } from './util/string.js';
+import { formatFilename, hashFromString } from './util/string.js';
 
 /**
  * Turns base64 inlined images into image buffers and updates their src
@@ -30,7 +30,7 @@ export const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`

package/src/packageNode.js

@@ -1,8 +1,11 @@
 // NODE.JS packacking factory
+import path from 'node:path';
+import fs from 'node:fs';
+
 import posthtml from 'posthtml';
 
 import { BASE64_REGEX } from './constants.js';
-import { formatFilename } from './util/string.js';
+import { formatFilename, hashFromString } from './util/string.js';
 
 /**
  * Turns base64 inlined images into image buffers and updates their src
@@ -15,10 +18,16 @@ import { formatFilename } from './util/string.js';
  */
 export const preparePackageFactory =
   ({ urlPrefix = '', handlePackage }) =>
-  async (body, opts = {}) => {
+  async (body, _opts = {}) => {
     let counter = 0;
     const images = [];
 
+    const opts = Object.assign(
+      {},
+      { basePath: '', includeLocalImages: false },
+      _opts,
+    );
+
     const processed = await posthtml()
       .use((tree) => {
         tree.match({ tag: 'img' }, (node) => {
@@ -29,7 +38,7 @@ export const preparePackageFactory =
               /data:image\/([a-zA-Z]*);base64,(.*)/,
             );
 
-            const hash = Math.random().toString(36).substring(2, 7);
+            const hash = hashFromString(`${data}`);
 
             const filename = alt
               ? `${formatFilename(alt)}-text-${hash}.${ext}`
@@ -45,6 +54,18 @@ export const preparePackageFactory =
             });
 
             counter++;
+          } else if (!src.startsWith('http') && opts.includeLocalImages) {
+            const filePath = path.join(opts.basePath, src);
+
+            const filename = src.split('/').pop();
+            node.attrs.src = `${urlPrefix}${filename}`;
+
+            const imgBuffer = fs.readFileSync(filePath);
+
+            images.push({
+              filename,
+              buffer: imgBuffer,
+            });
           }
           return node;
         });

package/src/packagers/node/s3.js

@@ -54,7 +54,7 @@ const packageToS3 = async (body, opts = {}) => {
     },
   });
 
-  return await runUpload(body);
+  return await runUpload(body, opts);
 };
 
 export default packageToS3;