From 8c17b91452beea19c07da02d2ad2946aba830b74 Mon Sep 17 00:00:00 2001 From: William Braeckman Date: Mon, 10 Mar 2025 14:39:40 +0100 Subject: [PATCH] [FIX] runbot: export diff_match_patch properly The lib exports its data through the global object, an odoo module then re-exports the module to make it available to other odoo modules. --- runbot/__manifest__.py | 1 + runbot/static/libs/diff_match_patch/diff_match_patch.js | 2 +- runbot/static/src/diff_match_patch_module.js | 5 +++++ runbot/static/src/fields/tracking_value.js | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 runbot/static/src/diff_match_patch_module.js diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py index 66f56d21..584a4170 100644 --- a/runbot/__manifest__.py +++ b/runbot/__manifest__.py @@ -64,6 +64,7 @@ 'assets': { 'web.assets_backend': [ 'runbot/static/libs/diff_match_patch/diff_match_patch.js', + 'runbot/static/src/diff_match_patch_module.js', 'runbot/static/src/fields/*', ], }, diff --git a/runbot/static/libs/diff_match_patch/diff_match_patch.js b/runbot/static/libs/diff_match_patch/diff_match_patch.js index 0cce87f0..cf746536 100644 --- a/runbot/static/libs/diff_match_patch/diff_match_patch.js +++ b/runbot/static/libs/diff_match_patch/diff_match_patch.js @@ -2235,7 +2235,7 @@ var diff_match_patch = function() { // /** @suppress {globalThis} */ // this['DIFF_EQUAL'] = DIFF_EQUAL; -export { +(typeof window !== "undefined" ? window : this).DiffMatchPatch = { diff_match_patch, DIFF_DELETE, DIFF_INSERT, diff --git a/runbot/static/src/diff_match_patch_module.js b/runbot/static/src/diff_match_patch_module.js new file mode 100644 index 00000000..8591c88c --- /dev/null +++ b/runbot/static/src/diff_match_patch_module.js @@ -0,0 +1,5 @@ +odoo.define("@runbot/diff_match_patch", [], function () { + 'use strict'; + + return DiffMatchPatch; +}); diff --git a/runbot/static/src/fields/tracking_value.js b/runbot/static/src/fields/tracking_value.js index b6403748..14d0c82f 100644 --- a/runbot/static/src/fields/tracking_value.js +++ b/runbot/static/src/fields/tracking_value.js @@ -1,7 +1,7 @@ /** @odoo-module **/ import { patch } from "@web/core/utils/patch"; import { Message } from "@mail/core/common/message"; -import { diff_match_patch } from "@runbot/libs/diff_match_patch/diff_match_patch"; +import { diff_match_patch } from "@runbot/diff_match_patch"; patch(Message.prototype, { setup() {