diff --git a/msg_attachments_to_mail_message/__manifest__.py b/msg_attachments_to_mail_message/__manifest__.py index 40be6c7..a35c637 100644 --- a/msg_attachments_to_mail_message/__manifest__.py +++ b/msg_attachments_to_mail_message/__manifest__.py @@ -53,7 +53,9 @@ 'views/res_config_settings_views.xml', ], 'external_dependencies': { - 'python': ['extract-msg'], + 'python': [ + 'extract-msg' + ], }, 'installable': True, 'auto_install': False, diff --git a/msg_viewer/static/src/lib/msg-viewer-main/build.ts b/msg_viewer/static/src/lib/msg-viewer-main/build.ts index 670d401..d3c4247 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/build.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/build.ts @@ -45,9 +45,6 @@ async function build() { entrypoints: ["./lib/index.html"], outdir: DEST_DIR, minify: true, - plugins: [ - html({ inline: true }), - ], }); console.log("Build succeeded!\n"); } catch(err) { @@ -75,4 +72,4 @@ async function createDestDir(){ } catch(err) { console.error(`Failed to create destination folder "${DEST_DIR}".`); } -} \ No newline at end of file +} diff --git a/msg_viewer/static/src/lib/msg-viewer-main/bun.lockb b/msg_viewer/static/src/lib/msg-viewer-main/bun.lockb old mode 100644 new mode 100755 index 0dc6c0f..5d6d25e Binary files a/msg_viewer/static/src/lib/msg-viewer-main/bun.lockb and b/msg_viewer/static/src/lib/msg-viewer-main/bun.lockb differ diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/attachment/index.ts b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/attachment/index.ts index 51ff44b..d96d7b7 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/attachment/index.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/attachment/index.ts @@ -1,7 +1,7 @@ import type { Message } from "../../scripts/msg/types/message"; import { bytesWithUnits } from "../../scripts/utils/file-size-util"; import { createFragmentFromTemplate } from "../../scripts/utils/html-template-util"; -import template from "./index.html" with { type: "text" }; +const template = await Bun.file("./lib/components/attachment/index.html").text(); export function attachmentsFragment(message: Message): DocumentFragment { const attachments = message.attachments diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/embedded-msg/index.ts b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/embedded-msg/index.ts index eec2043..6ddb314 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/embedded-msg/index.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/embedded-msg/index.ts @@ -1,7 +1,7 @@ import type { DirectoryEntry } from "../../scripts/msg/compound-file/directory/types/directory-entry"; import type { Message } from "../../scripts/msg/types/message"; import { createFragmentFromTemplate } from "../../scripts/utils/html-template-util"; -import template from "./index.html" with { type: "text" }; +const template = await Bun.file("./lib/components/embedded-msg/index.html").text(); export function embeddedMsgsFragment(message: Message, onClick: (entry: DirectoryEntry) => void): DocumentFragment { const elements = message.attachments diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/error/index.ts b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/error/index.ts index d7dbcaf..c8bdd0d 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/error/index.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/error/index.ts @@ -1,5 +1,5 @@ import { createFragmentFromTemplate } from "../../scripts/utils/html-template-util"; -import template from "./index.html" with { type: "text" }; +const template = await Bun.file("./lib/components/error/index.html").text(); export function errorFragment(error: string): DocumentFragment { return createFragmentFromTemplate(template, { error }); diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/message/index.ts b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/message/index.ts index 60e1710..20b275a 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/message/index.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/message/index.ts @@ -4,7 +4,7 @@ import { createFragmentFromTemplate } from "../../scripts/utils/html-template-ut import { attachmentsFragment } from "../attachment"; import { embeddedMsgsFragment } from "../embedded-msg"; import { recipientsFragments } from "../recipient"; -import template from "./index.html" with { type: "text" }; +const template = await Bun.file("./lib/components/message/index.html").text(); export function messageFragment(message: Message, renderDir: (dir: DirectoryEntry) => void): DocumentFragment { const [toRecip, ccRecip] = recipientsFragments(message); diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/recipient/index.ts b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/recipient/index.ts index 65ec234..faf4941 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/components/recipient/index.ts +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/components/recipient/index.ts @@ -1,6 +1,6 @@ import type { Message, Recipient } from "../../scripts/msg/types/message"; import { createFragmentFromTemplate } from "../../scripts/utils/html-template-util"; -import template from "./index.html" with { type: "text" }; +const template = await Bun.file("./lib/components/recipient/index.html").text(); export function recipientsFragments(message: Message): DocumentFragment[] { const toRecipients = toSet(message.content.toRecipients); @@ -45,4 +45,4 @@ function toSet(recipStr: string) { interface RecipientViewModel { name: string, email: string -} \ No newline at end of file +} diff --git a/msg_viewer/static/src/lib/msg-viewer-main/lib/styles/styles.css b/msg_viewer/static/src/lib/msg-viewer-main/lib/styles/styles.css index c291526..39e601c 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/lib/styles/styles.css +++ b/msg_viewer/static/src/lib/msg-viewer-main/lib/styles/styles.css @@ -1,2 +1,2 @@ -@import "./lib/styles/root.css"; -@import "./lib/components/styles.css"; +@import "./root.css"; +@import "../components/styles.css"; diff --git a/msg_viewer/static/src/lib/msg-viewer-main/package.json b/msg_viewer/static/src/lib/msg-viewer-main/package.json index c1780d1..27f9ac3 100644 --- a/msg_viewer/static/src/lib/msg-viewer-main/package.json +++ b/msg_viewer/static/src/lib/msg-viewer-main/package.json @@ -5,7 +5,7 @@ "main": "index.js", "devDependencies": { "@types/bun": "latest", - "bun-plugin-html": "^2.0.0" + "bun-plugin-html": "^2.2.8" }, "scripts": { "clean": "rm -rf build"