chore: update twig dependency

package.json

@@ -108,7 +108,7 @@
     "semver": "^7.7.4",
     "smart-array-filter": "^5.0.0",
     "superagent": "^10.3.0",
-    "twig": "^1.17.1"
+    "twig": "^2.0.0"
   },
   "volta": {
     "node": "22.22.1"

rollup.config.mjs

@@ -104,6 +104,14 @@ export default [
     plugins,
   },
   {
+    onwarn(warning, warn) {
+      if(warning.code === 'EVAL') {
+        // Prevent huge warning with minified input
+        warn({...warning, frame: ''})
+      } else {
+       warn(warning);
+      }
+    },
     input: 'node_modules/twig/twig.min.js',
     output: {
       file: 'src/browserified/twig/twig.js',

src/init.js

@@ -57,6 +57,8 @@ require.config({
     sprintf: 'components/sprintf/dist/sprintf.min',
     superagent: 'browserified/superagent/index',
     threejs: 'components/threejs/build/three.min',
+    twig: 'browserified/twig/twig',
+    twig_extended: 'lib/twigjs/twig',
     uri: 'components/uri.js/src',
     'web-animations': 'components/web-animations-js/web-animations.min',
     x2js: 'components/x2js/xml2json.min',

src/lib/twigjs/twig.js

@@ -1,7 +1,7 @@
 'use strict';
 
 define([
-  'browserified/twig/twig',
+  'twig',
   'src/util/typerenderer',
   'src/util/util',
 ], function(Twig, Renderer, Util) {

src/modules/types/display/template-twig/view.js

@@ -3,7 +3,7 @@
 define([
   'jquery',
   'modules/default/defaultview',
-  'lib/twigjs/twig',
+  'twig_extended',
   'src/util/debug',
   'src/util/api',
   'lodash',

src/modules/types/science/chemistry/periodic_table/view.js

@@ -2,7 +2,7 @@
 
 define([
   'modules/default/defaultview',
-  'lib/twigjs/twig',
+  'twig_extended',
   'src/util/debug',
   'src/util/colorbar',
   'src/util/color',

src/src/util/twig.js

@@ -0,0 +1,83 @@
+'use strict';
+
+define(['twig_extended', 'src/util/ui', 'src/util/Form'], function (
+  Twig,
+  UI,
+  Form,
+) {
+  const exports = {};
+  exports.renderTwig = async function renderTwig(template, data) {
+    template = Twig.twig({
+      data: DataObject.resurrect(template),
+    });
+    var renderer = await template.renderAsync(DataObject.resurrect(data));
+    const div = document.createElement('div');
+    div.style = 'position: absolute; width: 1; height: 1; visibility: none';
+    const body = document.querySelectorAll('body')[0];
+    div.innerHTML = renderer.html;
+    body.append(div);
+    await renderer.render(); // we render the async typerenderer
+    const html = div.innerHTML;
+    div.remove();
+    return html;
+  };
+
+  exports.form = function (divOrData, inputObject, opts) {
+    let $div;
+    opts = Object.assign({}, opts);
+
+    if (opts.twig) {
+      var template = Twig.twig({
+        data: DataObject.resurrect(divOrData),
+      });
+      var render = template.renderAsync(DataObject.resurrect(opts.twig));
+      render.render();
+      $div = render.html;
+    } else {
+      $div = divOrData;
+    }
+
+    return new Promise(function (resolve) {
+      const done = (name) => {
+        var obj = form.getData(true);
+        obj._clickedButton = name;
+        form.unbind();
+        resolve(obj);
+        dialog.dialog('destroy');
+      };
+
+      if (!$div.jquery) {
+        $div = $($div);
+      }
+
+      var form = new Form($div);
+      if (inputObject) form.setData(inputObject);
+
+      form.onSubmit((event) => {
+        done(event.target.name);
+      });
+
+      const dialogOptions = Object.assign({ buttons: {} }, opts.dialog, {
+        close() {
+          form.unbind();
+          resolve(null);
+          dialog.dialog('destroy');
+        },
+      });
+
+      if (opts.buttonLabels) {
+        for (let i = 0; i < opts.buttonLabels.length; i++) {
+          const button = opts.buttonLabels[i];
+          if (typeof button === 'string') {
+            dialogOptions.buttons[button] = () => done(button);
+          } else {
+            dialogOptions.buttons[button.label] = () => done(button.key);
+          }
+        }
+      }
+      var dialog = UI.dialog($div, dialogOptions);
+    });
+  };
+
+  return exports;
+});

src/src/util/typerenderer.js

@@ -443,7 +443,7 @@ define([
 
   functions.object = {};
   functions.object.init = async function () {
-    functions.object.twig = await asyncRequire('lib/twigjs/twig');
+    functions.object.twig = await asyncRequire('twig_extended');
   };
   functions.object.toscreen = function ($element, value, root, options = {}) {
     const { twig, twigVariableName, toJSON } = options;

src/src/util/ui.js

@@ -12,11 +12,8 @@ define([
   'lodash',
   'jquery',
   'src/util/typerenderer',
-  'forms/button',
-  'src/util/Form',
-  'lib/twigjs/twig',
   'notifyjs',
-], function (Util, Debug, Traversing, _, $, Renderer, Button, Form, Twig) {
+], function (Util, Debug, Traversing, _, $, Renderer) {
   // On load add the style for the progress notification
   $.notify.addStyle('inprogress', {
     html: `<div><span data-notify-text/>   &nbsp; &nbsp; ${Util.getLoadingAnimation(
@@ -115,76 +112,6 @@ define([
     });
   };
 
-  exports.renderTwig = async function renderTwig(template, data) {
-    template = Twig.twig({
-      data: DataObject.resurrect(template),
-    });
-    var renderer = await template.renderAsync(DataObject.resurrect(data));
-    const div = document.createElement('div');
-    div.style = 'position: absolute; width: 1; height: 1; visibility: none';
-    const body = document.querySelectorAll('body')[0];
-    div.innerHTML = renderer.html;
-    body.append(div);
-    await renderer.render(); // we render the async typerenderer
-    const html = div.innerHTML;
-    div.remove();
-    return html;
-  };
-
-  exports.form = function (div, inputObject, opts) {
-    opts = Object.assign({}, opts);
-
-    if (opts.twig) {
-      var template = Twig.twig({
-        data: DataObject.resurrect(div),
-      });
-      var render = template.renderAsync(DataObject.resurrect(opts.twig));
-      render.render();
-      div = render.html;
-    }
-
-    return new Promise(function (resolve) {
-      const done = (name) => {
-        var obj = form.getData(true);
-        obj._clickedButton = name;
-        form.unbind();
-        resolve(obj);
-        dialog.dialog('destroy');
-      };
-
-      if (!div.jquery) {
-        div = $(div);
-      }
-
-      var form = new Form(div);
-      if (inputObject) form.setData(inputObject);
-
-      form.onSubmit((event) => {
-        done(event.target.name);
-      });
-
-      const dialogOptions = Object.assign({ buttons: {} }, opts.dialog, {
-        close() {
-          form.unbind();
-          resolve(null);
-          dialog.dialog('destroy');
-        },
-      });
-
-      if (opts.buttonLabels) {
-        for (let i = 0; i < opts.buttonLabels.length; i++) {
-          const button = opts.buttonLabels[i];
-          if (typeof button === 'string') {
-            dialogOptions.buttons[button] = () => done(button);
-          } else {
-            dialogOptions.buttons[button.label] = () => done(button.key);
-          }
-        }
-      }
-      var dialog = exports.dialog(div, dialogOptions);
-    });
-  };
-
   exports.chooseSearch = async function (list, options) {
     let _resolve;
     const promise = new Promise(function (resolve) {